From 2acb115d7732d9a4c98f2a17f1cdff7b097f1ff4 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Wed, 2 Dec 2020 10:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BC=9A=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DgComplianceInvestigationController.java | 2 +- .../DgGuaranteeAssignUserController.java | 3 - .../DgLoanCommitteeConsiderController.java | 13 +- .../DgWorkConferenceConsiderController.java | 11 + .../guarantee/feign/HrmsFeignService.java | 5 +- .../DgComplianceInvestigationMapper.java | 7 +- .../mapper/DgGuaranteeAssignUserMapper.java | 4 + .../mapper/DgLoanCommitteeConsiderMapper.java | 5 +- .../DgWorkConferenceConsiderMapper.java | 2 + .../DgComplianceInvestigationRequest.java | 2 +- .../model/response/AuditOpinionResponse.java | 19 ++ ...DgComplianceInvestigationInfoResponse.java | 31 ++ .../DgComplianceInvestigationResponse.java | 2 - .../DgLoanCommitteeConsiderResponse.java | 21 +- .../response/DgWorkConferenceResponse.java | 26 +- .../response/GuaranteeDetailResponse.java | 2 - .../IDgComplianceInvestigationService.java | 9 +- .../IDgLoanCommitteeConsiderService.java | 3 + .../DgComplianceInvestigationServiceImpl.java | 265 ++++++++++++++---- .../DgLoanCommitteeConsiderServiceImpl.java | 44 ++- .../DgWorkConferenceConsiderServiceImpl.java | 157 ++++++++++- .../DgComplianceInvestigationMapper.xml | 15 +- .../guarantee/DgGuaranteeAssignUserMapper.xml | 11 + .../DgLoanCommitteeConsiderMapper.xml | 9 +- .../DgWorkConferenceConsiderMapper.xml | 34 ++- .../hrms/controller/EmployeeController.java | 11 +- .../financial/hrms/dao/EmployeeDao.java | 2 + .../hrms/service/EmployeeService.java | 2 + .../service/impl/EmployeeServiceImpl.java | 13 + .../resources/mapper/hrms/EmployeeDao.xml | 13 + .../domain/guarantee/po/AuditOpinionPO.java | 24 +- dq-framework-utils/pom.xml | 5 + .../src/main/resources/jwt.properties | 3 + 33 files changed, 664 insertions(+), 111 deletions(-) create mode 100644 dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java index f19170ac..ca470ccb 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgComplianceInvestigationController.java @@ -88,7 +88,7 @@ public class DgComplianceInvestigationController { */ @GetMapping("/excelExport") @ApiOperation(value = "导出", notes = "导出") - public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List ids){ + public ResponseResult query(HttpServletResponse response, @RequestParam("ids") List ids) { Boolean result = iDgComplianceInvestigationService.excelExport(response, ids); return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java index 9d43b3c0..eacef93f 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgGuaranteeAssignUserController.java @@ -196,7 +196,4 @@ public class DgGuaranteeAssignUserController { int result = dgGuaranteeAssignUserService.approvalGuarantee(approvalGuaranteeRequest); return result>0 ? ResponseResult.SUCCESS("审核成功！"):ResponseResult.FAIL(41002,"审核失败！"); } - - - } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java index f6733e2c..bdf39008 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanCommitteeConsiderController.java @@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.List; @@ -64,8 +65,18 @@ public class DgLoanCommitteeConsiderController { * 查看 */ @GetMapping("/query") - @ApiModelProperty(value = "查看",notes = "查看") + @ApiOperation(value = "查看", notes = "查看") public ResponseResult query(@RequestParam("id") Integer id) { return ResponseResult.SUCCESS(dgLoanCommitteeConsiderService.query(id)); } + + /** + * 导出 + */ + @GetMapping("excelExport") + @ApiOperation(value = "导出", notes = "导出") + public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List ids) { + Boolean result = dgLoanCommitteeConsiderService.excelExport(response, ids); + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java index 9050f5ba..007c0a74 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgWorkConferenceConsiderController.java @@ -10,6 +10,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -78,4 +79,14 @@ public class DgWorkConferenceConsiderController { public ResponseResult query(@RequestParam("id") Integer id) { return ResponseResult.SUCCESS(dgWorkConferenceConsiderService.query(id)); } + + /** + * 导出 + */ + @GetMapping("/excelExport") + @ApiOperation(value = "导出", notes = "导出") + public ResponseResult excelExport(HttpServletResponse response, @RequestParam("ids") List ids){ + Boolean result = dgWorkConferenceConsiderService.excelExport(response, ids); + return result ? ResponseResult.SUCCESS() : ResponseResult.FAIL(); + } } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java index 29ff2f2e..fea93938 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/feign/HrmsFeignService.java @@ -50,11 +50,14 @@ public interface HrmsFeignService { ResponseResult insertUserRole(@RequestParam("userId") Long userId,@RequestParam("roleId")Long roleId); /** - * 给用户赋予一个橘色 + * 给用户赋予一个角色 */ @GetMapping("hrms/employee/saveUserRole") ResponseResult saveUserRole(@RequestParam("userId") Long userId,@RequestParam("roleId")Long roleId); @PostMapping("hrms/employee/insertUsrRole") ResponseResult insertUsrRole(@RequestBody List list); + + @GetMapping("/hrms/employee/listEmpNameByUserId") + ResponseResult> listEmpNameByUserId(@RequestParam("userIds") Integer[] userIds); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java index 9919b9b7..b18b3bba 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java @@ -27,8 +27,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper list(Page page, @Param("cr") DgComplianceInvestigationRequest dgComplianceInvestigationRequest, @Param("roleIds") List roleIds, @Param("userId") Integer userId); - List listExcel(@Param("roleIds") List roleIds, @Param("userId") Integer userId, - @Param("ids") List ids); + List listExcel(@Param("ids") List ids); Boolean survey(@Param("iid") Integer iid, @Param("opinion") String opinion, @Param("date") Date date, @Param("userId") Integer userId, @Param("operationStatus") Integer operationStatus, @@ -62,4 +61,8 @@ public interface DgComplianceInvestigationMapper extends BaseMapper pageByCondition(Page page,@Param("customerNumberOrName") String customerNumberOrName,@Param("roleIdlist") List roleIdlist,@Param("userId") String userId,@Param("status") Integer status); List selectListByIds(List ids); + + Boolean updateAuditStatusByBusinessId(@Param("businessId") Integer businessId, @Param("auditStatus") Integer auditStatus); + + Boolean updateOperationStatusById(@Param("businessId") Integer businessId, @Param("operationStatus") Integer operationStatus); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java index 82a7c879..4320ee32 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java @@ -25,11 +25,10 @@ import java.util.List; @Mapper public interface DgLoanCommitteeConsiderMapper extends BaseMapper { - IPage list(Page page, @Param("codeOrName") String codeOrName, @Param("roleId") List roleId, + IPage list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List roleIds, @Param("userId") Integer userId); - List excelList(@Param("roleId") List roleId, @Param("userId") Integer userId, - @Param("ids") List ids); + List excelList(@Param("ids") List ids); Boolean check(@Param("lr") DgLoanCommitteeConsiderRequest dgLoanCommitteeConsiderRequest, @Param("userId") Integer userId, @Param("status") Integer status, @Param("operatingStatus") Integer operatingStatus, @Param("date") Date date); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java index aa25f434..435dcb3e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgWorkConferenceConsiderMapper.java @@ -26,6 +26,8 @@ public interface DgWorkConferenceConsiderMapper extends BaseMapper list(Page page, @Param("codeOrName") String codeOrName, @Param("roleIds") List roleIds, @Param("userId") Integer userId); + List excelList(@Param("ids") List ids); + Boolean check(@Param("id") Integer id, @Param("userId") Integer userId, @Param("opinion") String opinion, @Param("auditStatus") Integer auditStatus, @Param("operationStatus") Integer operationStatus, @Param("date") Date date, @Param("joinJudge") String joinJudge); diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java index b80c74d0..fd2ab505 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgComplianceInvestigationRequest.java @@ -20,5 +20,5 @@ public class DgComplianceInvestigationRequest implements Serializable { private String codeOrName; @ApiModelProperty("流程状态") - private String status; + private Integer status; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java index 3270be1e..10459952 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/AuditOpinionResponse.java @@ -1,11 +1,13 @@ package com.daqing.financial.guarantee.model.response; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; import java.io.Serializable; import java.util.Date; +import java.util.LinkedHashMap; /** * AB角合规调查等审核意见、审核人、时间 @@ -23,6 +25,7 @@ public class AuditOpinionResponse implements Serializable { @ApiModelProperty("A角姓名") private String aName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("A角调查时间") private Date aTime; @@ -32,6 +35,7 @@ public class AuditOpinionResponse implements Serializable { @ApiModelProperty("B角姓名") private String bName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("B角调查时间") private Date bTime; @@ -41,6 +45,7 @@ public class AuditOpinionResponse implements Serializable { @ApiModelProperty("资产姓名") private String assetName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("资产审核时间") private Date assetTime; @@ -50,6 +55,7 @@ public class AuditOpinionResponse implements Serializable { @ApiModelProperty("信息姓名") private String messageName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("信息审核时间") private Date messageTime; @@ -59,6 +65,19 @@ public class AuditOpinionResponse implements Serializable { @ApiModelProperty("法规姓名") private String regulationName; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("法规审核时间") private Date regulationTime; + + /** + * 业务申请详细 + */ + @ApiModelProperty(value = "业务申请详细") + private DgApplyAmountInfoResponse dgApplyAmountInfo; + + /** + * 企业详细 + */ + @ApiModelProperty(value = "企业详细") + private LinkedHashMap linkedHashMap; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java new file mode 100644 index 00000000..ba7c1b19 --- /dev/null +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationInfoResponse.java @@ -0,0 +1,31 @@ +package com.daqing.financial.guarantee.model.response; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 合规调查详情查看 + * + * @auther River + * @date 2020/12/1 10:17 + */ +@Data +@ToString +public class DgComplianceInvestigationInfoResponse implements Serializable { + + @ApiModelProperty("担保部调查详情") + private GuaranteeDetailResponse guaranteeDetailResponse; + + @ApiModelProperty("资产调查详细") + private DgAssetsInvestigationResponse assetsResponse; + + @ApiModelProperty("合规调查的附件文件") + private String fileUrl; + + @ApiModelProperty("合规调查的审核(调查)意见") + private String opinion; + +} diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java index 0008b7d5..7d4cec77 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgComplianceInvestigationResponse.java @@ -10,8 +10,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; -import org.springframework.beans.factory.annotation.Autowired; - import java.io.Serializable; import java.util.Date; diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderResponse.java index 4114c906..aeac592d 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderResponse.java @@ -1,5 +1,11 @@ package com.daqing.financial.guarantee.model.response; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import com.daqing.framework.utils.excel.ApprovalStatusConverter; +import com.daqing.framework.utils.excel.BusinessStatusConverter; +import com.daqing.framework.utils.excel.OperatingStatusConverter; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,45 +22,58 @@ import java.util.Date; */ @Data @ToString -public class DgLoanCommitteeConsiderResponse implements Serializable { +public class DgLoanCommitteeConsiderResponse extends BaseRowModel implements Serializable { + @ExcelIgnore @ApiModelProperty("贷审会表id") private Integer id; + @ExcelProperty(value = "业务编号" , index = 0) @ApiModelProperty("业务编号") private String businessCode; + @ExcelProperty(value = "客户名称" , index = 1) @ApiModelProperty("客户名称") private String name; + @ExcelProperty(value = "联系电话" , index = 2) @ApiModelProperty("联系电话") private String phone; + @ExcelProperty(value = "业务类别" , index = 3) @ApiModelProperty("业务类别") private String businessType; + @ExcelProperty(value = "金额" , index = 4) @ApiModelProperty("金额") private Double applyAmount; + @ExcelProperty(value = "期限" , index = 5) @ApiModelProperty("期限") private String applyTime; + @ExcelProperty(value = "申请日期" , index = 6) @ApiModelProperty("申请日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date createTime; + @ExcelProperty(value = "操作状态" , index = 7 ,converter = OperatingStatusConverter.class) @ApiModelProperty("操作状态,0:已发起,1:待处理,2:已处理") private Integer operatingStatus; + @ExcelProperty(value = "审核状态" , index = 8 ,converter = ApprovalStatusConverter.class) @ApiModelProperty("审核状态,0:待指派,1:审核中,2:已审核,3:已拒绝,4:已驳回,5:草稿,6:已撤销") private Integer status; + @ExcelProperty(value = "业务状态" , index = 9 ,converter = BusinessStatusConverter.class) @ApiModelProperty("业务状态,1->进行中;2->已完成;3->已否决") private Integer businessStatus; + @ExcelIgnore @ApiModelProperty("角色id") private Integer roleId; + @ExcelIgnore @ApiModelProperty("业务id") private Integer businessId; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java index 9fe3e9ac..5fd9a1e7 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceResponse.java @@ -1,5 +1,11 @@ package com.daqing.financial.guarantee.model.response; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.metadata.BaseRowModel; +import com.daqing.framework.utils.excel.ApprovalStatusConverter; +import com.daqing.framework.utils.excel.BusinessStatusConverter; +import com.daqing.framework.utils.excel.OperatingStatusConverter; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,60 +22,78 @@ import java.util.Date; */ @ToString @Data -public class DgWorkConferenceResponse implements Serializable { +public class DgWorkConferenceResponse extends BaseRowModel implements Serializable { + @ExcelIgnore @ApiModelProperty("工作会表id") private Integer id; + @ExcelProperty(value = "业务编号", index = 0) @ApiModelProperty("业务编号") private String businessCode; + @ExcelProperty(value = "客户名称", index = 1) @ApiModelProperty("客户名称") private String name; + @ExcelProperty(value = "联系电话", index = 2) @ApiModelProperty("联系电话") private String phone; + @ExcelProperty(value = "业务类别", index = 3) @ApiModelProperty("业务类别") private String businessType; + @ExcelProperty(value = "金额", index = 4) @ApiModelProperty("金额") private Double applyAmount; + @ExcelProperty(value = "期限", index = 5) @ApiModelProperty("期限") private String applyTime; + @ExcelProperty(value = "申请日期", index = 6) @ApiModelProperty("申请日期") @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date createTime; + @ExcelProperty(value = "A角", index = 7) @ApiModelProperty("A角") private String aRoleName; + @ExcelProperty(value = "B角", index = 8) @ApiModelProperty("B角") private String bRoleName; + @ExcelProperty(value = "法规监督部", index = 9) @ApiModelProperty("法规监督部") private String regulationName; + @ExcelProperty(value = "资产管理部", index = 10) @ApiModelProperty("资产管理部") private String assetName; + @ExcelProperty(value = "信息服务部", index = 11) @ApiModelProperty("信息服务部") private String messageName; + @ExcelProperty(value = "操作状态", index = 12, converter = OperatingStatusConverter.class) @ApiModelProperty("操作状态,0:已发起,1:待处理,2:已处理") private Integer operationStatus; + @ExcelProperty(value = "审核状态", index = 13, converter = ApprovalStatusConverter.class) @ApiModelProperty("审核状态,0:待指派,1:审核中,2:已审核,3:已拒绝,4:已驳回,5:草稿,6:已撤销") private Integer auditStatus; + @ExcelProperty(value = "业务状态", index = 14, converter = BusinessStatusConverter.class) @ApiModelProperty("业务状态,1->进行中;2->已完成;3->已否决") private Integer businessStatus; + @ExcelIgnore @ApiModelProperty("角色id") private Integer roleId; + @ExcelIgnore @ApiModelProperty("业务id") private Integer businessId; } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java index 52346fa5..6e513753 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/GuaranteeDetailResponse.java @@ -39,6 +39,4 @@ public class GuaranteeDetailResponse implements Serializable { private DgEnclosureInfoResponse dgEnclosureInfo; - - } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java index ff53793e..61537010 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgComplianceInvestigationService.java @@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; +import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; import com.daqing.framework.utils.PageUtils; @@ -20,13 +21,13 @@ public interface IDgComplianceInvestigationService extends IService ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java index 78d55e39..6c7a0611 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgLoanCommitteeConsiderService.java @@ -5,6 +5,7 @@ import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderReque import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; import com.daqing.framework.utils.PageUtils; +import javax.servlet.http.HttpServletResponse; import java.util.List; /** @@ -24,4 +25,6 @@ public interface IDgLoanCommitteeConsiderService extends IService getJudges(Integer id); DgLoanCommitteeConsider query(Integer id); + + Boolean excelExport(HttpServletResponse response, List ids); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java index fd45faba..14cb63e5 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java @@ -4,11 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper; +import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper; import com.daqing.financial.guarantee.model.request.DgComplianceInvestigationRequest; +import com.daqing.financial.guarantee.model.response.AssetsDetailResponse; +import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationInfoResponse; import com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse; +import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse; +import com.daqing.financial.guarantee.service.IDgAssetsInvestigationService; import com.daqing.financial.guarantee.service.IDgComplianceInvestigationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.daqing.financial.guarantee.util.AuditProcessUtil; +import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; @@ -49,6 +54,15 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl roleList = new ArrayList<>(); - for (String roleId : roleIds) { - roleList.add(Integer.parseInt(roleId)); - } List idList = new ArrayList<>(); for (String id : ids) { idList.add(Integer.parseInt(id)); } - List list = this.getBaseMapper().listExcel(roleList, Integer.parseInt(userId), idList); + List list = this.getBaseMapper().listExcel(idList); try { - ExcelUtil.writeExcelWithSheets(response, list, "合规调查数据一览表", "complianceInvestigation", - new DgComplianceInvestigationResponse()); + ExcelUtil.writeExcelWithSheets(response, list, "合规调查数据一览表", "NO.1", new DgComplianceInvestigationResponse()) + .finish(); } catch (Exception e) { ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java index 296e500d..f2726e29 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java @@ -6,8 +6,11 @@ import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper; import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper; import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest; import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResponse; +import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService; import com.daqing.financial.guarantee.service.IDgLoanCommitteeConsiderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.framework.domain.crms.response.CrmsCode; +import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser; import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; import com.daqing.framework.domain.guarantee.GuaranteeCode; import com.daqing.framework.exception.ExceptionCast; @@ -16,12 +19,14 @@ import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.utils.excel.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -42,6 +47,9 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl ids) { + List idList = new ArrayList<>(); + for (String id : ids) { + idList.add(Integer.parseInt(id)); + } + List list = this.getBaseMapper().excelList(idList); + try { + ExcelUtil.writeExcelWithSheets(response, list, "贷审会数据一览表", "NO.1", new DgLoanCommitteeConsiderResponse()) + .finish(); + } catch (Exception e) { + ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); + } + return false; + } + /** * 获取当前登录用户信息 */ diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java index 6cc5281d..65aa378e 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java @@ -2,24 +2,33 @@ package com.daqing.financial.guarantee.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.daqing.financial.guarantee.feign.HrmsFeignService; import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper; import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper; import com.daqing.financial.guarantee.mapper.DgWorkConferenceConsiderMapper; import com.daqing.financial.guarantee.model.response.AuditOpinionResponse; +import com.daqing.financial.guarantee.model.response.DgWorkConferenceResponse; +import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse; +import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService; import com.daqing.financial.guarantee.service.IDgWorkConferenceConsiderService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.daqing.framework.domain.crms.response.CrmsCode; import com.daqing.framework.domain.guarantee.DgComplianceInvestigation; import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider; import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider; import com.daqing.framework.domain.guarantee.GuaranteeCode; import com.daqing.framework.domain.guarantee.po.AuditOpinionPO; import com.daqing.framework.domain.guarantee.po.DgWorkConferencePO; +import com.daqing.framework.domain.hrms.ext.EmployeeVO; import com.daqing.framework.exception.ExceptionCast; import com.daqing.framework.model.StatusCode; import com.daqing.framework.model.response.CommonCode; import com.daqing.framework.model.response.PromptSuccess; +import com.daqing.framework.model.response.ResponseResult; import com.daqing.framework.util.RedisUtil; import com.daqing.framework.utils.PageUtils; +import com.daqing.framework.utils.excel.ExcelUtil; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,6 +40,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** *

@@ -50,6 +60,12 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl list = this.getBaseMapper().list(new Page(page, size), codeOrName, roleList, Integer.parseInt(userId)); - return new PageUtils(list); + List dgWorkConferencePOS = list.getRecords(); + System.out.println(dgWorkConferencePOS); + Integer[] userIds = new Integer[dgWorkConferencePOS.size() * 5]; + for (int i = 0; i < userIds.length; i += 5) { + for (int j = i / 5; j < i / 5 + 1; j++) { + userIds[i] = dgWorkConferencePOS.get(j).getAUserId(); + userIds[i + 1] = dgWorkConferencePOS.get(j).getBUserId(); + userIds[i + 2] = dgWorkConferencePOS.get(j).getIUserId(); + userIds[i + 3] = dgWorkConferencePOS.get(j).getAssUserId(); + userIds[i + 4] = dgWorkConferencePOS.get(j).getMUserId(); + } + } + // 根据userId获取对应的员工姓名 + ResponseResult> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); + System.out.println(responseResult.getData()); + // 将对应的userId转换为name + List workConferenceResponses = this.transitionUserName(dgWorkConferencePOS, responseResult.getData()); + IPage iPage = new Page<>(); + BeanUtils.copyProperties(list, iPage); + iPage.setRecords(workConferenceResponses); + return new PageUtils(iPage); } /** @@ -135,6 +171,27 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); + List employees = responseResult.getData(); + for (EmployeeVO employee : employees) { + if (Objects.equals(employee.getId(), auditOpinion.getAEmpId().longValue())){ + auditOpinionResponse.setAName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getBEmpId().longValue())){ + auditOpinionResponse.setBName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getAssetEmpId().longValue())){ + auditOpinionResponse.setAssetName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getMessageEmpId().longValue())){ + auditOpinionResponse.setMessageName(employee.getName()); + } + if (Objects.equals(employee.getId(), auditOpinion.getRegulationEmpId().longValue())){ + auditOpinionResponse.setRegulationName(employee.getName()); + } + } + BeanUtils.copyProperties(auditOpinion, auditOpinionResponse); + // 获取担保信息 + Integer guaranteeId = dgComplianceInvestigationMapper.getGuaranteeId(businessId, PromptSuccess.DB_LD_ID); + GuaranteeDetailResponse guaranteeDetailResponse = guaranteeAssignUserService.guaranteeDetail(guaranteeId); + auditOpinionResponse.setDgApplyAmountInfo(guaranteeDetailResponse.getDgApplyAmountInfo()); + auditOpinionResponse.setLinkedHashMap(guaranteeDetailResponse.getLinkedHashMap()); + return auditOpinionResponse; } /** @@ -212,9 +301,40 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl ids) { - return null; + if (ids == null || ids.size() == 0) { + ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL); + } + List idList = new ArrayList<>(); + for (String id : ids) { + idList.add(Integer.parseInt(id)); + } + List list = this.getBaseMapper().excelList(idList); + System.out.println(list); + // 获取所有的userId + Integer[] userIds = new Integer[list.size() * 5]; + for (int i = 0; i < userIds.length; i += 5) { + for (int j = i / 5; j < i / 5 + 1; j++) { + userIds[i] = list.get(j).getAUserId(); + userIds[i + 1] = list.get(j).getBUserId(); + userIds[i + 2] = list.get(j).getIUserId(); + userIds[i + 3] = list.get(j).getAssUserId(); + userIds[i + 4] = list.get(j).getMUserId(); + } + } + // 根据userId获取对应的员工姓名 + ResponseResult> responseResult = hrmsFeignService.listEmpNameByUserId(userIds); + System.out.println(responseResult.getData()); + List excelList = this.transitionUserName(list, responseResult.getData()); + try { + ExcelUtil.writeExcelWithSheets(response, excelList, "工作会数据一览表", "NO.1", new DgWorkConferenceResponse()) + .finish(); + } catch (Exception e) { + ExceptionCast.cast(CrmsCode.CUSTOMER_EXPORT_EXSIT); + } + return false; } /** @@ -229,4 +349,35 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl transitionUserName(List workConferences, List employees) { + List workConferenceResponses = new ArrayList<>(); + DgWorkConferenceResponse workConferenceResponse; + for (DgWorkConferencePO workConference : workConferences) { + workConferenceResponse = new DgWorkConferenceResponse(); + for (EmployeeVO employee : employees) { + if (Objects.equals(workConference.getAUserId().longValue(), employee.getId())) { + workConferenceResponse.setARoleName(employee.getName()); + } + if (Objects.equals(workConference.getBUserId().longValue(), employee.getId())) { + workConferenceResponse.setBRoleName(employee.getName()); + } + if (Objects.equals(workConference.getIUserId().longValue(), employee.getId())) { + workConferenceResponse.setRegulationName(employee.getName()); + } + if (Objects.equals(workConference.getAssUserId().longValue(), employee.getId())) { + workConferenceResponse.setAssetName(employee.getName()); + } + if (Objects.equals(workConference.getMUserId().longValue(), employee.getId())) { + workConferenceResponse.setMessageName(employee.getName()); + } + } + BeanUtils.copyProperties(workConference, workConferenceResponse); + workConferenceResponses.add(workConferenceResponse); + } + return workConferenceResponses; + } } diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml index c544b76d..e7f36a75 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml @@ -41,12 +41,7 @@ LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id WHERE c.del_or_not = 0 - AND i.role_id IN - - #{roleId} - - AND (i.user_id = #{userId} OR i.user_id IS NULL) - WHERE i.id IN + AND i.id IN #{id} @@ -134,4 +129,12 @@ UPDATE dg_business_process_status SET business_status = #{businessStatus} WHERE business_id = #{businessId} + + + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml index 7c25cbe9..a8c30e67 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml @@ -58,4 +58,15 @@ + + + UPDATE dg_compliance_assign_user SET status = #{auditStatus} WHERE business_id = #{businessId} + + + + + UPDATE dg_compliance_assign_user SET operating_status = #{operationStatus} + WHERE business_id = #{businessId} AND (role_id = 59 OR role_id = 60) + + diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml index d6be14e7..3e699eba 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml @@ -31,7 +31,7 @@ LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id WHERE c.del_or_not = 0 - AND (l.consider = #{userId} OR l.consider_id IS NULL) + AND (l.consider_id = #{userId} OR l.consider_id IS NULL) AND l.role_id IN #{roleId} @@ -54,10 +54,9 @@ LEFT JOIN dg_business_process_status AS b ON b.business_id = a.id WHERE c.del_or_not = 0 - AND (l.consider = #{userId} OR l.consider_id IS NULL) - AND l.role_id IN - - #{roleId} + AND l.id IN + + #{id} ORDER BY a.create_time DESC diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml index 2ed3563a..00c90df5 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/DgWorkConferenceConsiderMapper.xml @@ -8,7 +8,6 @@ - @@ -52,6 +51,39 @@ ORDER BY a.create_time DESC + + UPDATE dg_work_conference_consider diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java index cfb942b4..c212d4f5 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/controller/EmployeeController.java @@ -245,6 +245,15 @@ public class EmployeeController implements EmployeeControllerApi { return new ResponseResult().SUCCESS(employeeService.getAccountAndDeptNameById(userId)); } + /** + * 根据userId获取对应的员工姓名 + */ + @GetMapping("/listEmpNameByUserId") + public ResponseResult listEmpNameByUserId(@RequestParam("userIds") Integer[] userIds) { + + return new ResponseResult>().SUCCESS(employeeService.listEmpNameByUserId(Arrays.asList(userIds))); + } + /** * 新增用户角色 * @@ -263,6 +272,6 @@ public class EmployeeController implements EmployeeControllerApi { @GetMapping("/saveUserRole") public ResponseResult saveUserRole(@RequestParam("userId") Long userId, @RequestParam("roleId") Long roleId) { - return ResponseResult.SUCCESS(employeeService.saveUserRole(userId,roleId)); + return ResponseResult.SUCCESS(employeeService.saveUserRole(userId, roleId)); } } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java index 61f56768..90a53645 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/EmployeeDao.java @@ -105,4 +105,6 @@ public interface EmployeeDao extends BaseMapper { boolean insertUsrRole(@Param("list") List list); int saveUserRole(@Param("userId") Long userId, @Param("roleId") Long roleId); + + List listEmpNameByUserId(@Param("userIds") List userIds); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java index 98b9c22f..a122d5bb 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/EmployeeService.java @@ -71,5 +71,7 @@ public interface EmployeeService extends IService { boolean insertUsrRole(List list); Boolean saveUserRole(Long userId, Long roleId); + + List listEmpNameByUserId(List userIds); } diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java index 9df7ce4c..d83804ad 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/service/impl/EmployeeServiceImpl.java @@ -22,6 +22,7 @@ import com.daqing.framework.util.Md5Util; import com.daqing.framework.utils.PageUtils; import com.daqing.framework.utils.excel.ExcelUtil; import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONArray; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -620,4 +621,16 @@ public class EmployeeServiceImpl extends ServiceImpl listEmpNameByUserId(List userIds) { + List userIdList = new ArrayList<>(); + for (Integer userId : userIds) { + userIdList.add(userId.longValue()); + } + return this.getBaseMapper().listEmpNameByUserId(userIdList); + } } \ No newline at end of file diff --git a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml index 659de7e2..777b84b2 100644 --- a/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml +++ b/dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml @@ -579,4 +579,17 @@ where hu.id=#{userId} + + + \ No newline at end of file diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AuditOpinionPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AuditOpinionPO.java index b681a4c2..6d6fd3a7 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AuditOpinionPO.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AuditOpinionPO.java @@ -1,5 +1,6 @@ package com.daqing.framework.domain.guarantee.po; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.ToString; @@ -20,45 +21,50 @@ public class AuditOpinionPO implements Serializable { @ApiModelProperty("担保A角调查意见") private String aAuditOpinion; - @ApiModelProperty("A角姓名") + @ApiModelProperty("A角id") private Integer aEmpId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("A角调查时间") private Date aTime; @ApiModelProperty("担保B角调查意见") private String bAuditOpinion; - @ApiModelProperty("B角姓名") - private String bEmpId; + @ApiModelProperty("B角id") + private Integer bEmpId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("B角调查时间") private Date bTime; @ApiModelProperty("资产审核意见") private String assetAuditOpinion; - @ApiModelProperty("资产姓名") - private String assetEmpId; + @ApiModelProperty("资产id") + private Integer assetEmpId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("资产审核时间") private Date assetTime; @ApiModelProperty("信息审核意见") private String messageAuditOpinion; - @ApiModelProperty("信息姓名") - private String messageEmpId; + @ApiModelProperty("信息id") + private Integer messageEmpId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("信息审核时间") private Date messageTime; @ApiModelProperty("法规审核意见") private String regulationAuditOpinion; - @ApiModelProperty("法规姓名") - private String regulationEmpId; + @ApiModelProperty("法规id") + private Integer regulationEmpId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") @ApiModelProperty("法规审核时间") private Date regulationTime; } diff --git a/dq-framework-utils/pom.xml b/dq-framework-utils/pom.xml index 2261cab7..c780b64c 100644 --- a/dq-framework-utils/pom.xml +++ b/dq-framework-utils/pom.xml @@ -47,6 +47,11 @@ easyexcel 2.1.1 + + org.apache.poi + poi-ooxml-schemas + 3.15 + org.apache.tomcat.embed tomcat-embed-core diff --git a/dq-govern-gateway/src/main/resources/jwt.properties b/dq-govern-gateway/src/main/resources/jwt.properties index ce045b6e..94961939 100644 --- a/dq-govern-gateway/src/main/resources/jwt.properties +++ b/dq-govern-gateway/src/main/resources/jwt.properties @@ -17,6 +17,9 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\ /api-guarantee/dg-message-investigation/excelExport,\ /api-guarantee/dg-assets-investigation/excelExport,\ /api-guarantee/dg-guarantee-assign-user/excelExport,\ + /api-guarantee/compliance/investigation/excelExport,\ + /api-guarantee/work/conference/excelExport,\ + /api-guarantee/committee/consider/excelExport,\ /api-guarantee/dg-guarantee-letter-assign-user/exportGuaranteeLetter,\ /api-guarantee/dg-guarantee-letter-assign-user/guaranteeLetterListExport,\ /api-guarantee/dg-payment-confirmation-consider/paymentConfirmationListExport,\