修改指派角色跟业务相关

dq-financial-crms/src/main/java/com/daqing/financial/crms/model/request/CompanyCustomerRequest.java

@@ -85,7 +85,7 @@ public class CompanyCustomerRequest implements Serializable {
     private String legalName;
 
     @ApiModelProperty(value = "法人-性别 1、男，0、女")
-    private String legalGender;
+    private Integer legalGender;
 
     @ApiModelProperty(value = "法人-身份证号")
     private String legalIdNumber;

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

@@ -10,6 +10,8 @@ import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse;
 import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
 import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
 import com.daqing.framework.domain.guarantee.po.DgGuaranteePO;
+import com.daqing.framework.domain.hrms.response.HrmsCode;
+import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
 import com.daqing.framework.model.response.ResponseResult;
@@ -46,12 +48,6 @@ public class DgGuaranteeAssignUserController {
     @Autowired
     private IDgGuaranteeAssignUserService dgGuaranteeAssignUserService;
 
-    @Resource
-    private DgGuaranteeAssignUserMapper dgGuaranteeAssignUserMapper;
-
-    @Resource
-    private HrmsFeignService hrmsFeignService;
-
     /**
      * 担保部调查列表
      * @param
@@ -69,22 +65,9 @@ public class DgGuaranteeAssignUserController {
         PageUtils data = null;
         if(roleIds != null) {
             String[] ids = roleIds.split(",");
-
             List<String> roleIdlist = Arrays.asList(ids);
 
             data = dgGuaranteeAssignUserService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId, status);
-
-/*            String A = String.valueOf(PromptSuccess.DB_A_ID);
-            String B = String.valueOf(PromptSuccess.DB_B_ID);
-            //判断角色数组中是否包含A角或者B角元素
-            Boolean f = Arrays.asList(ids).contains(A);
-            Boolean g = Arrays.asList(ids).contains(B);
-            
-            if (f.equals(true) || g.equals(true)) {//如果存在A，B元素，则要根据角色以及用户id查询列表
-                data = dgGuaranteeAssignUserService.queryPage(page, size, CustomerNumberOrName, roleIdlist, userId);
-            } else {
-                data = dgGuaranteeAssignUserService.queryPage(page, size, CustomerNumberOrName, roleIdlist, null);
-            }*/
         }
 
         return new ResponseResult<PageUtils>().SUCCESS(data);
@@ -112,52 +95,7 @@ public class DgGuaranteeAssignUserController {
     @Transactional
     public ResponseResult assignCorners(@RequestBody GuaranteeRequest guaranteeRequest){
 
-        //根据主键id修改当前记录状态为审核中，操作状态为已处理,设置审批人id为当前用户id
+        return dgGuaranteeAssignUserService.assignCorners(guaranteeRequest);
-        //获取当前登录用户userId
-        String userId = dgApplyAmountInfoController.getUserId();
-        DgGuaranteeAssignUser guaranteeAssignUser = new DgGuaranteeAssignUser();
-        guaranteeAssignUser.setStatus(StatusCode.SP_IN_REVIEW);//状态设置为审核中
-        guaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
-        guaranteeAssignUser.setEmpId(Integer.parseInt(userId));
-        guaranteeAssignUser.setId(guaranteeRequest.getId());
-        dgGuaranteeAssignUserMapper.updateById(guaranteeAssignUser);
-
-        //新增A角记录到担保部记录表
-        DgGuaranteeAssignUser dgGuaranteeAssignUser = new DgGuaranteeAssignUser();
-        dgGuaranteeAssignUser.setBusinessId(guaranteeRequest.getBusinessId());//业务id
-        dgGuaranteeAssignUser.setCompanyId(guaranteeRequest.getCompanyId());//企业id
-        dgGuaranteeAssignUser.setEmpId(guaranteeRequest.getEmpAId());//用户A角id
-        dgGuaranteeAssignUser.setRoleId(PromptSuccess.DB_A_ID);//角色设置为A角
-        dgGuaranteeAssignUser.setType(1);//A角操作
-        dgGuaranteeAssignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
-        dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
-        dgGuaranteeAssignUserMapper.insert(dgGuaranteeAssignUser);
-        //新增B角记录到担保部记录表
-        DgGuaranteeAssignUser dgGuaranteeAssignUser2 = new DgGuaranteeAssignUser();
-        dgGuaranteeAssignUser2.setBusinessId(guaranteeRequest.getBusinessId());//业务id
-        dgGuaranteeAssignUser2.setCompanyId(guaranteeRequest.getCompanyId());//企业id
-        dgGuaranteeAssignUser2.setEmpId(guaranteeRequest.getEmpBId());//用户B角id
-        dgGuaranteeAssignUser2.setRoleId(PromptSuccess.DB_B_ID);//角色设置为B角
-        dgGuaranteeAssignUser2.setType(2);//B角操作
-        dgGuaranteeAssignUser2.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
-        dgGuaranteeAssignUser2.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
-        dgGuaranteeAssignUserMapper.insert(dgGuaranteeAssignUser2);
-
-        List<DgGuaranteePO> list = new ArrayList();
-        DgGuaranteePO dgGuaranteePO1 =  new DgGuaranteePO();
-        dgGuaranteePO1.setUserId(guaranteeRequest.getEmpAId().longValue());
-        dgGuaranteePO1.setRoleId(PromptSuccess.DB_A_ID.longValue());
-        DgGuaranteePO dgGuaranteePO2 =  new DgGuaranteePO();
-        dgGuaranteePO2.setUserId(guaranteeRequest.getEmpBId().longValue());
-        dgGuaranteePO2.setRoleId(PromptSuccess.DB_B_ID.longValue());
-        list.add(dgGuaranteePO1);
-        list.add(dgGuaranteePO2);
-        //批量绑定角色关系
-        hrmsFeignService.insertUsrRole(list);
-
-        //hrmsFeignService.insertUserRole(guaranteeRequest.getEmpAId().longValue(),PromptSuccess.DB_A_ID.longValue());
-        //hrmsFeignService.insertUserRole(guaranteeRequest.getEmpBId().longValue(),PromptSuccess.DB_B_ID.longValue());
-        return new ResponseResult<PageUtils>().SUCCESS();
     }
 
 

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

@@ -82,6 +82,9 @@ public class BusinessApplicationRequest implements Serializable {
     @ApiModelProperty(value = "反担保措施描述")
     private String description;
 
+    @ApiModelProperty(value = "客户类型")
+    private String customerType;
+
     /**
      * 业务类型
      */

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

@@ -73,6 +73,11 @@ public class DgApplyAmountInfoResponse implements Serializable {
      */
     private String enGuaranteeMeasures;
 
+    /**
+     * 客户类型
+     */
+    private String customerType;
+
     /**
      * 业务类型
      */

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

@@ -2,9 +2,11 @@ package com.daqing.financial.guarantee.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.daqing.financial.guarantee.model.request.ApprovalGuaranteeRequest;
+import com.daqing.financial.guarantee.model.request.GuaranteeRequest;
 import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest;
 import com.daqing.financial.guarantee.model.response.GuaranteeDetailResponse;
 import com.daqing.framework.domain.guarantee.DgGuaranteeAssignUser;
+import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.utils.PageUtils;
 
 import javax.servlet.http.HttpServletResponse;
@@ -29,4 +31,6 @@ public interface IDgGuaranteeAssignUserService extends IService<DgGuaranteeAssig
     int approvalGuarantee(ApprovalGuaranteeRequest approvalGuaranteeRequest);
 
     Boolean excelExport(List<String> ids, HttpServletResponse response);
+
+    ResponseResult assignCorners(GuaranteeRequest guaranteeRequest);
 }

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

@@ -121,6 +121,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgApplyAmountInfo.setEnGuaranteeMeasures(ArraysUtil.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
         dgApplyAmountInfo.setDescription(businessApplication.getDescription());//反担保措施描述
         dgApplyAmountInfo.setBusinessType(businessApplication.getBusinessType());//业务类型
+        dgApplyAmountInfo.setCustomerType(businessApplication.getCustomerType());//客户类型
         dgApplyAmountInfo.setBusinessCode(RandomUtil.getRandomNum(12));
 
         dgApplyAmountInfoMapper.insert(dgApplyAmountInfo);
@@ -197,11 +198,10 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             status.setBusinessId(dgApplyAmountInfo.getId());
             status.setBusinessStatus(StatusCode.YW_IN_PROGRESS);//业务状态设置为进行中
             dgBusinessProcessStatusMapper.insert(status);
-
+        }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
         AuditProcessUtil.save(dgApplyAmountInfo.getId(),account,"担保业务员","",1);
-        }
         return 1;
     }
 
@@ -324,6 +324,7 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgApplyAmountInfo.setEnGuaranteeMeasures(ArraysUtil.toString(businessApplication.getEnGuaranteeMeasures()));//反担保措施
         dgApplyAmountInfo.setDescription(businessApplication.getDescription());//反担保措施描述
         dgApplyAmountInfo.setBusinessType(businessApplication.getBusinessType());//业务类型
+        dgApplyAmountInfo.setCustomerType(businessApplication.getCustomerType());//客户类型
         //根据业务id修改申请贷款信息
         this.baseMapper.updateById(dgApplyAmountInfo);
 
@@ -546,12 +547,17 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
             dgMessageInvestigation.setStatus(StatusCode.SP_TO_BE_ASSIGNED);//状态为待指派
             dgMessageInvestigation.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态为待处理
             dgMessageInvestigationMapper.insert(dgMessageInvestigation);
-
+        }
+        Integer type = dgApplyAmountList1.getType();
+        String deptName;
+        if(type==1){
+            deptName="担保部业务员";
+        }else{
+            deptName="担保部经理";
+        }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,"担保部经理",remark,1);
+        AuditProcessUtil.save(dgApplyAmountList1.getBusinessId(),account,deptName,remark,1);
-        }
-
         return 1;
     }
 

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

