Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgApplyAmountInfoController.java

@@ -79,11 +79,7 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
     @GetMapping("/getRoles")
     @ApiOperation(value = "获取当前用户角色")
     public ResponseResult getRoles(){
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String roleIds = applyAmountInfoService.getRoles();
-        String token = request.getHeader("token");
-        String userId = RedisUtil.get("dq:token:" + token);
-        //获取当前用户拥有的角色ids
-        String roleIds = RedisUtil.get("dq:userRole:" + userId);
         return ResponseResult.SUCCESS(roleIds);
     }
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/controller/DgLoanNoticeController.java

@@ -89,6 +89,7 @@ public class DgLoanNoticeController {
                     put("bankName", bank);
                     put("clientName", name);
                     put("loanMoney", money);
+                    put("money", loanMoney);
                 }});
         try {
             httpServletResponse.setContentType("application/msword");

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgComplianceInvestigationMapper.java

@@ -65,4 +65,9 @@ public interface DgComplianceInvestigationMapper extends BaseMapper<DgCompliance
     Integer getGuaranteeId(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
 
     Integer getDgAssetsInvestigationId(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
+
+    Integer countWorkConferenceConsider(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
+
+    Boolean updateWorkConferenceConsider(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId,
+                                         @Param("auditStatus") Integer auditStatus, @Param("operationStatus") Integer operationStatus);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java

@@ -48,4 +48,9 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper<DgLoanCommitte
 
     Boolean updateOperationStatusById(@Param("id") Integer id, @Param("operatingStatus") Integer operatingStatus,
                                       @Param("refuseOpinion") String opinion);
+
+    Boolean updateGuaranteeLetterAssignUser(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId,
+                                            @Param("auditStatus") Integer auditStatus, @Param("operatingStatus") Integer operatingStatus);
+
+    Integer getAuditStatus(Integer id);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderConsent.java

@@ -45,7 +45,7 @@ public class DgLoanCommitteeConsiderConsent implements Serializable {
     @ApiModelProperty("操作,1:通过,2:拒绝,3:驳回")
     private Integer status;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("贷审会通过时间")
     private Date passingTime;
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgLoanCommitteeConsiderRequest.java

@@ -36,18 +36,18 @@ public class DgLoanCommitteeConsiderRequest implements Serializable {
     private String loanTern;
 
     @ApiModelProperty("同意")
-    private String agreePerson;
+    private String[] agreePersons;
 
     @ApiModelProperty("不同意")
-    private String disagreePerson;
+    private String[] disagreePersons;
 
     @ApiModelProperty("附件")
     private String[] fileUrls;
 
-    @ApiModelProperty("操作,1:通过,2:拒绝,3:驳回")
+    @ApiModelProperty("操作,1:通过,2:驳回,3:拒绝")
     private Integer status;
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @ApiModelProperty("贷审会通过时间")
     private Date passingTime;
 

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/request/DgWorkConferenceConsiderRequest.java

@@ -23,7 +23,7 @@ public class DgWorkConferenceConsiderRequest implements Serializable {
     @ApiModelProperty("审核意见")
     private String opinion;
 
-    @ApiModelProperty("操作,1:同意,2:拒绝,3:驳回")
+    @ApiModelProperty("操作,1:同意,2:驳回,3:拒绝")
     private Integer status;
 
     @ApiModelProperty("评委名称")

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgLoanCommitteeConsiderInfoResponse.java

@@ -49,13 +49,13 @@ public class DgLoanCommitteeConsiderInfoResponse implements Serializable {
      * 同意（贷审委员）
      */
     @ApiModelProperty("同意（贷审委员）")
-    private String agreePerson;
+    private String[] agreePersons;
 
     /**
      * 不同意（贷审委员）
      */
     @ApiModelProperty("不同意（贷审委员）")
-    private String disagreePerson;
+    private String[] disagreePersons;
 
     /**
      * 附件（会议记录）

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/model/response/DgWorkConferenceConsiderQueryResponse.java

@@ -0,0 +1,24 @@
+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/3 9:38
+ */
+@Data
+@ToString
+public class DgWorkConferenceConsiderQueryResponse implements Serializable {
+
+    @ApiModelProperty("工作会意见")
+    private String remark;
+
+    @ApiModelProperty("参会评委")
+    private String[] joinJudges;
+}

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgApplyAmountInfoService.java

@@ -32,4 +32,6 @@ public interface IDgApplyAmountInfoService extends IService<DgApplyAmountInfo> {
     Boolean excelExport(List<String> ids,HttpServletResponse response);
 
     int approvalBusinessApplication(Integer id, Integer status, String remark, Integer companyId);
+
+    String getRoles();
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IDgWorkConferenceConsiderService.java

@@ -2,6 +2,7 @@ package com.daqing.financial.guarantee.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.daqing.financial.guarantee.model.response.AuditOpinionResponse;
+import com.daqing.financial.guarantee.model.response.DgWorkConferenceConsiderQueryResponse;
 import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider;
 import com.daqing.framework.utils.PageUtils;
 
@@ -26,7 +27,7 @@ public interface IDgWorkConferenceConsiderService extends IService<DgWorkConfere
 
     AuditOpinionResponse getAuditOpinion(Integer businessId);
 
-    DgWorkConferenceConsider query(Integer id);
+    DgWorkConferenceConsiderQueryResponse query(Integer id);
 
     Boolean excelExport(HttpServletResponse response, List<String> ids);
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgApplyAmountInfoServiceImpl.java

@@ -85,6 +85,14 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
     @Resource
     private DgApplyAmountInfoController dgApplyAmountInfoController;
 
+    @Override
+    public String getRoles() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        String token = request.getHeader("token");
+        String userId = RedisUtil.get("dq:token:" + token);
+        //获取当前用户拥有的角色ids
+        return RedisUtil.get("dq:userRole:" + userId);
+    }
 
     @Override
     @Transactional

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgComplianceInvestigationServiceImpl.java

@@ -2,6 +2,7 @@ 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.controller.DgApplyAmountInfoController;
 import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper;
 import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper;
@@ -14,6 +15,7 @@ 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.service.IDgGuaranteeAssignUserService;
+import com.daqing.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
 import com.daqing.framework.domain.guarantee.DgWorkConferenceConsider;
@@ -122,7 +124,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                 Boolean result2 = (Boolean) responseResult.getData();
                 if (result2) {
                     // 在审核进程表中插入一条指派成功的数据
-                    return true;
+                    return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                            PromptSuccess.FG_JL_NAME, null, PromptSuccess.HG_PROCESS_ID);
                 }
             }
         }
@@ -160,7 +163,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                             StatusCode.CZ_ON_HAND, PromptSuccess.FG_JL_ID);
                     // 在业务流程表中插入一条调查成功的数据
                     if (result2) {
-                        return true;
+                        return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                     }
                 }
             }
@@ -186,7 +190,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                 .getBusinessId(), StatusCode.CZ_ON_HAND);
                         if (result3) {
                             // 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
-                            return true;
+                            return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                    PromptSuccess.FG_C_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                         }
                     }
                 }
