Merge remote-tracking branch 'origin/master'

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

@@ -355,18 +355,30 @@ 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());
 
-            DgAssetsInvestigation assets = new DgAssetsInvestigation();
+            //如果逐级驳回，且资产部经理审核通过，首先查看资产领导是否有数据，如果有数据，则修改不新增
-            assets.setBusinessId(assetsInvestigation2.getBusinessId());
+            Integer count = this.baseMapper.selectCount(new QueryWrapper<DgAssetsInvestigation>()
-            assets.setCompanyId(assetsInvestigation2.getCompanyId());
+                    .eq("business_id", assetsInvestigation2.getBusinessId()).eq("type", 3));
-            assets.setRoleId(PromptSuccess.ZC_LD_ID);//资产部分管领导
+
-            assets.setType(3);//分管领导审核
+            if(count>0){//资产领导有数据，则直接修改领导状态
-            assets.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
+                DgAssetsInvestigation assignUser = new DgAssetsInvestigation();
-            assets.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
+                assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
-            this.baseMapper.insert(assets);
+                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());
+                assets.setRoleId(PromptSuccess.ZC_LD_ID);//资产部分管领导
+                assets.setType(3);//分管领导审核
+                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

@@ -208,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())
@@ -233,7 +233,7 @@ 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() != null && investigateGuaranteeRequest.getIsSaveOrCommit()==1){//提交
                 //AB角调查，修改审核意见以及状态
@@ -241,7 +241,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 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);
             }
@@ -361,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()));
@@ -443,18 +448,30 @@ 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());
 
-            DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
+            //如果逐级驳回，且担保部经理审核通过，首先查看担保领导是否有数据，如果有数据，则修改不新增
-            assignUser.setBusinessId(guaranteeAssignUser.getBusinessId());
+            Integer count = this.baseMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
-            assignUser.setCompanyId(guaranteeAssignUser.getCompanyId());
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 4));
-            assignUser.setRoleId(PromptSuccess.DB_LD_ID);//担保部分管领导
+
-            assignUser.setType(4);//分管领导审核
+            if(count>0){//担保领导有数据，则直接修改领导状态
-            assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
+                DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
-            assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
+                assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
-            this.baseMapper.insert(assignUser);
+                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());
+                assignUser.setRoleId(PromptSuccess.DB_LD_ID);//担保部分管领导
+                assignUser.setType(4);//分管领导审核
+                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) {//担保部领导审核通过
             //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态

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

@@ -339,18 +339,30 @@ 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());
 
-            DgMessageInvestigation message = new DgMessageInvestigation();
+            //如果逐级驳回，且资产部经理审核通过，首先查看资产领导是否有数据，如果有数据，则修改不新增
-            message.setBusinessId(messageInvestigation2.getBusinessId());
+            Integer count = this.baseMapper.selectCount(new QueryWrapper<DgMessageInvestigation>()
-            message.setCompanyId(messageInvestigation2.getCompanyId());
+                    .eq("business_id", messageInvestigation2.getBusinessId()).eq("type", 3));
-            message.setRoleId(PromptSuccess.XX_LD_ID);//担保部分管领导
+
-            message.setType(3);//分管领导审核
+            if(count>0){//资产领导有数据，则直接修改领导状态
-            message.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
+                DgMessageInvestigation assignUser = new DgMessageInvestigation();
-            message.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
+                assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
-            this.baseMapper.insert(message);
+                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());
+                message.setRoleId(PromptSuccess.XX_LD_ID);//担保部分管领导
+                message.setType(3);//分管领导审核
+                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-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">