@@ -18,6 +18,7 @@ import com.daqing.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.*;
+import com.daqing.framework.domain.hrms.response.HrmsCode;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
@@ -92,6 +93,27 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
     @Transactional
     @Override
     public Boolean assignCorners(AssetsRequest assetsRequest) {
+        //判断即将被指派成A角的用户id以及B角的用户id是否在当前业务中已被指派
+        //查询empId在担保部调查中是否被指派
+        Integer count1 = dgGuaranteeAssignUserMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
+                .eq("business_id", assetsRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", assetsRequest.getEmpId()));
+
+        Integer count = dgGuaranteeAssignUserMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
+                .eq("business_id", assetsRequest.getBusinessId())
+                .eq("type", 2).eq("emp_id", assetsRequest.getEmpId()));
+        if(count1 >0 || count >0){//已被指派情况下直接返回
+            ExceptionCast.cast(HrmsCode.EMP_TO_BE_CHOOSE);
+        }
+
+        //查询empId在信息部调查中是否被指派
+        Integer count2 = dgMessageInvestigationMapper.selectCount(new QueryWrapper<DgMessageInvestigation>()
+                .eq("business_id", assetsRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", assetsRequest.getEmpId()));
+
+        if(count2 >0 ){//已被指派情况下直接返回
+            ExceptionCast.cast(HrmsCode.EMP_TO_BE_CHOOSE);
+        }
 
         //根据主键id修改当前记录状态为审核中，操作状态为已处理,设置审批人id为当前用户id
         //获取当前登录用户userId
@@ -355,11 +377,6 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
             assets.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
             assets.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
             this.baseMapper.insert(assets);
-
-            //同时往审核流程进程表新增一条记录
-            String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,"资产部经理",approvalAssetsRequest.getApplyContent(),3);
-
         }else if(approvalAssetsRequest.getStatus()==StatusCode.SP_REVIEWED && dgAssetsInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && assetsInvestigation.getType()==3) {//资产部分管领导审核通过
             //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果担保部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态
@@ -386,11 +403,17 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
                 compliance.setAuditStatus(StatusCode.SP_TO_BE_ASSIGNED);//审核状态设置为待指派
                 dgComplianceInvestigationMapper.insert(compliance);
             }
+        }
+        Integer type = assetsInvestigation.getType();
+        String deptName;
+        if(type == 2){
+            deptName = "资产部经理";
+        }else{
+            deptName = "资产部分管领导";
+        }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,"资产部分管领导",approvalAssetsRequest.getApplyContent(),3);
+        AuditProcessUtil.save(assetsInvestigation.getBusinessId(),account,deptName,approvalAssetsRequest.getApplyContent(),3);
-
-        }
 
         return 1;
     }

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