@@ -211,7 +216,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
         // 1.待处理,表示业务进行到法规经理审核
         if (Objects.equals(operationStatus, StatusCode.CZ_ON_HAND)) {
             // 查询业务流程表,找出该业务id的最新操作记录的角色id
-            Integer roleId = 70;
+            Integer roleId = 69;
             if (roleId.equals(PromptSuccess.DB_A_ID) || roleId.equals(PromptSuccess.DB_B_ID)) {
                 // 1.1.若为A/B角,表示为驳回数据
                 // 同意
@@ -224,7 +229,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                 StatusCode.CZ_ON_HAND, PromptSuccess.FG_C_ID);
                         if (result1) {
                             // 在业务流程表中插入一条法规经理同意的数据
-                            return true;
+                            return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                    PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                         }
                     }
                 }
@@ -245,7 +251,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                     StatusCode.CZ_ON_HAND, PromptSuccess.FG_C_ID);
                             if (result2) {
                                 // 在业务流程表中插入一条法规经理驳回的数据
-                                return true;
+                                return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                             }
                         }
                     }
@@ -267,7 +274,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                     this.getComplianceInvestigation(iid).getBusinessId(), StatusCode.YW_REJECTED);
                             if (result2) {
                                 // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
-                                return true;
+                                return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                             }
                         }
                     }
@@ -290,7 +298,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                         Boolean result1 = this.getBaseMapper().assign(complianceInvestigation);
                         if (result1) {
                             // 在业务流程表中插入一条法规经理审核成功的数据
-                            return true;
+                            return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                    PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                         }
                     }
                 }
@@ -311,7 +320,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                     StatusCode.CZ_ON_HAND, PromptSuccess.FG_C_ID);
                             if (result2) {
                                 // 在业务流程表中插入一条法规经理驳回的数据
-                                return true;
+                                return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                             }
                         }
                     }
@@ -333,7 +343,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                     this.getComplianceInvestigation(iid).getBusinessId(), StatusCode.YW_REJECTED);
                             if (result2) {
                                 // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
-                                return true;
+                                return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                        PromptSuccess.FG_JL_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                             }
                         }
                     }
