工作台客户列表

dq-financial-crms/src/main/java/com/daqing/financial/crms/service/impl/CustomerWorkbenchServiceImpl.java

@@ -64,7 +64,12 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
         Long[] customerIds = customers.stream().map(CustomerEntity::getId).toArray(Long[]::new);
         // 返回列表实体类集合
         List<CustomerWorkbenchListVO> customerWorkbenchListVOS = new ArrayList<>();
-        BeanUtils.copyProperties(customers,customerWorkbenchListVOS);
+        for (int i = 0; i < customers.size(); i++) {
+            CustomerWorkbenchListVO customerWorkbenchListVO = new CustomerWorkbenchListVO();
+            BeanUtils.copyProperties(customers.get(i), customerWorkbenchListVO);
+            customerWorkbenchListVOS.add(customerWorkbenchListVO);
+        }
+        System.out.println(customerWorkbenchListVOS);
         if (managerIds.length != 0) {
             // 远程调用查询客户对应的客户经理信息
             ResponseResult responseResult = hrmsFeignService.getEmployeeAndDeptById(managerIds);
@@ -83,6 +88,7 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
                 customerWorkbenchListVOS.removeIf(customerWorkbenchListVO -> !Objects.equals(customerWorkbenchListVO.getStatus(), cwr.getStatus()));
             }
         }
+        System.out.println(customerWorkbenchListVOS);
         // 属性拷贝,将泛型为CustomerEntity类型的IPage的属性拷贝给泛型为CustomerTO类型的IPage,才能赋值给PageUtils
         IPage<CustomerWorkbenchListVO> iPage = new Page<>();
         BeanUtils.copyProperties(customerEntityIPage, iPage);
@@ -170,6 +176,7 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
 
     /**
      * 通过审核
+     *
      * @param id      当前客户id
      * @param manager 客户经理id
      * @return
@@ -184,6 +191,7 @@ public class CustomerWorkbenchServiceImpl extends ServiceImpl<CustomerWorkbenchD
 
     /**
      * 不通过审核
+     *
      * @param id    当前客户id
      * @param cause 原因
      * @return

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

@@ -51,7 +51,7 @@ public interface DgComplianceInvestigationMapper extends BaseMapper<DgCompliance
 
     Integer getOperationStatusByBusinessId(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
 
-    Integer getAuditStatusByBusinessId(@Param("businessId") Integer businessId);
+    Integer getAuditStatusByBusinessId(@Param("businessId") Integer businessId, @Param("roleId") Integer roleId);
 
     DgComplianceInvestigation queryDgComplianceInvestigation(Integer iid);
 

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

@@ -287,7 +287,7 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
                     Boolean result = this.getBaseMapper().check(iid, opinion, new Date(),
                             StatusCode.SP_IN_REVIEW, StatusCode.CZ_PROCESSED, Integer.parseInt(userId));
                     if (result) {
-                        Integer auditStatus = this.getBaseMapper().getAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId());
+                        Integer auditStatus = this.getBaseMapper().getAuditStatusByBusinessId(this.getComplianceInvestigation(iid).getBusinessId(), PromptSuccess.FG_JL_ID);
                         Boolean result1;
                         if (StatusCode.SP_REJECT.equals(auditStatus)){
                             // 表示为法规部领导驳回的数据,先更新审批状态为审核中

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

@@ -103,7 +103,7 @@
 
     <!-- 根据业务id获取当前数据的审核状态 -->
     <select id="getAuditStatusByBusinessId" resultType="integer">
-        SELECT audit_status FROM dg_compliance_investigation WHERE business_id = #{businessId}
+        SELECT audit_status FROM dg_compliance_investigation WHERE business_id = #{businessId} AND role_id = #{roleId}
     </select>
 
     <!-- 根据id查询合规调查表详情 -->