@@ -5,8 +5,10 @@ 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.CrmsFeignService;
+import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.*;
 import com.daqing.financial.guarantee.model.request.ApprovalGuaranteeRequest;
+import com.daqing.financial.guarantee.model.request.GuaranteeRequest;
 import com.daqing.financial.guarantee.model.request.InvestigateGuaranteeRequest;
 import com.daqing.financial.guarantee.model.response.*;
 import com.daqing.financial.guarantee.service.IDgGuaranteeAssignUserService;
@@ -16,7 +18,9 @@ import com.daqing.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.*;
+import com.daqing.framework.domain.guarantee.po.DgGuaranteePO;
 import com.daqing.framework.domain.guarantee.response.EmployeeMessageResponse;
+import com.daqing.framework.domain.hrms.response.HrmsCode;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
@@ -70,6 +74,11 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
     @Resource
     private DgLoanCommitteeConsiderMapper dgLoanCommitteeConsiderMapper;
 
+    @Resource
+    private DgGuaranteeAssignUserMapper dgGuaranteeAssignUserMapper;
+    @Resource
+    private HrmsFeignService hrmsFeignService;
+
 
     @Override
     public PageUtils queryPage(Integer page, Integer size, String customerNumberOrName, List<String> roleIdlist, String userId, Integer status) {
@@ -269,6 +278,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                     dgInvestigation.setAuditStatus(StatusCode.SP_IN_REVIEW);//审核中
                     dgComplianceInvestigationMapper.update(dgInvestigation, new QueryWrapper<DgComplianceInvestigation>()
                             .eq("business_id", guaranteeAssignUser.getBusinessId()));
+
+                    //修改担保业务审批状态为已审核
+                    DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
+                    assignUser.setStatus(StatusCode.SP_REVIEWED);//已审核
+                    this.baseMapper.update(assignUser, new QueryWrapper<DgGuaranteeAssignUser>()
+                            .eq("business_id", guaranteeAssignUser.getBusinessId()));
                 }
             } else if (consider != null && consider.getStatus().equals(StatusCode.SP_REJECT) && consider.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)
                     && guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT)) {//贷审会业务流程驳回情况处理
@@ -284,8 +299,13 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                     dgConsider.setStatus(StatusCode.SP_IN_REVIEW);//审核中
                     dgLoanCommitteeConsiderMapper.update(dgConsider, new QueryWrapper<DgLoanCommitteeConsider>()
                             .eq("business_id", guaranteeAssignUser.getBusinessId()));
-                }
 