@@ -347,20 +358,29 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                 Boolean result = this.getBaseMapper().check(iid, opinion, new Date(), StatusCode.SP_REVIEWED,
                         StatusCode.CZ_PROCESSED, Integer.parseInt(userId));
                 if (result) {
-                    // 在工作会表中插入一条数据;
                     DgComplianceInvestigation complianceInvestigation = this.getComplianceInvestigation(iid);
-                    DgWorkConferenceConsider workConferenceConsider = new DgWorkConferenceConsider();
+                    Integer count = this.getBaseMapper().countWorkConferenceConsider(complianceInvestigation.getBusinessId(), PromptSuccess.GZU_ID);
-                    workConferenceConsider.setCompanyId(complianceInvestigation.getCompanyId());
+                    Boolean result1;
-                    workConferenceConsider.setBusinessId(complianceInvestigation.getBusinessId());
+                    if (count > 0) {
-                    workConferenceConsider.setRoleId(PromptSuccess.GZU_ID);
+                        // 工作会该条数据存在,表示是工作会驳回的数据
-                    workConferenceConsider.setAuditStatus(StatusCode.SP_IN_REVIEW);
+                        result1 = this.getBaseMapper().updateWorkConferenceConsider(complianceInvestigation.getBusinessId(), PromptSuccess.GZU_ID,
-                    workConferenceConsider.setOperationStatus(StatusCode.CZ_ON_HAND);
+                                StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND);
-                    workConferenceConsider.setCreateTime(new Date());
+                    } else {
-                    workConferenceConsider.setUpdateTime(new Date());
+                        // 工作会该条数据不存在，表示不是工作会驳回数据,需要新增一条
-                    Boolean result1 = this.getBaseMapper().insertWorkConferenceConsider(workConferenceConsider);
+                        DgWorkConferenceConsider workConferenceConsider = new DgWorkConferenceConsider();
+                        workConferenceConsider.setCompanyId(complianceInvestigation.getCompanyId());
+                        workConferenceConsider.setBusinessId(complianceInvestigation.getBusinessId());
+                        workConferenceConsider.setRoleId(PromptSuccess.GZU_ID);
+                        workConferenceConsider.setAuditStatus(StatusCode.SP_IN_REVIEW);
+                        workConferenceConsider.setOperationStatus(StatusCode.CZ_ON_HAND);
+                        workConferenceConsider.setCreateTime(new Date());
+                        workConferenceConsider.setUpdateTime(new Date());
+                        result1 = this.getBaseMapper().insertWorkConferenceConsider(workConferenceConsider);
+                    }
                     if (result1) {
                         // 在业务流程表中插入一条法规领导审核成功的数据
-                        return true;
+                        return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                     }
                 }
             }
@@ -381,7 +401,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                 StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
                         if (result2) {
                             // 在业务流程表中插入一条法规领导驳回的数据
-                            return true;
+                            return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                    PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                         }
                     }
                 }
@@ -403,7 +424,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                                 this.getComplianceInvestigation(iid).getBusinessId(), StatusCode.YW_REJECTED);
                         if (result2) {
                             // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
-                            return true;
+                            return AuditProcessUtil.save(this.getComplianceInvestigation(iid).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                    PromptSuccess.FG_LD_NAME, opinion, PromptSuccess.HG_PROCESS_ID);
                         }
                     }
                 }
@@ -430,11 +452,11 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
         AssetsDetailResponse assetsDetailResponse = dgAssetsInvestigationService.assetsDetail(dgAssetsInvestigationId);
         // 合规附件和意见
         DgComplianceInvestigation dgComplianceInvestigation = this.getBaseMapper().queryDgComplianceInvestigation(iid);
