合规调查file改为fileUrl

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

@@ -478,8 +478,8 @@ public class DgComplianceInvestigationServiceImpl extends ServiceImpl<DgComplian
         // 合规附件和意见
         DgComplianceInvestigation dgComplianceInvestigation = this.getBaseMapper().queryDgComplianceInvestigation(iid);
         if (dgComplianceInvestigation != null) {
-            if (dgComplianceInvestigation.getFile() != null && dgComplianceInvestigation.getFile().length() != 0) {
+            if (dgComplianceInvestigation.getFileUrl() != null && dgComplianceInvestigation.getFileUrl().length() != 0) {
-                String[] fileUrls = dgComplianceInvestigation.getFile().split(",");
+                String[] fileUrls = dgComplianceInvestigation.getFileUrl().split(",");
                 dgComplianceInvestigationInfoResponse.setFileUrls(fileUrls);
             }
             if (dgComplianceInvestigation.getOpinion() != null && dgComplianceInvestigation.getOpinion().length() != 0) {

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

@@ -67,6 +67,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
     private DgBusinessProcessStatusMapper dgBusinessProcessStatusMapper;
     @Resource
     private DgApplyAmountListMapper dgApplyAmountListMapper;
+    @Resource
+    private DgLoanCommitteeConsiderMapper dgLoanCommitteeConsiderMapper;
 
 
     @Override
@@ -177,12 +179,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         DgGuaranteeAssignUser guaranteeAssignUser = this.getBaseMapper().selectById(investigateGuaranteeRequest.getId());
 
         //如果是属于被驳回的数据，并且调查通过（同意）
-        if(guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT)){
+        if(guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT) && investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)){
 
             //AB角调查，修改审核意见以及状态
             DgGuaranteeAssignUser dgGuaranteeAssignUser = new DgGuaranteeAssignUser();
             dgGuaranteeAssignUser.setId(investigateGuaranteeRequest.getId());//主键id
-            dgGuaranteeAssignUser.setStatus(StatusCode.SP_REJECT);//状态为驳回(只有A,B角同时)
+            dgGuaranteeAssignUser.setStatus(StatusCode.SP_REJECT);//状态为驳回(只有A,B角同时同意，状态才改为审核中)
             dgGuaranteeAssignUser.setOperatingStatus(StatusCode.CZ_PROCESSED);//操作状态设置为已处理
             dgGuaranteeAssignUser.setRemark(investigateGuaranteeRequest.getApplyContent());//审核意见
             this.baseMapper.updateById(dgGuaranteeAssignUser);
@@ -244,18 +246,54 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                 .eq("type",2).eq("status",StatusCode.SP_IN_REVIEW).eq("operating_status",StatusCode.CZ_PROCESSED));
         int sum2 = a+b;
         if(sum2==2){
-/*            if(){//合规调查驳回情况处理
-
-            }else if(){//贷审会业务流程驳回情况处理
 
-            }else{//正常情况处理*/
+            //如果合规调查C角状态为驳回，并且操作状态为已处理，同时此条数据也是被驳回来的数据，则为合规调查驳回情况处理
+            DgComplianceInvestigation investigation = dgComplianceInvestigationMapper.selectOne(new QueryWrapper<DgComplianceInvestigation>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("role_id",PromptSuccess.FG_C_ID));
+
+            //如果贷审会状态为驳回，并且操作状态为已处理，同时此条数据也是被驳回来的数据，则为贷审会驳回情况处理
+            DgLoanCommitteeConsider consider = dgLoanCommitteeConsiderMapper.selectOne(new QueryWrapper<DgLoanCommitteeConsider>()
+                    .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("role_id", PromptSuccess.DSH_ID));
+
+            if(investigation != null && investigation.getAuditStatus().equals(StatusCode.SP_REJECT) && investigation.getOperationStatus().equals(StatusCode.CZ_PROCESSED)
+                    && guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT)){//合规调查驳回情况处理
+
+                //调查通过，修改法规经理操作状态为待处理，其他子业务为审核中
+                if(investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)){//如果调查通过
+                    DgComplianceInvestigation dgCompliance = new DgComplianceInvestigation();
+                    dgCompliance.setOperationStatus(StatusCode.CZ_ON_HAND);//待处理
+                    dgComplianceInvestigationMapper.update(dgCompliance,new QueryWrapper<DgComplianceInvestigation>()
+                            .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("role_id",PromptSuccess.FG_JL_ID));
+
+                    DgComplianceInvestigation dgInvestigation = new DgComplianceInvestigation();
+                    dgInvestigation.setAuditStatus(StatusCode.SP_IN_REVIEW);//审核中
+                    dgComplianceInvestigationMapper.update(dgInvestigation,new QueryWrapper<DgComplianceInvestigation>()
+                            .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)){//贷审会业务流程驳回情况处理
+
+                //调查通过，修改贷审会操作状态为待处理，其他子业务为审核中
+                if(investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)){//如果调查通过
+                    DgLoanCommitteeConsider dgLoanCommittee = new DgLoanCommitteeConsider();
+                    dgLoanCommittee.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理
+                    dgLoanCommitteeConsiderMapper.update(dgLoanCommittee,new QueryWrapper<DgLoanCommitteeConsider>()
+                            .eq("business_id",guaranteeAssignUser.getBusinessId()).eq("role_id",PromptSuccess.DSH_ID));
+
+                    DgLoanCommitteeConsider dgConsider = new DgLoanCommitteeConsider();
+                    dgConsider.setStatus(StatusCode.SP_IN_REVIEW);//审核中
+                    dgLoanCommitteeConsiderMapper.update(dgConsider,new QueryWrapper<DgLoanCommitteeConsider>()
+                            .eq("business_id",guaranteeAssignUser.getBusinessId()));
+                }
+
+            }else{//正常情况处理
                 DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
                 assignUser.setRoleId(PromptSuccess.DB_JL_ID);//担保部经理
                 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",3));
-            //}
+            }
 
         }
 

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

@@ -2,6 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.daqing.financial.guarantee.mapper.DgComplianceInvestigationMapper">
 
+    <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgComplianceInvestigation">
+        <id column="id" property="id" />
+        <result column="company_id" property="companyId" />
+        <result column="user_id" property="userId" />
+        <result column="role_id" property="roleId" />
+        <result column="business_id" property="businessId" />
+        <result column="file_url" property="fileUrl" />
+        <result column="opinion" property="opinion" />
+        <result column="operation_status" property="operationStatus" />
+        <result column="audit_status" property="auditStatus" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
     <select id="list" resultType="com.daqing.financial.guarantee.model.response.DgComplianceInvestigationResponse">
         SELECT a.id AS business_id,a.business_code AS business_code,a.business_type AS business_type,a.apply_amount AS apply_amount,
                a.apply_time AS apply_time,a.create_time AS create_time,c.name AS name,c.phone AS phone,i.operation_status AS
@@ -108,7 +122,7 @@
 
     <!-- 根据id查询合规调查表详情 -->
     <select id="queryDgComplianceInvestigation" parameterType="integer" resultType="com.daqing.framework.domain.guarantee.DgComplianceInvestigation">
-        SELECT file_url AS  file,opinion AS opinion
+        SELECT file_url,opinion AS opinion
         FROM dg_compliance_investigation
         WHERE id = #{iid}
     </select>

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

@@ -51,7 +51,7 @@ public class DgComplianceInvestigation implements Serializable {
      * 附件
      */
     @ApiModelProperty("附件")
-    private String file;
+    private String fileUrl;
 
     /**
      * 调查意见