A,B角点保存审批状态显示为审核中

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

@@ -65,5 +65,8 @@ public class InvestigateGuaranteeRequest implements Serializable {
     @ApiModelProperty(value = "考察照片")
     private String[] inspectionPhotos;
 
+    @ApiModelProperty(value = "区分保存和提交按钮")
+    private Integer isSaveOrCommit;
+
 
 }

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

@@ -43,4 +43,7 @@ public class MessageDetailResponse implements Serializable {
     @ApiModelProperty(value = "信息部调查附件详细")
     private List<String> messageFileList;
 
+    @ApiModelProperty(value = "信息部调查详细")
+    private DgMessageInvestigation dgMessageInvestigation;
+
 }

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

@@ -227,15 +227,15 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         //DgApplyAmountInfo dgApplyAmountInfo = this.baseMapper.selectById(id);
         DgApplyAmountInfoResponse dgApplyAmountInfo = this.baseMapper.selectApplyAmountInfoById(dgApplyAmountList.getBusinessId());
         String measures=dgApplyAmountInfo.getEnGuaranteeMeasures();
-        if(measures.length()>0){
+        if(measures != null){
-            String a = measures.substring(1,measures.length()-1);
+            if(measures.length()>0){
-            String arry[]=a.split(",");
+                String a = measures.substring(1,measures.length()-1);
-            List<String> demoList = Arrays.asList(arry);
+                String arry[]=a.split(",");
-            dgApplyAmountInfo.setEnGuaranteeMeasure(demoList);
+                List<String> demoList = Arrays.asList(arry);
-            System.out.println("arry==============="+demoList);
+                dgApplyAmountInfo.setEnGuaranteeMeasure(demoList);
+            }
         }
-
+        dgApplyAmountInfo.setRemark(dgApplyAmountList.getApplyContent());
-        System.out.println("业务申请详细========="+dgApplyAmountInfo);
 
         DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
         applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
@@ -243,7 +243,6 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
 
         LinkedHashMap linkedList = (LinkedHashMap)result.getData();
-        System.out.println("企业详细============"+linkedList);
 
         //查询附件详细，附件关联业务主键id
         DgEnclosureInfoResponse dgEnclosureInfo = dgEnclosureInfoMapper.selectByCompanyId(dgApplyAmountList.getBusinessId());
@@ -273,7 +272,6 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                 String arr1[]=a1.split(",");
                 arr1List = Arrays.asList(arr1);
                 arr1List2.add(i,arr1List);
-                System.out.println("arr1LIst===="+arr1List);
             }else{
                 arr1List2.add(i,null);
             }
@@ -293,8 +291,6 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         dgEnclosureInfo.setMeetingMinutesList((List<String>) arr1List2.get(12));
         dgEnclosureInfo.setMarriageCopyList((List<String>) arr1List2.get(13));
 
-        System.out.println("附件详细=============="+dgEnclosureInfo);
-
 /*        int page=1;
         int size=10;
         //关联人信息列表展示
@@ -333,12 +329,21 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         DgApplyAmountList dgApplyAmountList = dgApplyAmountListMapper.selectOne(new QueryWrapper<DgApplyAmountList>()
                 .eq("business_id", businessApplication.getBusinessId()).eq("type", 1));
 
-        //草稿状态下，新增业务状态到业务状态表
+        //草稿状态下，新增业务状态到业务状态表,同时新增一条记录到担保经理处理
         if(dgApplyAmountList.getStatus().equals(StatusCode.SP_DRAFT)){
             DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
             processStatus.setBusinessId(businessApplication.getBusinessId());//业务id
             processStatus.setBusinessStatus(1);//进行中
             dgBusinessProcessStatusMapper.insert(processStatus);
+
+            DgApplyAmountList applyAmountList = new DgApplyAmountList();
+            applyAmountList.setBusinessId(dgApplyAmountInfo.getId());//主键id
+            applyAmountList.setPresenterId(dgApplyAmountList.getPresenterId());// 提单人id
+            applyAmountList.setRoleId(PromptSuccess.DB_JL_ID);//担保部经理角色id
+            applyAmountList.setType(2);//设置类型
+            applyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//状态设置为审核中
+            applyAmountList.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
+            dgApplyAmountListMapper.insert(applyAmountList);
         }
 
         //撤销状态下,修改业务状态

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

@@ -168,16 +168,6 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         if(assetsInvestigation != null){
             BeanUtils.copyProperties(assetsInvestigation,assetsResponse);
         }
-/*        assetsResponse.setAssetsAmount(assetsInvestigation.getAssetsAmount());
-        assetsResponse.setAmount(assetsInvestigation.getAmount());
-        assetsResponse.setAssetsAmount(assetsInvestigation.getAssetsAmount());
-        assetsResponse.setApplyContent(assetsInvestigation.getApplyContent());
-        assetsResponse.setAssetsCode(assetsInvestigation.getAssetsCode());
-        assetsResponse.setAssetsName(assetsInvestigation.getAssetsName());
-        assetsResponse.setAssetsTime(assetsInvestigation.getAssetsTime());
-        assetsResponse.setAuditAmount(assetsInvestigation.getAuditAmount());
-        assetsResponse.setAuditCode(assetsInvestigation.getAuditCode());
-        assetsResponse.setAuditName(assetsInvestigation.getAuditName());*/
         //结束---------------------------------------------------------------------
 
         //根据业务id查询评估价值List
@@ -197,7 +187,6 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
                 String arry[]=a.split(",");
                 List<String> demoList = Arrays.asList(arry);
                 assetsResponse.setFileList(demoList);