-        if (dgComplianceInvestigation.getFile() != null) {
+        if (dgComplianceInvestigation.getFile() != null && dgComplianceInvestigation.getFile().length() != 0) {
             String[] fileUrls = dgComplianceInvestigation.getFile().split(",");
             dgComplianceInvestigationInfoResponse.setFileUrls(fileUrls);
         }
-        if (dgComplianceInvestigation.getOpinion() != null) {
+        if (dgComplianceInvestigation.getOpinion() != null && dgComplianceInvestigation.getOpinion().length() != 0) {
             dgComplianceInvestigationInfoResponse.setOpinion(dgComplianceInvestigation.getOpinion());
         }
         // 统一返回
@@ -472,14 +494,13 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
     @Override
     public String getFileUrl(String[] fileUrls) {
         StringBuilder fileUrl = new StringBuilder();
-        if (null == fileUrls || fileUrls.length == 0) {
+        if (null != fileUrls && fileUrls.length != 0) {
-            return fileUrl.toString();
+            for (int i = 0; i < fileUrls.length; i++) {
-        }
+                if (i == fileUrls.length - 1) {
-        for (int i = 0; i < fileUrls.length; i++) {
+                    fileUrl.append(fileUrls[i]);
-            if (i == fileUrls.length - 1) {
+                } else {
-                fileUrl.append(fileUrls[i]);
+                    fileUrl.append(fileUrls[i]).append(",");
-            } else {
+                }
-                fileUrl.append(fileUrls[i]).append(",");
             }
         }
         return fileUrl.toString();

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -360,6 +360,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                         //审批状态为已驳回，操作状态为待处理
                         dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT);
                         dgGuaranteeLetterAssignUserA.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                        dgGuaranteeLetterAssignUserA.setAuditOpinion("");
                         //更新a角操作业务数据
                         baseMapper.updateById(dgGuaranteeLetterAssignUserA);
 
@@ -370,6 +371,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                         //审批状态为已驳回，操作状态为待处理
                         dgGuaranteeLetterAssignUserB.setStatus(StatusCode.SP_REJECT);
                         dgGuaranteeLetterAssignUserB.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                        dgGuaranteeLetterAssignUserB.setAuditOpinion("");
                         //更新b用户操作业务数据
                         int update = baseMapper.updateById(dgGuaranteeLetterAssignUserB);
                         //更新成功，返回操作结果
@@ -458,7 +460,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //清空审批意见
                             letterAssignUserZCJL.setAuditOpinion("");
                             letterAssignUserZCJL.setStatus(StatusCode.SP_IN_REVIEW);
-                            letterAssignUserZCJL.setStatus(StatusCode.CZ_ON_HAND);
+                            letterAssignUserZCJL.setOperatingStatus(StatusCode.CZ_ON_HAND);
                             int update = baseMapper.updateById(letterAssignUserZCJL);
                             //更新成功，返回操作结果
                             log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败");
@@ -590,7 +592,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                             //清空审批意见
                             letterAssignUserZCJL.setAuditOpinion("");
                             letterAssignUserZCJL.setStatus(StatusCode.SP_IN_REVIEW);
-                            letterAssignUserZCJL.setStatus(StatusCode.CZ_ON_HAND);
+                            letterAssignUserZCJL.setOperatingStatus(StatusCode.CZ_ON_HAND);
                             int update = baseMapper.updateById(letterAssignUserZCJL);
                             //更新成功，返回操作结果
                             log.info(update > 0 ? "资产部经理更新成功" : "资产部经理更新失败");
@@ -624,7 +626,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                         tempA.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
                         DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserA = baseMapper.selectOne(tempA);
                         dgGuaranteeLetterAssignUserA.setStatus(StatusCode.SP_REJECT);
-                        dgGuaranteeLetterAssignUserA.setStatus(StatusCode.CZ_PROCESSED);
+                        dgGuaranteeLetterAssignUserA.setOperatingStatus(StatusCode.CZ_PROCESSED);
                         baseMapper.updateById(dgGuaranteeLetterAssignUserA);
 
                         //更新法规部经理的审核状态为驳回，操作状态为待处理

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanCommitteeConsiderServiceImpl.java

@@ -1,9 +1,10 @@
 package com.daqing.financial.guarantee.service.impl;
 
-import ch.qos.logback.core.joran.util.beans.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController;
 import com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper;
+import com.daqing.financial.guarantee.mapper.DgGuaranteeAssignUserMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
 import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderConsent;
 import com.daqing.financial.guarantee.model.request.DgLoanCommitteeConsiderRequest;
@@ -12,6 +13,7 @@ import com.daqing.financial.guarantee.model.response.DgLoanCommitteeConsiderResp
 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.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
 import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider;
@@ -57,6 +59,9 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
     @Autowired
     private IDgGuaranteeLetterAssignUserService guaranteeLetterAssignUserService;
 
+    @Autowired
+    private DgGuaranteeAssignUserMapper dgGuaranteeAssignUserMapper;
+
     /**
      * 列表
      */
@@ -103,27 +108,43 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                     || dgLoanCommitteeConsiderRequest.getFileUrls().length == 0) {
                 ExceptionCast.cast(GuaranteeCode.LOAN_MESSAGE_NOT_NULL);
             }
+            // 将文件数组拼接为文件字符串形式
             String fileUrl = dgComplianceInvestigationService.getFileUrl(dgLoanCommitteeConsiderRequest.getFileUrls());
             DgLoanCommitteeConsiderConsent consent = new DgLoanCommitteeConsiderConsent();
             BeanUtils.copyProperties(dgLoanCommitteeConsiderRequest, consent);
+            // 将同意名单和不同意名单拼接为字符串格式
+            consent.setAgreePerson(this.jointName(dgLoanCommitteeConsiderRequest.getAgreePersons()));
+            consent.setDisagreePerson(this.jointName(dgLoanCommitteeConsiderRequest.getDisagreePersons()));
             consent.setFileUrl(fileUrl);
             Boolean result = this.getBaseMapper().check(consent, Integer.getInteger(userId), StatusCode.SP_REVIEWED, StatusCode.CZ_PROCESSED, new Date());
             if (result) {
-                // 在担保函表中插入条数据
+                Integer auditStatus = this.getBaseMapper().getAuditStatus(dgLoanCommitteeConsiderRequest.getId());
-                DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser();
+                Boolean result1;
-                guaranteeLetterAssignUser.setBusinessId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
+                if (StatusCode.SP_REJECT.equals(auditStatus)) {
-                        .getBusinessId());
+                    // 当前贷审会的操作状态为驳回,表示为担保函驳回数据
-                guaranteeLetterAssignUser.setUserId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
+                    result1 = this.getBaseMapper().updateGuaranteeLetterAssignUser(
-                        .getCompanyId());
+                            this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
-                boolean result1 = guaranteeLetterAssignUserService.saveGuaranteeLetter(guaranteeLetterAssignUser);
+                            PromptSuccess.FG_JL_ID, StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND);
+                } else {
+                    // 当前贷审会的操作状态部位驳回,表示不是担保函驳回数据,在担保函表中插入一条数据
+                    DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = new DgGuaranteeLetterAssignUser();
+                    guaranteeLetterAssignUser.setBusinessId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
+                            .getBusinessId());
+                    guaranteeLetterAssignUser.setUserId(this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId())
+                            .getCompanyId());
+                    result1 = guaranteeLetterAssignUserService.saveGuaranteeLetter(guaranteeLetterAssignUser);
+                }
                 if (result1) {
                     // 在业务流程表中插入一条审议成功的数据
+                    return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
+                            dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                            PromptSuccess.DSH_NAME, null, PromptSuccess.DSH_PROCESS_ID);
                 }
                 return false;
             }
         }
         // 拒绝