+                    //修改担保业务审批状态为已审核
+                    DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
+                    assignUser.setStatus(StatusCode.SP_REVIEWED);//已审核
+                    this.baseMapper.update(assignUser, new QueryWrapper<DgGuaranteeAssignUser>()
+                            .eq("business_id", guaranteeAssignUser.getBusinessId()));
+                }
             } else {//正常情况处理
                 DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
                 assignUser.setRoleId(PromptSuccess.DB_JL_ID);//担保部经理
@@ -316,9 +336,16 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         //附件新增
         dgEnclosureInfoMapper.insert(dgEnclosureInfo);
 
+        Integer type = guaranteeAssignUser.getType();
+        String deptName;
+        if (type == 1) {
+            deptName = "担保部A角";
+        } else {
+            deptName = "担保部B角";
+        }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-        AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(),account,"担保部A/B角",investigateGuaranteeRequest.getApplyContent(),2);
+        AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(), account, deptName, investigateGuaranteeRequest.getApplyContent(), 2);
 
         return 1;
     }
@@ -396,11 +423,6 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
             assignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
             this.baseMapper.insert(assignUser);
-
-            //同时往审核流程进程表新增一条记录
-            String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(guaranteeAssignUser.getBusinessId(),account,"担保部经理",approvalGuaranteeRequest.getApplyContent(),2);
-
         } else if (approvalGuaranteeRequest.getStatus() == StatusCode.SP_REVIEWED && dgGuaranteeAssignUser.getOperatingStatus() == StatusCode.CZ_PROCESSED && guaranteeUser.getType() == 4) {//担保部领导审核通过
             //如果担保部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态
@@ -427,12 +449,18 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 compliance.setAuditStatus(StatusCode.SP_TO_BE_ASSIGNED);//审核状态设置为待指派
                 dgComplianceInvestigationMapper.insert(compliance);
             }