-                System.out.println("arry==============="+demoList);
             }
         }
 
@@ -211,7 +200,6 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
             dgApplyAmountInfo.setEnGuaranteeMeasure(demoList);
         }
 
-        System.out.println("业务申请详细========="+dgApplyAmountInfo);
 
         DgApplyAmountInfoRequest applyAmountInfo = new DgApplyAmountInfoRequest();
         applyAmountInfo.setCompanyId(dgApplyAmountInfo.getCompanyId());
@@ -219,7 +207,6 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
         ResponseResult result = crmsFeignService.queryCustomerInfoById(applyAmountInfo);
 
         LinkedHashMap linkedList = (LinkedHashMap)result.getData();
-        System.out.println("企业详细============"+linkedList);
 
         AssetsDetailResponse assetsDetailResponse = new AssetsDetailResponse();
         assetsDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);

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

@@ -169,11 +169,14 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         //查询担保部经理审核的金额和期限
         DgGuaranteeAssignUser assignUser = this.baseMapper.selectOne(new QueryWrapper<DgGuaranteeAssignUser>()
                 .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 3));
+        guaranteeAssignUser.setAmount(assignUser.getAmount());
+        guaranteeAssignUser.setTerm(assignUser.getTerm());
+
         GuaranteeDetailResponse guaranteeDetailResponse = new GuaranteeDetailResponse();
         guaranteeDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);
         guaranteeDetailResponse.setDgEnclosureInfo(dgEnclosureInfo);
         guaranteeDetailResponse.setLinkedHashMap(linkedList);
-        guaranteeDetailResponse.setAssignUser(assignUser);
+        guaranteeDetailResponse.setAssignUser(guaranteeAssignUser);
         return guaranteeDetailResponse;
     }
 
@@ -214,13 +217,20 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                         .eq("business_id", guaranteeAssignUser.getBusinessId()));
             }
         } else {
-            //AB角调查，修改审核意见以及状态
             DgGuaranteeAssignUser dgGuaranteeAssignUser = new DgGuaranteeAssignUser();
             dgGuaranteeAssignUser.setId(investigateGuaranteeRequest.getId());//主键id
-            dgGuaranteeAssignUser.setStatus(investigateGuaranteeRequest.getStatus());//状态
-            dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
             dgGuaranteeAssignUser.setRemark(investigateGuaranteeRequest.getApplyContent());//审核意见
-            this.baseMapper.updateById(dgGuaranteeAssignUser);
+
+            if(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.setOperatingStatus(StatusCode.CZ_ON_HAND);//操作状态设置为待处理
+                this.baseMapper.updateById(dgGuaranteeAssignUser);
+            }
         }
 
         if (investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_REJECT)) {//驳回情况处理
@@ -242,6 +252,13 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             assignUser.setStatus(StatusCode.SP_REJECT);//驳回
             this.baseMapper.update(assignUser, new QueryWrapper<DgGuaranteeAssignUser>()
                     .eq("business_id", guaranteeAssignUser.getBusinessId()));
+
+            DgGuaranteeAssignUser assignUser2 = new DgGuaranteeAssignUser();
+            assignUser2.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
+            this.baseMapper.update(assignUser2, new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type",1));
+            this.baseMapper.update(assignUser2, new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type",2));
         }
 
         //判断A角和B角是否都调查通过，如果都审核通过，修改担保部经理操作状态为待处理
@@ -327,6 +344,10 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         dgEnclosureInfo.setConversationSummary(ArraysUtil.toString(investigateGuaranteeRequest.getConversationSummary()));
         dgEnclosureInfo.setInspectionPhotos(ArraysUtil.toString(investigateGuaranteeRequest.getInspectionPhotos()));
 
+        //根据业务id查询对应的附件信息
+        DgEnclosureInfo dgEnclosureInfo1 = dgEnclosureInfoMapper.selectOne(new QueryWrapper<DgEnclosureInfo>().eq("business_id", guaranteeAssignUser.getBusinessId()));
+        dgEnclosureInfo.setOtherFile(dgEnclosureInfo1.getOtherFile());//其他附件
+
         //根据业务id删除对应的附件信息
         dgEnclosureInfoMapper.delete(new QueryWrapper<DgEnclosureInfo>().eq("business_id", guaranteeAssignUser.getBusinessId()));
         //附件新增

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

@@ -232,6 +232,7 @@ public class DgMessageInvestigationServiceImpl extends ServiceImpl<DgMessageInve
         messageDetailResponse.setDgApplyAmountInfo(dgApplyAmountInfo);
         messageDetailResponse.setDgEnclosureInfo(dgEnclosureInfo);
         messageDetailResponse.setLinkedHashMap(linkedList);
+        messageDetailResponse.setDgMessageInvestigation(dgMessageInvestigation);
         return messageDetailResponse;
     }
 

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

@@ -210,10 +210,9 @@
 
     <!-- 根据部门id获取该部门下面所有的员工 -->
     <select id="employeeListByDeptId" parameterType="long" resultType="com.daqing.framework.domain.hrms.ext.UserDeptVO">
-        /*select * from (*/
             SELECT
              u.id,
-             u.account , GROUP_CONCAT(er.role_id SEPARATOR ',') roleId
+             e.name as account , GROUP_CONCAT(er.role_id SEPARATOR ',') roleId
             FROM
              hrms_employee e
              LEFT JOIN hrms_employee_dept ed ON e.id = ed.employee_id
@@ -224,14 +223,9 @@
              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>
              GROUP BY u.id
-/*            )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*/
     </select>
 
     <!-- 查询所有的员工姓名和id -->