-        if (dgLoanCommitteeConsiderRequest.getStatus() == 2) {
+        if (dgLoanCommitteeConsiderRequest.getStatus() == 3) {
             if (dgLoanCommitteeConsiderRequest.getRefuseOpinion() == null
                     || dgLoanCommitteeConsiderRequest.getRefuseOpinion().length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
@@ -143,14 +164,46 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
                             StatusCode.YW_REJECTED);
                     if (result2) {
                         // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
-                        return true;
+                        return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
+                                dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID);
                     }
                 }
             }
         }
         // 驳回
-        if (dgLoanCommitteeConsiderRequest.getStatus() == 3) {
+        if (dgLoanCommitteeConsiderRequest.getStatus() == 2) {
-
+            if (dgLoanCommitteeConsiderRequest.getRefuseOpinion() == null
+                    || dgLoanCommitteeConsiderRequest.getRefuseOpinion().length() == 0) {
+                ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
+            }
+            // 先改变贷审会的审核状态为驳回
+            Boolean result = this.getBaseMapper().updateAuditStatusByBusinessId(
+                    this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
+                    StatusCode.SP_REJECT);
+            if (result) {
+                // 再改变自己的操作状态为已处理
+                Boolean result1 = this.getBaseMapper().updateOperationStatusById(dgLoanCommitteeConsiderRequest.getId(),
+                        StatusCode.CZ_PROCESSED, dgLoanCommitteeConsiderRequest.getRefuseOpinion());
+                if (result1) {
+                    // 改变担保部的审核状态为驳回
+                    Boolean result2 = dgGuaranteeAssignUserMapper.updateAuditStatusByBusinessId(
+                            this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
+                            StatusCode.SP_REJECT);
+                    if (result2) {
+                        // 修改AB角的操作状态为待处理
+                        Boolean result3 = dgGuaranteeAssignUserMapper.updateOperationStatusById(
+                                this.getBaseMapper().getDgLoanCommitteeConsider(dgLoanCommitteeConsiderRequest.getId()).getBusinessId(),
+                                StatusCode.CZ_ON_HAND);
+                        if (result3) {
+                            // 在业务流程表中插入一条驳回成功的数据(记得带上驳回的意见)
+                            return AuditProcessUtil.save(this.getBaseMapper().getDgLoanCommitteeConsider(
+                                    dgLoanCommitteeConsiderRequest.getId()).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                    PromptSuccess.DSH_NAME, dgLoanCommitteeConsiderRequest.getRefuseOpinion(), PromptSuccess.DSH_PROCESS_ID);
+                        }
+                    }
+                }
+            }
         }
         return false;
     }
@@ -182,9 +235,18 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
         }
         DgLoanCommitteeConsider dgLoanCommitteeConsider = this.getBaseMapper().query(id);
         DgLoanCommitteeConsiderInfoResponse dgLoanCommitteeConsiderInfoResponse = new DgLoanCommitteeConsiderInfoResponse();
-        if (dgLoanCommitteeConsider.getFile() != null) {
+        // 文件数组
+        if (dgLoanCommitteeConsider.getFile() != null && dgLoanCommitteeConsider.getFile().length() != 0) {
             dgLoanCommitteeConsiderInfoResponse.setFileUrls(dgLoanCommitteeConsider.getFile().split(","));
         }
+        // 同意名单数组
+        if (dgLoanCommitteeConsider.getAgreePerson() != null && dgLoanCommitteeConsider.getAgreePerson().length() != 0) {
+            dgLoanCommitteeConsiderInfoResponse.setAgreePersons(dgLoanCommitteeConsider.getAgreePerson().split(","));
+        }
+        // 不同意名单数组
+        if (dgLoanCommitteeConsider.getDisagreePerson() != null && dgLoanCommitteeConsider.getDisagreePerson().length() != 0) {
+            dgLoanCommitteeConsiderInfoResponse.setDisagreePersons(dgLoanCommitteeConsider.getDisagreePerson().split(","));
+        }
         BeanUtils.copyProperties(dgLoanCommitteeConsider, dgLoanCommitteeConsiderInfoResponse);
         return dgLoanCommitteeConsiderInfoResponse;
     }
