Merge remote-tracking branch 'origin/master'

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

@@ -154,14 +154,11 @@ public class DgApplyAmountInfoController implements DgApplyAmountInfoControllerA
      */
     @GetMapping("/deleteServerFile")
     public boolean deleteServerFile(@RequestParam("filePath")String filePath){
-        log.info("filePath=========="+filePath);
         boolean delete_flag = false;
         String certainPath =PromptSuccess.FILE_URL_PATH;
         filePath = certainPath + filePath;
-        System.out.println("filePath============"+filePath);
         File file = new File(filePath);
         if (!file.exists()) {
-            System.out.println("file==============="+file.getName());
             return delete_flag;
         }
         try{

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

@@ -91,7 +91,10 @@ public class DgGuaranteeLetterAssignUserController {
         String loanTern = response.getLoanTern();
         Date passingTime = response.getPassingTime();
         String time = DateUtil.dateFormat(passingTime);
-        XWPFTemplate template = XWPFTemplate.compile("D:\\template\\template.docx").render(
+        //本地测试开启
+        // XWPFTemplate template = XWPFTemplate.compile("D:\\template\\template.docx").render(
+        //服务器测试
+        XWPFTemplate template = XWPFTemplate.compile("//usr//local//template//template.docx").render(
                 new HashMap<String, Object>(){{
                     put("bankName", bank);
                     put("clientName", name);

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

@@ -84,7 +84,10 @@ public class DgLoanNoticeController {
         Double loanMoney = response.getLoanMoney();
         BigDecimal numberOfMoney = new BigDecimal(loanMoney*10000);
         String money = NumberToCN.number2CNMontrayUnit(numberOfMoney);
-        XWPFTemplate template = XWPFTemplate.compile("D:\\template\\templateTwo.docx").render(
+        //本地测试开启
+        // XWPFTemplate template = XWPFTemplate.compile("D:\\template\\templateTwo.docx").render(
+        //服务器测试
+        XWPFTemplate template = XWPFTemplate.compile("//usr//local//template//templateTwo.docx").render(
                 new HashMap<String, Object>(){{
                     put("bankName", bank);
                     put("clientName", name);

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

@@ -0,0 +1,101 @@
+package com.daqing.financial.guarantee.model.response;
+
+import com.baomidou.mybatisplus.annotation.*;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 担保部记录
+ * </p>
+ *
+ * @author Qyq
+ * @since 2020-11-05
+ */
+@Data
+@TableName("dg_guarantee_assign_user")
+public class DgGuaranteeAssignUserResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 业务id
+     */
+    private Integer businessId;
+
+    /**
+     * 角色id
+     */
+    private Integer roleId;
+
+    /**
+     * 企业id
+     */
+    private Integer companyId;
+
+    /**
+     * 用户id
+     */
+    private Integer empId;
+
+    /**
+     * 类型（1：第一审批人 2：指派人AB角 3:第一审批人审核 3：经理）
+     */
+    private Integer type;
+
+    /**
+     * 状态(1：待指派 2：审核中  3：审核通过 4：审核不通过 5：驳回)
+     */
+    private Integer status;
+
+    /**
+     * 操作状态: 0->已发起；2->待处理；3->已处理；
+     */
+    private Integer operatingStatus;
+
+    /**
+     * 审核金额
+     */
+    private BigDecimal amount;
+
+    /**
+     * 期限
+     */
+    private String term;
+
+    /**
+     * 补充调查原因
+     */
+    private List<String> remark;
+
+    private String remarks;
+
+    /**
+     * 其他原因
+     */
+    private String otherRemark;
+
+    /**
+     * 审核意见
+     */
+    private String applyContent;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}

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

@@ -43,7 +43,7 @@ public class GuaranteeDetailResponse implements Serializable {
      * 担保详情
      */
     @ApiModelProperty(value = "担保详细")
-    private DgGuaranteeAssignUser assignUser;
+    private DgGuaranteeAssignUserResponse assignUser;
 
 
 }

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

@@ -199,9 +199,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             status.setBusinessStatus(StatusCode.YW_IN_PROGRESS);//业务状态设置为进行中
             dgBusinessProcessStatusMapper.insert(status);
         }
-        //同时往审核流程进程表新增一条记录
+        //如果不为保存就往审核流程进程表新增一条记录
+        if(businessApplication.getIsSaveOrCommit()==1){
             String account = dgApplyAmountInfoController.getAccount();
             AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1);
+        }
         return 1;
     }
 

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

@@ -355,10 +355,21 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
             this.baseMapper.update(dgAssets,new QueryWrapper<DgAssetsInvestigation>()
                     .eq("business_id",assetsInvestigation.getBusinessId()).eq("type",2));
         }else if(approvalAssetsRequest.getStatus()==StatusCode.SP_IN_REVIEW && dgAssetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==2){//资产部经理审核通过
-            //如果资产部经理审核通过，则往担保部分管领导处加一条记录，由分管领导审核
             //根据主键id查询业务id
             DgAssetsInvestigation assetsInvestigation2 = this.getBaseMapper().selectById(approvalAssetsRequest.getId());
 
+            //如果逐级驳回，且资产部经理审核通过，首先查看资产领导是否有数据，如果有数据，则修改不新增
+            Integer count = this.baseMapper.selectCount(new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id", assetsInvestigation2.getBusinessId()).eq("type", 3));
+
+            if(count>0){//资产领导有数据，则直接修改领导状态
+                DgAssetsInvestigation assignUser = new DgAssetsInvestigation();
+                assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+                assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态为待处理
+                this.baseMapper.update(assignUser,new QueryWrapper<DgAssetsInvestigation>()
+                        .eq("business_id",assetsInvestigation2.getBusinessId()).eq("type",3));
+            }else {
+                //如果资产部经理审核通过，则往担保部分管领导处加一条记录，由分管领导审核
                 DgAssetsInvestigation assets = new DgAssetsInvestigation();
                 assets.setBusinessId(assetsInvestigation2.getBusinessId());
                 assets.setCompanyId(assetsInvestigation2.getCompanyId());
@@ -367,6 +378,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
                 assets.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
                 assets.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
                 this.baseMapper.insert(assets);
+            }
         }else if(approvalAssetsRequest.getStatus()==StatusCode.SP_REVIEWED && dgAssetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==3) {//资产部分管领导审核通过
             //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果担保部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态

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

@@ -28,6 +28,7 @@ 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;
@@ -167,16 +168,29 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
 
 
         //查询担保部经理审核的金额和期限
-        DgGuaranteeAssignUser assignUser = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
+        DgGuaranteeAssignUser assignUser1 = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
                 .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
-        guaranteeAssignUser.setAmount(assignUser.getAmount());
+        guaranteeAssignUser.setAmount(assignUser1.getAmount());
-        guaranteeAssignUser.setTerm(assignUser.getTerm());
+        guaranteeAssignUser.setTerm(assignUser1.getTerm());
+        DgGuaranteeAssignUserResponse assignUser = new DgGuaranteeAssignUserResponse();
+        BeanUtils.copyProperties(guaranteeAssignUser,assignUser);
+        assignUser.setRemarks(assignUser1.getRemark());
+
+        String remarks = assignUser1.getRemark();
+        if(remarks != null){
+            if (remarks.length() > 0) {
+                String a = remarks.substring(1, remarks.length() - 1);
+                String arry[] = a.split(",");
+                List<String> demoList = Arrays.asList(arry);
+                assignUser.setRemark(demoList);
+            }
+        }
 
         GuaranteeDetailResponse guaranteeDetailResponse = new GuaranteeDetailResponse();
         guaranteeDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);
         guaranteeDetailResponse.setDgEnclosureInfo(dgEnclosureInfo);
         guaranteeDetailResponse.setLinkedHashMap(linkedList);
-        guaranteeDetailResponse.setAssignUser(guaranteeAssignUser);
+        guaranteeDetailResponse.setAssignUser(assignUser);
         return guaranteeDetailResponse;
     }
 
@@ -194,7 +208,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             dgGuaranteeAssignUser.setId(investigateGuaranteeRequest.getId());//主键id
             dgGuaranteeAssignUser.setStatus(StatusCode.SP_REJECT);//状态为驳回(只有A,B角同时同意，状态才改为审核中)
             dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
-            dgGuaranteeAssignUser.setRemark(investigateGuaranteeRequest.getApplyContent());//审核意见
+            dgGuaranteeAssignUser.setApplyContent(investigateGuaranteeRequest.getApplyContent());//审核意见
             this.baseMapper.updateById(dgGuaranteeAssignUser);
 
             int i = this.baseMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>().eq("business_id", guaranteeAssignUser.getBusinessId())
@@ -219,15 +233,15 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         } else {
             DgGuaranteeAssignUser dgGuaranteeAssignUser = new DgGuaranteeAssignUser();
             dgGuaranteeAssignUser.setId(investigateGuaranteeRequest.getId());//主键id
-            dgGuaranteeAssignUser.setRemark(investigateGuaranteeRequest.getApplyContent());//审核意见
+            dgGuaranteeAssignUser.setApplyContent(investigateGuaranteeRequest.getApplyContent());//审核意见
 
-            if(investigateGuaranteeRequest.getIsSaveOrCommit()==1){//提交
+            if(investigateGuaranteeRequest.getIsSaveOrCommit() != null && investigateGuaranteeRequest.getIsSaveOrCommit()==1){//提交
                 //AB角调查，修改审核意见以及状态
                 dgGuaranteeAssignUser.setStatus(investigateGuaranteeRequest.getStatus());//状态为审核中
                 dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
                 this.baseMapper.updateById(dgGuaranteeAssignUser);
             }else{//保存
-                dgGuaranteeAssignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态 设置为审核中
+                dgGuaranteeAssignUser.setStatus(guaranteeAssignUser.getStatus());//审批状态 当前是什么状态就是什么状态
                 dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
                 this.baseMapper.updateById(dgGuaranteeAssignUser);
             }
@@ -347,6 +361,11 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         //根据业务id查询对应的附件信息
         DgEnclosureInfo dgEnclosureInfo1 = dgEnclosureInfoMapper.selectOne(new QueryWrapper<DgEnclosureInfo>().eq("business_id", guaranteeAssignUser.getBusinessId()));
         dgEnclosureInfo.setOtherFile(dgEnclosureInfo1.getOtherFile());//其他附件
+        dgEnclosureInfo.setCompanyCredit(dgEnclosureInfo1.getCompanyCredit());//企业信用报告
+        dgEnclosureInfo.setCreditReport(dgEnclosureInfo1.getCreditReport());
+        dgEnclosureInfo.setCertificateAuthorization(dgEnclosureInfo1.getCertificateAuthorization());
+        dgEnclosureInfo.setTaxCertificate(dgEnclosureInfo1.getTaxCertificate());
+        dgEnclosureInfo.setAssessmentReport(dgEnclosureInfo1.getAssessmentReport());
 
         //根据业务id删除对应的附件信息
         dgEnclosureInfoMapper.delete(new QueryWrapper<DgEnclosureInfo>().eq("business_id", guaranteeAssignUser.getBusinessId()));
@@ -360,10 +379,11 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         } else {
             deptName = "担保部B角";
         }
-        //同时往审核流程进程表新增一条记录
+        //不为保存的情况则往审核流程进程表新增一条记录
+        if(!investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_DRAFT)){
             String account = dgApplyAmountInfoController.getAccount();
             AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2);
-
+        }
         return 1;
     }
 
@@ -428,10 +448,21 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             this.baseMapper.update(dgAssignUser, new QueryWrapper<DgGuaranteeAssignUser>()
                     .eq("business_id", guaranteeUser.getBusinessId()).eq("type", 3));
         } else if (approvalGuaranteeRequest.getStatus() == StatusCode.SP_IN_REVIEW && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 3) {//担保部经理审核通过
-            //如果担保部经理审核通过，则往担保部分管领导处加一条记录，由分管领导审核
             //根据主键id查询业务id
             DgGuaranteeAssignUser guaranteeAssignUser = this.getBaseMapper().selectById(approvalGuaranteeRequest.getId());
 
+            //如果逐级驳回，且担保部经理审核通过，首先查看担保领导是否有数据，如果有数据，则修改不新增
+            Integer count = this.baseMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 4));
+
+            if(count>0){//担保领导有数据，则直接修改领导状态
+                DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
+                assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+                assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态为待处理
+                this.baseMapper.update(assignUser,new QueryWrapper<DgGuaranteeAssignUser>()
+                        .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("type",4));
+            }else{
+                //如果担保部经理审核通过，则往担保部分管领导处加一条记录，由分管领导审核
                 DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
                 assignUser.setBusinessId(guaranteeAssignUser.getBusinessId());
                 assignUser.setCompanyId(guaranteeAssignUser.getCompanyId());
@@ -440,6 +471,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
                 assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
                 this.baseMapper.insert(assignUser);
+            }
         } else if (approvalGuaranteeRequest.getStatus() == StatusCode.SP_REVIEWED && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 4) {//担保部领导审核通过
             //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态
@@ -583,6 +615,10 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 hrmsFeignService.insertUserRole(guaranteeRequest.getEmpBId().longValue(),PromptSuccess.DB_B_ID.longValue());
             }
         }