-
+        }
+        Integer type = guaranteeUser.getType();
+        String deptName;
+        if (type == 3) {
+            deptName = "担保部经理";
+        } else {
+            deptName = "担保部分管领导";
+        }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(guaranteeUser.getBusinessId(),account,"担保部分管领导",approvalGuaranteeRequest.getApplyContent(),2);
+        AuditProcessUtil.save(guaranteeUser.getBusinessId(), account, deptName, approvalGuaranteeRequest.getApplyContent(), 2);
 
-        }
         return 1;
     }
 
@@ -451,5 +479,84 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         }
     }
 
+    @Override
+    public ResponseResult assignCorners(GuaranteeRequest guaranteeRequest) {
+        //A,B角用户id不能选择同一个人
+        if (guaranteeRequest.getEmpAId().equals(guaranteeRequest.getEmpBId())) {
+            ExceptionCast.cast(HrmsCode.EMP_SAME);
+        }
+        //判断即将被指派成A角的用户id以及B角的用户id是否在当前业务中已被指派
+        //查询empAId，empBId在资产部调查中是否被指派
+        Integer count1 = dgAssetsInvestigationMapper.selectCount(new QueryWrapper<DgAssetsInvestigation>()
+                .eq("business_id", guaranteeRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", guaranteeRequest.getEmpAId()));
+
+        Integer count = dgAssetsInvestigationMapper.selectCount(new QueryWrapper<DgAssetsInvestigation>()
+                .eq("business_id", guaranteeRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", guaranteeRequest.getEmpBId()));
+        if(count1 >0 || count >0){//已被指派情况下直接返回
+            ExceptionCast.cast(HrmsCode.EMP_TO_BE_CHOOSE);
+        }
+
+        //查询empAId，empBId在信息部调查中是否被指派
+        Integer count2 = dgMessageInvestigationMapper.selectCount(new QueryWrapper<DgMessageInvestigation>()
+                .eq("business_id", guaranteeRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", guaranteeRequest.getEmpAId()));
+
+        Integer count3 = dgMessageInvestigationMapper.selectCount(new QueryWrapper<DgMessageInvestigation>()
+                .eq("business_id", guaranteeRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", guaranteeRequest.getEmpBId()));
+        if(count2 >0 || count3 >0){//已被指派情况下直接返回
+            ExceptionCast.cast(HrmsCode.EMP_TO_BE_CHOOSE);
+        }
+        //根据主键id修改当前记录状态为审核中，操作状态为已处理,设置审批人id为当前用户id
+        //获取当前登录用户userId
+        String userId = dgApplyAmountInfoController.getUserId();
+        DgGuaranteeAssignUser guaranteeAssignUser = new DgGuaranteeAssignUser();
+        guaranteeAssignUser.setStatus(StatusCode.SP_IN_REVIEW);//状态设置为审核中
+        guaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
+        guaranteeAssignUser.setEmpId(Integer.parseInt(userId));
+        guaranteeAssignUser.setId(guaranteeRequest.getId());
+        dgGuaranteeAssignUserMapper.updateById(guaranteeAssignUser);
+
+        //新增A角记录到担保部记录表
+        DgGuaranteeAssignUser dgGuaranteeAssignUser = new DgGuaranteeAssignUser();
+        dgGuaranteeAssignUser.setBusinessId(guaranteeRequest.getBusinessId());//业务id
+        dgGuaranteeAssignUser.setCompanyId(guaranteeRequest.getCompanyId());//企业id
+        dgGuaranteeAssignUser.setEmpId(guaranteeRequest.getEmpAId());//用户A角id
+        dgGuaranteeAssignUser.setRoleId(PromptSuccess.DB_A_ID);//角色设置为A角
+        dgGuaranteeAssignUser.setType(1);//A角操作
+        dgGuaranteeAssignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+        dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
+        dgGuaranteeAssignUserMapper.insert(dgGuaranteeAssignUser);
+        //新增B角记录到担保部记录表
+        DgGuaranteeAssignUser dgGuaranteeAssignUser2 = new DgGuaranteeAssignUser();
+        dgGuaranteeAssignUser2.setBusinessId(guaranteeRequest.getBusinessId());//业务id
+        dgGuaranteeAssignUser2.setCompanyId(guaranteeRequest.getCompanyId());//企业id
+        dgGuaranteeAssignUser2.setEmpId(guaranteeRequest.getEmpBId());//用户B角id
+        dgGuaranteeAssignUser2.setRoleId(PromptSuccess.DB_B_ID);//角色设置为B角
+        dgGuaranteeAssignUser2.setType(2);//B角操作
+        dgGuaranteeAssignUser2.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+        dgGuaranteeAssignUser2.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
+        dgGuaranteeAssignUserMapper.insert(dgGuaranteeAssignUser2);
+
+        List<DgGuaranteePO> list = new ArrayList();
+        DgGuaranteePO dgGuaranteePO1 = new DgGuaranteePO();
+        dgGuaranteePO1.setUserId(guaranteeRequest.getEmpAId().longValue());
+        dgGuaranteePO1.setRoleId(PromptSuccess.DB_A_ID.longValue());
+        DgGuaranteePO dgGuaranteePO2 = new DgGuaranteePO();
+        dgGuaranteePO2.setUserId(guaranteeRequest.getEmpBId().longValue());
+        dgGuaranteePO2.setRoleId(PromptSuccess.DB_B_ID.longValue());
+        list.add(dgGuaranteePO1);
+        list.add(dgGuaranteePO2);
+        //批量绑定角色关系
+        hrmsFeignService.insertUsrRole(list);
+
+        //hrmsFeignService.insertUserRole(guaranteeRequest.getEmpAId().longValue(),PromptSuccess.DB_A_ID.longValue());
+        //hrmsFeignService.insertUserRole(guaranteeRequest.getEmpBId().longValue(),PromptSuccess.DB_B_ID.longValue());
+        return new ResponseResult();
+    }
+
+
 
 }

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

@@ -18,6 +18,7 @@ import com.daqing.financial.guarantee.util.AuditProcessUtil;
 import com.daqing.framework.domain.crms.request.DgApplyAmountInfoRequest;
 import com.daqing.framework.domain.crms.response.CrmsCode;
 import com.daqing.framework.domain.guarantee.*;
+import com.daqing.framework.domain.hrms.response.HrmsCode;
 import com.daqing.framework.exception.ExceptionCast;
 import com.daqing.framework.model.StatusCode;
 import com.daqing.framework.model.response.PromptSuccess;
@@ -88,6 +89,25 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
     @Transactional
     @Override
     public Boolean assignCorners(MessageRequest messageRequest) {
+        //查询empId在担保部调查中是否被指派
+        Integer count1 = dgGuaranteeAssignUserMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
+                .eq("business_id", messageRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", messageRequest.getEmpId()));
+
+        Integer count = dgGuaranteeAssignUserMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
+                .eq("business_id", messageRequest.getBusinessId())
+                .eq("type", 2).eq("emp_id", messageRequest.getEmpId()));
+        if(count1 >0 || count >0){//已被指派情况下直接返回
+            ExceptionCast.cast(HrmsCode.EMP_TO_BE_CHOOSE);
+        }
+
+        //查询empId在资产部调查中是否被指派
+        Integer count2 = dgAssetsInvestigationMapper.selectCount(new QueryWrapper<DgAssetsInvestigation>()
+                .eq("business_id", messageRequest.getBusinessId())
+                .eq("type", 1).eq("emp_id", messageRequest.getEmpId()));
+        if(count2 >0 ){//已被指派情况下直接返回
+            ExceptionCast.cast(HrmsCode.EMP_TO_BE_CHOOSE);
+        }
 
         //根据主键id修改当前记录状态为审核中，操作状态为已处理,设置审批人id为当前用户id
         //获取当前登录用户userId
@@ -140,6 +160,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         DgMessageInvestigation messageInvestigation = this.baseMapper.selectOne(new QueryWrapper<DgMessageInvestigation>()
                 .eq("business_id", dgMessageInvestigation.getBusinessId())
                 .eq("type", 1));
+        if(messageInvestigation != null){
             String files=messageInvestigation.getFile();
             if(files!=null){
                 String a = files.substring(1,files.length()-1);
@@ -147,6 +168,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
                 List<String> demoList = Arrays.asList(arry);
                 messageDetailResponse.setMessageFileList(demoList);
             }
+        }
 
         DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
         applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
@@ -252,7 +274,6 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
         AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部专员",investigateMessageRequest.getRemark(),4);
-
         return 1;
     }
 
@@ -325,11 +346,6 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
             message.setStatus(StatusCode.SP_IN_REVIEW);//审批状态设置为审核中
             message.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
             this.baseMapper.insert(message);
-
-            //同时往审核流程进程表新增一条记录
-            String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(messageInvestigation2.getBusinessId(),account,"信息部经理",approvalMessageRequest.getRemark(),4);
-
         }else if(approvalMessageRequest.getStatus()==StatusCode.SP_REVIEWED && dgMessageInvestigation.getOperatingStatus()==StatusCode.CZ_PROCESSED && messageInvestigation.getType()==3) {//信息部领导审核通过
             //如果信息部分管领导审核通过，同时判断资产部分管领导审核以及信息部分管领导审核是否通过，如果通过就往合规调查中插入一条数据
             //如果信息部领导审核通过，则该子业务流程下的所有审批状态都为已审核状态
@@ -356,12 +372,18 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
                 compliance.setAuditStatus(StatusCode.SP_TO_BE_ASSIGNED);//审核状态设置为待指派
                 dgComplianceInvestigationMapper.insert(compliance);
             }
-
+        }
+        Integer type = messageInvestigation.getType();
+        String deptName;
+        if(type == 2){
+            deptName = "信息部经理";
+        }else{
+            deptName = "信息部分管领导";
+        }
         //同时往审核流程进程表新增一条记录
         String account = dgApplyAmountInfoController.getAccount();
-            AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,"信息部分管领导",approvalMessageRequest.getRemark(),4);
+        AuditProcessUtil.save(messageInvestigation.getBusinessId(),account,deptName,approvalMessageRequest.getRemark(),4);
 
-        }
         return 1;
     }
 

dq-financial-guarantee/src/main/resources/bootstrap.properties

@@ -54,6 +54,10 @@ spring.servlet.multipart.max-file-size=10MB
 #spring.cloud.nacos.config.ext-config[1].group=prod
 #spring.cloud.nacos.config.ext-config[1].refresh=true
 #
+#spring.cloud.nacos.config.ext-config[2].data-id=mybatis.yml
+#spring.cloud.nacos.config.ext-config[2].group=prod
+#spring.cloud.nacos.config.ext-config[2].refresh=true
+#
 #spring.redis.host=127.0.0.1
 #spring.redis.port=6379
 #spring.redis.password=dq123456

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

@@ -13,6 +13,7 @@
         <result column="amount_wide" property="amountWide" />
         <result column="en_guarantee_measures" property="enGuaranteeMeasures" />
         <result column="description" property="description" />
+        <result column="customer_type" property="customerType" />
         <result column="business_type" property="businessType" />
         <result column="create_time" property="createTime" />
         <result column="update_time" property="updateTime" />

dq-financial-hrms-auth/src/main/resources/mapper/hrauth/RolePermissionMapper.xml

@@ -76,7 +76,7 @@
     </select>
 
     <delete id="deleteHrmsRoleByRoleId">
-        delete from hrms_role where id=#{roleId}
+        update hrms_role set del_or_not = 1 where id=#{roleId}
     </delete>
 
     <select id="uniqueRoleName" parameterType="string" resultType="java.lang.Integer">

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

@@ -210,7 +210,7 @@
 
     <!-- 根据部门id获取该部门下面所有的员工 -->
     <select id="employeeListByDeptId" parameterType="long" resultType="com.daqing.framework.domain.hrms.ext.UserDeptVO">
-        select * from (
+        /*select * from (*/
             SELECT
              u.id,
              u.account , GROUP_CONCAT(er.role_id SEPARATOR ',') roleId
@@ -227,11 +227,11 @@
                 AND u.account LIKE CONCAT('%',#{account},'%')
             </if>
              GROUP BY u.id
-            )alias
+/*            )alias
         where
         (!FIND_IN_SET(59,roleId) AND !FIND_IN_SET(60,roleId) AND
         !FIND_IN_SET(63,roleId) AND !FIND_IN_SET(66,roleId) AND
-        !FIND_IN_SET(69,roleId)) or roleId is null
+        !FIND_IN_SET(69,roleId)) or roleId is null*/
     </select>
 
     <!-- 查询所有的员工姓名和id -->

dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/DgApplyAmountInfo.java

@@ -78,6 +78,11 @@ public class DgApplyAmountInfo implements Serializable {
      */
     private String enGuaranteeMeasures;
 
+    /**
+     * 客户类型
+     */
+    private String customerType;
+
     /**
      * 业务类型
      */

dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/response/HrmsCode.java

@@ -75,7 +75,10 @@ public enum HrmsCode implements ResultCode {
 
     ROLE_EMP_EXIST(false,44001,"该角色有用户关联，不能删除！"),
     ROLE_NAME_EXIST(false,44002,"该角色名称已存在，请重新输入！"),
-    EMP_POSITION_EXSIT(false, 22006, "该职位下已关联员工！");
+    EMP_POSITION_EXSIT(false, 22006, "该职位下已关联员工！"),
+
+    EMP_SAME(false, 51001, "A,B角不能选同一个人！"),
+    EMP_TO_BE_CHOOSE(false, 51002, "该用户已经被指派！");