@@ -194,6 +256,9 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
      */
     @Override
     public Boolean excelExport(HttpServletResponse response, List<String> ids) {
+        if (null == ids || ids.size() == 0){
+            ExceptionCast.cast(GuaranteeCode.EXCEL_ID_NOT_NULL);
+        }
         List<Integer> idList = new ArrayList<>();
         for (String id : ids) {
             idList.add(Integer.parseInt(id));
@@ -220,4 +285,21 @@ public class DgLoanCommitteeConsiderServiceImpl extends ServiceImpl<DgLoanCommit
         }
         return userId;
     }
+
+    /**
+     * 将名称数组拼接为名字字符串,以逗号隔开
+     */
+    private String jointName(String[] names) {
+        StringBuilder name = new StringBuilder();
+        if (null != names && names.length != 0) {
+            for (int i = 0; i < names.length; i++) {
+                if (i == names.length - 1) {
+                    name.append(names[i]);
+                } else {
+                    name.append(names[i]).append(",");
+                }
+            }
+        }
+        return name.toString();
+    }
 }

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgLoanNoticeServiceImpl.java

@@ -137,7 +137,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
             DgLoanNotice loanNotice = baseMapper.selectOne(loanNoticeQueryWrapper);
             loanNotice.setAuditOpinion(auditOpinion);
             loanNotice.setConsiderId(currentUser);
-            loanNotice.setStatus(StatusCode.SP_REVIEWED);
+            loanNotice.setStatus(StatusCode.SP_REJECT);
             loanNotice.setOperatingStatus(StatusCode.CZ_PROCESSED);
             int update = baseMapper.updateById(loanNotice);
             //同时往审核流程进程表新增一条记录
@@ -150,6 +150,7 @@ public class DgLoanNoticeServiceImpl extends ServiceImpl<DgLoanNoticeMapper, DgL
                 DgPaymentConfirmationConsider paymentConfirmationConsider = paymentConfirmationConsiderMapper.selectOne(queryWrapper);
                 paymentConfirmationConsider.setStatus(StatusCode.SP_REJECT);
                 paymentConfirmationConsider.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                paymentConfirmationConsider.setAuditOpinion("");
                 int updateById = paymentConfirmationConsiderMapper.updateById(paymentConfirmationConsider);
                 //更新成功，返回操作结果
                 log.info(updateById > 0 ? "驳回更新财务部经理成功" : "驳回更新财务部经理失败");

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -9,9 +9,6 @@ import com.daqing.financial.guarantee.mapper.DgLoanNoticeMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationQueryRequest;
 import com.daqing.financial.guarantee.model.request.PaymentConfirmationUpdateRequest;
-import com.daqing.financial.guarantee.model.response.BusinessApplicationListResponse;
-import com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse;
-import com.daqing.financial.guarantee.model.response.LoanNoticeListResponse;
 import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResponse;
 import com.daqing.financial.guarantee.service.IDgPaymentConfirmationConsiderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -24,7 +21,6 @@ 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.EasyExcelUtil;
-import com.daqing.framework.utils.excel.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -213,6 +209,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                         DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUser = guaranteeLetterAssignUserMapper.selectOne(guaranteeLetterAssignUserQueryWrapper);
                         dgGuaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT);
                         dgGuaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);
+                        dgGuaranteeLetterAssignUser.setAuditOpinion("");
                         int updateById = guaranteeLetterAssignUserMapper.updateById(dgGuaranteeLetterAssignUser);
                         //更新成功，返回操作结果
                         log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");
@@ -307,6 +304,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                         DgPaymentConfirmationConsider paymentConfirmationConsiderT = baseMapper.selectOne(queryWrapperT);
                         paymentConfirmationConsiderT.setOperatingStatus(StatusCode.CZ_ON_HAND);
                         paymentConfirmationConsiderT.setStatus(StatusCode.SP_REJECT);
+                        paymentConfirmationConsiderT.setAuditOpinion("");
                         int updateById = baseMapper.updateById(paymentConfirmationConsiderT);
                         //更新成功，返回操作结果
                         log.info(updateById > 0 ? "驳回更新资产部经理成功" : "驳回更新资产部经理失败");

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgWorkConferenceConsiderServiceImpl.java

@@ -2,16 +2,19 @@ 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.controller.DgApplyAmountInfoController;
 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.DgWorkConferenceConsiderQueryResponse;
 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.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.DgComplianceInvestigation;
 import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider;
@@ -111,7 +114,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
         } else {
             for (int i = 0; i < dgWorkConferencePOS.size(); i++) {
                 DgWorkConferenceResponse workConferenceResponse = new DgWorkConferenceResponse();
-                BeanUtils.copyProperties(dgWorkConferencePOS.get(i),workConferenceResponse);
+                BeanUtils.copyProperties(dgWorkConferencePOS.get(i), workConferenceResponse);
                 workConferenceResponses.add(workConferenceResponse);
             }
         }