+        //同时往审核流程进程表新增一条记录
+        String account = dgApplyAmountInfoController.getAccount();
+        AuditProcessUtil.save(guaranteeRequest.getBusinessId(), account, "担保部经理", "", 2);
+
         return ResponseResult.SUCCESS();
     }
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.DgGuaranteeAssignUserMapper;
 import com.daqing.financial.guarantee.mapper.DgGuaranteeLetterAssignUserMapper;
 import com.daqing.financial.guarantee.mapper.DgLoanCommitteeConsiderMapper;
 import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
@@ -14,6 +15,7 @@ import com.daqing.financial.guarantee.model.response.PaymentConfirmationListResp
 import com.daqing.financial.guarantee.service.IDgGuaranteeLetterAssignUserService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.util.AuditProcessUtil;
+import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
 import com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser;
 import com.daqing.framework.domain.guarantee.DgLoanCommitteeConsider;
 import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider;
@@ -55,6 +57,8 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
     @Autowired
     private DgLoanCommitteeConsiderMapper dgLoanCommitteeConsiderMapper;
 
+    @Autowired
+    private DgGuaranteeAssignUserMapper guaranteeAssignUserMapper;
 
     @Override
     public GuaranteeLetterListResponse selectGuaranteeLetter(String businessId,String roleId) {
@@ -149,7 +153,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                 Integer approveStatus = guaranteeLetterAssignUserTemp.getStatus();
 
                 //之前状态为审批中，同意确定生成担保函，添加数据给指派的AB角用户
-                if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_IN_REVIEW.equals(approveStatus)){
+                if (StatusCode.SP_IN_REVIEW.equals(approveStatus) && StatusCode.SP_REVIEWED.equals(status)){
                     //根据角色及业务id查询需要更新数据
                     QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
@@ -168,13 +172,25 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     AuditProcessUtil.save(businessId,account,"法规部经理",auditOpinion,8);
                     //更新成功，添加ab角数据
                     if (i > 0){
+                        //获取之前指定的a角用户
+                        QueryWrapper<DgGuaranteeAssignUser> wrapperA = new QueryWrapper<>();
+                        wrapperA.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
+                        DgGuaranteeAssignUser dgGuaranteeAssignUserA = guaranteeAssignUserMapper.selectOne(wrapperA);
+                        Integer userA = dgGuaranteeAssignUserA.getEmpId();
                         //添加a角
                         DgGuaranteeLetterAssignUser guaranteeLetterUser = new DgGuaranteeLetterAssignUser();
                         guaranteeLetterUser.setRoleId(PromptSuccess.DB_A_ID);
+                        guaranteeLetterUser.setUserId(userA);
                         guaranteeLetterUser.setBusinessId(businessId);
                         guaranteeLetterUser.setCompanyId(companyId);
                         baseMapper.insert(guaranteeLetterUser);
+                        //获取之前指定的a角用户
+                        QueryWrapper<DgGuaranteeAssignUser> wrapperB = new QueryWrapper<>();
+                        wrapperB.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID);
+                        DgGuaranteeAssignUser dgGuaranteeAssignUserB = guaranteeAssignUserMapper.selectOne(wrapperB);
+                        Integer userB = dgGuaranteeAssignUserB.getEmpId();
                         //添加b角
+                        guaranteeLetterUser.setUserId(userB);
                         guaranteeLetterUser.setRoleId(PromptSuccess.DB_B_ID);
                         int insert = baseMapper.insert(guaranteeLetterUser);
                         //更新成功，返回操作结果
@@ -184,13 +200,14 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                 }
 
                 //之前状态为驳回，同意确定生成担保函，更新数据给指派的AB角用户
-                if (StatusCode.SP_REVIEWED.equals(status) && StatusCode.SP_REJECT.equals(approveStatus)){
+                if (StatusCode.SP_REJECT.equals(approveStatus) && StatusCode.SP_REVIEWED.equals(status)){
                     //根据角色及业务id查询需要更新数据
                     QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID);
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper);
                     //操作用户为当前用户
                     guaranteeLetterAssignUser.setUserId(currentUser);
+                    guaranteeLetterAssignUser.setStatus(StatusCode.SP_IN_REVIEW);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见
@@ -220,18 +237,21 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                         dgGuaranteeLetterAssignUserB.setOperatingStatus(StatusCode.CZ_ON_HAND);
                         //清空上次的审批意见
                         dgGuaranteeLetterAssignUserB.setAuditOpinion("");
-                        baseMapper.updateById(dgGuaranteeLetterAssignUserB);
+                        int update = baseMapper.updateById(dgGuaranteeLetterAssignUserB);
 
                         //更新资产部经理
                         //根据业务id查询资产部经理数据
                         QueryWrapper<DgGuaranteeLetterAssignUser> guaranteeLetterAssignUserQueryWrapperZc = new QueryWrapper<>();
                         guaranteeLetterAssignUserQueryWrapperZc.eq("business_id",businessId).eq("role_id",PromptSuccess.ZC_JL_ID);
                         DgGuaranteeLetterAssignUser dgGuaranteeLetterAssignUserZc = baseMapper.selectOne(guaranteeLetterAssignUserQueryWrapperZc);
+                        //查询为空不作操作
+                        if (dgGuaranteeLetterAssignUserZc!=null){
                             dgGuaranteeLetterAssignUserZc.setStatus(StatusCode.SP_IN_REVIEW);
                             dgGuaranteeLetterAssignUserZc.setOperatingStatus(StatusCode.CZ_ON_HAND);
                             //清空上次的审批意见
                             dgGuaranteeLetterAssignUserZc.setAuditOpinion("");
-                        int update = baseMapper.updateById(dgGuaranteeLetterAssignUserZc);
+                            baseMapper.updateById(dgGuaranteeLetterAssignUserZc);
+                        }
                         //更新成功，返回操作结果
                         log.info(update > 0 ? "驳回后法规部经理成功生成担保函" : "驳回后法规部经理生成担保函失败");
                         return update > 0;
@@ -286,6 +306,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapper);
                     //操作用户为当前用户
                     guaranteeLetterAssignUser.setUserId(currentUser);
+                    guaranteeLetterAssignUser.setStatus(StatusCode.SP_REVIEWED);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //根据当前用户更新审核状态和操作状态及审核意见
@@ -459,7 +480,6 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperUser = new QueryWrapper<>();
                     queryWrapperUser.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser);
-                    guaranteeLetterAssignUser.setUserId(currentUser);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //获取公司id
@@ -540,7 +560,6 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperUser = new QueryWrapper<>();
                     queryWrapperUser.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID);
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser);
-                    guaranteeLetterAssignUser.setUserId(currentUser);
                     guaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
@@ -589,7 +608,6 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperUser = new QueryWrapper<>();
                     queryWrapperUser.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID);
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser);
-                    guaranteeLetterAssignUser.setUserId(currentUser);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);
                     //获取公司id
@@ -671,7 +689,6 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                     QueryWrapper<DgGuaranteeLetterAssignUser> queryWrapperUser = new QueryWrapper<>();
                     queryWrapperUser.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID);
                     DgGuaranteeLetterAssignUser guaranteeLetterAssignUser = baseMapper.selectOne(queryWrapperUser);
-                    guaranteeLetterAssignUser.setUserId(currentUser);
                     guaranteeLetterAssignUser.setStatus(StatusCode.SP_REJECT);
                     guaranteeLetterAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);
                     guaranteeLetterAssignUser.setAuditOpinion(auditOpinion);

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