@@ -150,11 +153,12 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
                     StatusCode.SP_IN_REVIEW, StatusCode.CZ_ON_HAND, new Date(), names.toString());
             if (result) {
                 // 在业务流程表中插入一条审议通过的数据
-                return true;
+                return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                        PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
             }
         }
         // 拒绝
-        if (status == 2) {
+        if (status == 3) {
             if (opinion == null || opinion.length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
             }
@@ -170,13 +174,14 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
                             this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), StatusCode.YW_REJECTED);
                     if (result2) {
                         // 在业务流程表中插入一条拒绝数据(记得带上拒绝意见)
-                        return true;
+                        return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
                     }
                 }
             }
         }
         // 驳回
-        if (status == 3) {
+        if (status == 2) {
             if (opinion == null || opinion.length() == 0) {
                 ExceptionCast.cast(GuaranteeCode.COMPLIANCE_INVESTIGATION_REMARK_NOT_NULL);
             }
@@ -196,7 +201,8 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
                                 .getWorkConferenceConsider(id).getBusinessId(), StatusCode.CZ_ON_HAND, PromptSuccess.FG_LD_ID);
                         if (result3) {
                             // 在业务流程表中插入一条工作会驳回的数据
-                            return true;
+                            return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                                    PromptSuccess.GZU_NAME, opinion, PromptSuccess.GZU_PROCESS_ID);
                         }
                     }
                 }
@@ -243,7 +249,8 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
                 Boolean result1 = dgLoanCommitteeConsiderMapper.TheJudgesDrawn(workConferenceConsider.getBusinessId(), names.toString());
                 if (result1) {
                     // 在业务流程表中插入一条评委抽取成功的数据
-                    return true;
+                    return AuditProcessUtil.save(this.getBaseMapper().getWorkConferenceConsider(id).getBusinessId(), DgApplyAmountInfoController.getAccount(),
+                            PromptSuccess.GZU_NAME, null, PromptSuccess.GZU_PROCESS_ID);
                 }
             }
         }
@@ -270,7 +277,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
         userIds[4] = auditOpinion.getRegulationEmpId();
         ResponseResult<List<EmployeeVO>> responseResult = hrmsFeignService.listEmpNameByUserId(userIds);
         List<EmployeeVO> employees = responseResult.getData();