@@ -339,10 +339,21 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
             this.baseMapper.update(dgMessage,new QueryWrapper<DgMessageInvestigation>()
                     .eq("business_id",messageInvestigation.getBusinessId()).eq("type",2));
         }else if(approvalMessageRequest.getStatus()==StatusCode.SP_IN_REVIEW && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==2){//信息部经理审核通过
-            //如果信息部经理审核通过，则往信息部分管领导处加一条记录，由分管领导审核
             //根据主键id查询业务id
             DgMessageInvestigation messageInvestigation2 = this.getBaseMapper().selectById(approvalMessageRequest.getId());
 
+            //如果逐级驳回，且资产部经理审核通过，首先查看资产领导是否有数据，如果有数据，则修改不新增
+            Integer count = this.baseMapper.selectCount(new QueryWrapper<DgMessageInvestigation>()
+                    .eq("business_id", messageInvestigation2.getBusinessId()).eq("type", 3));
+
+            if(count>0){//资产领导有数据，则直接修改领导状态
+                DgMessageInvestigation assignUser = new DgMessageInvestigation();
+                assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+                assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态为待处理
+                this.baseMapper.update(assignUser,new QueryWrapper<DgMessageInvestigation>()
+                        .eq("business_id",messageInvestigation2.getBusinessId()).eq("type",3));
+            }else {
+                //如果信息部经理审核通过，则往信息部分管领导处加一条记录，由分管领导审核
                 DgMessageInvestigation message = new DgMessageInvestigation();
                 message.setBusinessId(messageInvestigation2.getBusinessId());
                 message.setCompanyId(messageInvestigation2.getCompanyId());
@@ -351,6 +362,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
                 message.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
                 message.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
                 this.baseMapper.insert(message);
+            }
         }else if(approvalMessageRequest.getStatus()==StatusCode.SP_REVIEWED && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==3) {//信息部领导审核通过
             //如果信息部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态

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

@@ -1,6 +1,7 @@
 package com.daqing.financial.guarantee.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.daqing.financial.guarantee.controller.DgApplyAmountInfoController;
@@ -269,7 +270,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     if (update > 0){
                         QueryWrapper<DgPaymentConfirmationConsider> queryWrapperCwb = new QueryWrapper<>();
                         queryWrapperCwb.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
-                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapper);
+                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapperCwb);
                         paymentConfirmationConsiderCwb.setStatus(StatusCode.SP_REVIEWED);
                         baseMapper.updateById(paymentConfirmationConsiderCwb);
 
@@ -301,7 +302,7 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                     if (update > 0){
                         QueryWrapper<DgPaymentConfirmationConsider> queryWrapperCwb = new QueryWrapper<>();
                         queryWrapperCwb.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID);
-                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapper);
+                        DgPaymentConfirmationConsider paymentConfirmationConsiderCwb = baseMapper.selectOne(queryWrapperCwb);
                         paymentConfirmationConsiderCwb.setStatus(StatusCode.SP_REVIEWED);
                         baseMapper.updateById(paymentConfirmationConsiderCwb);
 

dq-financial-hrms/src/main/resources/mapper/hrms/EmployeeDao.xml

@@ -605,7 +605,7 @@
     <select id="getListEmployeeTrees" parameterType="long" resultType="com.daqing.framework.domain.hrms.ext.UserDeptVO">
         SELECT
         u.id,
-        u.account
+        e.name as account
         FROM
         hrms_employee e
         LEFT JOIN hrms_employee_dept ed ON e.id = ed.employee_id
@@ -615,7 +615,7 @@
         u.del_or_not = 0
         AND d.id = #{id}
         <if test="account != null">
-            AND u.account LIKE CONCAT('%',#{account},'%')
+            AND e.name LIKE CONCAT('%',#{account},'%')
         </if>
     </select>
     <select id="selectUserRole" resultType="java.lang.Integer">