-        if (employees != null){
+        if (employees != null) {
             for (EmployeeVO employee : employees) {
                 if (Objects.equals(employee.getId(), auditOpinion.getAEmpId().longValue())) {
                     auditOpinionResponse.setAName(employee.getName());
@@ -302,11 +309,17 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
      * 查看
      */
     @Override
-    public DgWorkConferenceConsider query(Integer id) {
+    public DgWorkConferenceConsiderQueryResponse query(Integer id) {
         if (id == null) {
             ExceptionCast.cast(CommonCode.INVALID_PARAM);
         }
-        return this.getBaseMapper().query(id);
+        DgWorkConferenceConsiderQueryResponse queryResponse = new DgWorkConferenceConsiderQueryResponse();
+        DgWorkConferenceConsider dgWorkConferenceConsider = this.getBaseMapper().query(id);
+        if (dgWorkConferenceConsider.getJoinJudge() != null && dgWorkConferenceConsider.getJoinJudge().length() != 0) {
+            queryResponse.setJoinJudges(dgWorkConferenceConsider.getJoinJudge().split(","));
+        }
+        queryResponse.setRemark(dgWorkConferenceConsider.getRemark());
+        return queryResponse;
     }
 
     /**
@@ -341,7 +354,7 @@ public class DgWorkConferenceConsiderServiceImpl extends ServiceImpl<DgWorkConfe
         List<DgWorkConferenceResponse> excelList = new ArrayList<>();
         if (responseResult.getData() != null) {
             excelList = this.transitionUserName(list, responseResult.getData());
-        }else {
+        } else {
             for (DgWorkConferencePO dgWorkConferencePO : list) {
                 DgWorkConferenceResponse workConferenceResponse = new DgWorkConferenceResponse();
                 BeanUtils.copyProperties(dgWorkConferencePO, workConferenceResponse);

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgComplianceInvestigationMapper.xml

@@ -129,12 +129,25 @@
         UPDATE dg_business_process_status SET business_status = #{businessStatus} WHERE business_id = #{businessId}
     </update>
 
+    <!-- 根据业务id和角色id获取担保id,用于获取担保信息 -->
     <select id="getGuaranteeId" resultType="integer">
         SELECT id FROM dg_guarantee_assign_user WHERE business_id = #{businessId} AND role_id = #{roleId}
     </select>
 
+    <!-- 根据业务id和角色id获取资产id,用于获取资产信息 -->
     <select id="getDgAssetsInvestigationId" resultType="integer">
         SELECT id FROM dg_assets_investigation WHERE business_id = #{businessId} AND role_id = #{roleId}
     </select>
 
+    <!-- 根据业务id和角色id判断工作会该条数据是否存在 -->
+    <select id="countWorkConferenceConsider" resultType="integer">
+        SELECT COUNT(id) FROM dg_work_conference_consider WHERE business_id = #{businessId} AND role_id = #{roleId}
+    </select>
+
+    <!-- 更新工作会的审核状态和操作状态 -->
+    <update id="updateWorkConferenceConsider">
+        UPDATE dg_work_conference_consider SET audit_status = #{auditStatus},operation_status = #{operationStatus}
+        WHERE business_id = #{businessId} AND role_id = #{roleId}
+    </update>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeAssignUserMapper.xml

@@ -60,12 +60,12 @@
 
     <!-- 改变所有业务id相同的审核状态,用于拒绝或者驳回 -->
     <update id="updateAuditStatusByBusinessId">
-        UPDATE dg_compliance_assign_user SET status = #{auditStatus} WHERE business_id = #{businessId}
+        UPDATE dg_guarantee_assign_user SET status = #{auditStatus} WHERE business_id = #{businessId}
     </update>
 
     <!-- 根据业务id和角色id改变该数据的操作状态 -->
     <update id="updateOperationStatusById">
-       UPDATE dg_compliance_assign_user SET operating_status = #{operationStatus}
+       UPDATE dg_guarantee_assign_user SET operating_status = #{operationStatus}
        WHERE business_id = #{businessId} AND (role_id = 59 OR role_id = 60)
     </update>
 

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgGuaranteeLetterAssignUserMapper.xml

@@ -51,7 +51,7 @@
                 AND (lau.user_id = #{userId} or lau.user_id is null OR lau.user_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
+                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%' #{customerNumberOrName} '%'))
             </if>
             <if test="status != null and status != ''">
                 AND lau.status = #{status}

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanCommitteeConsiderMapper.xml

@@ -64,7 +64,7 @@
     <update id="check">
         UPDATE dg_loan_committee_consider
         SET consider_id = #{userId},status = #{status},operating_status = #{operatingStatus},create_time = #{date},
-            agreed_items = #{lr.agreedItems},additional_items = #{lr.additionalItems},loan_money = #{lrloanMoney},
+            agreed_items = #{lr.agreedItems},additional_items = #{lr.additionalItems},loan_money = #{lr.loanMoney},
             loan_tern = #{lr.loanTern},agree_person = #{lr.agreePerson},disagree_person = #{lr.disagreePerson},
             file = #{lr.fileUrl},passing_time = #{lr.passingTime}
         WHERE id = #{lr.id}
@@ -126,4 +126,15 @@
         UPDATE dg_loan_committee_consider SET operating_status = #{operatingStatus},refuse_opinion = #{refuseOpinion} WHERE id = #{id}
     </update>
 
+    <!-- 根据id获取当前数据的审核状态 -->
+    <select id="getAuditStatus" parameterType="integer" resultType="integer">
+        SELECT status FROM dg_loan_committee_consider WHERE id = #{id}
+    </select>
+
+    <!-- 根据业务id和角色id更新担保函数据 -->
+    <update id="updateGuaranteeLetterAssignUser">
+        UPDATE dg_guarantee_letter_assign_user SET status = #{auditStatus},operating_status = #{operatingStatus}
+        WHERE business_id = #{businessId} AND role_id = #{roleId}
+    </update>
+
 </mapper>

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgLoanNoticeMapper.xml

@@ -49,7 +49,7 @@
                 AND (ln.consider_id = #{userId} or ln.consider_id is null OR ln.consider_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
+                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%' #{customerNumberOrName} '%'))
             </if>
             <if test="status != null and status != ''">
                 AND ln.status = #{status}

dq-financial-guarantee/src/main/resources/mapper/guarantee/DgPaymentConfirmationConsiderMapper.xml

@@ -53,7 +53,7 @@
                 AND (pcc.consider_id = #{userId} or pcc.consider_id is null OR pcc.consider_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND aai.business_code LIKE CONCAT('%',#{customerNumberOrName},'%') OR cc.name LIKE CONCAT('%',#{customerNumberOrName},'%')
+                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%' #{customerNumberOrName} '%'))
             </if>
             <if test="status != null and status != ''">
                 AND pcc.status = #{status}

dq-framework-common/src/main/java/com/daqing/framework/model/response/PromptSuccess.java

@@ -75,4 +75,20 @@ public class PromptSuccess {
     public static final Integer DSH_ID = 72; // 贷审会
 
     public static final Integer CWB_ID = 73; // 财务部
+
+    public static final Integer HG_PROCESS_ID = 5; // 合规调查进程id
+
+    public static final Integer GZU_PROCESS_ID = 6; // 工作会进程id
+
+    public static final Integer DSH_PROCESS_ID = 7; // 贷审会进程id
+
+    public static final String FG_C_NAME = "法规部C角"; // 法规部C角
+
+    public static final String FG_JL_NAME = "法规部经理"; // 法规部经理
+
+    public static final String FG_LD_NAME = "法规部领导"; // 法规部领导
+
+    public static final String GZU_NAME = "工作会"; // 工作会
+
+    public static final String DSH_NAME = "贷审会"; // 贷审会
 }