Merge remote-tracking branch 'origin/master'

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

@@ -1,15 +1,18 @@
 package com.daqing.financial.guarantee.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.feign.HrmsFeignService;
 import com.daqing.financial.guarantee.mapper.DgCopyUserMapper;
+import com.daqing.financial.guarantee.mapper.DgPaymentConfirmationConsiderMapper;
 import com.daqing.financial.guarantee.model.request.CopyForMeRequest;
 import com.daqing.financial.guarantee.model.response.CopyForMeResponse;
 import com.daqing.financial.guarantee.service.IDgCopyUserService;
 import com.daqing.financial.guarantee.util.DateUtils;
 import com.daqing.financial.guarantee.util.TaskNodeUtil;
 import com.daqing.framework.domain.guarantee.DgCopyUser;
+import com.daqing.framework.domain.guarantee.DgPaymentConfirmationConsider;
 import com.daqing.framework.model.response.ResponseResult;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.excel.EasyExcelUtil;
@@ -42,6 +45,9 @@ public class DgCopyUserServiceImpl extends ServiceImpl<DgCopyUserMapper, DgCopyU
     @Autowired
     private HrmsFeignService hrmsFeignService;
 
+    @Autowired
+    private DgPaymentConfirmationConsiderMapper paymentConfirmationConsiderMapper;
+
     @Override
     public List<CopyForMeResponse> queryCopyForMe(CopyForMeRequest copyForMeRequest) {
         // 时间筛选(固定时间)
@@ -110,6 +116,14 @@ public class DgCopyUserServiceImpl extends ServiceImpl<DgCopyUserMapper, DgCopyU
 
             //转换任务节点
             copyForMeResponseList.forEach(copyForMeResponse -> {
+                //财务确认根据业务id查询图片文件
+                if ("9".equals(copyForMeResponse.getTaskNode())){
+                    QueryWrapper<DgPaymentConfirmationConsider> wrapper = new QueryWrapper<>();
+                    wrapper.eq("business_id",copyForMeResponse.getBusinessId()).last("limit 1");
+                    DgPaymentConfirmationConsider paymentConfirmationConsider = paymentConfirmationConsiderMapper.selectOne(wrapper);
+                    String imgFile = paymentConfirmationConsider.getImgFile();
+                    copyForMeResponse.setImgFile(imgFile);
+                }
                 //提单人为空，默认赋值客户
                 if (StringUtils.isEmpty(copyForMeResponse.getApplicant())){
                     copyForMeResponse.setApplicant("客户");

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

@@ -28,8 +28,6 @@
         <result column="bank" property="bank"/>
         <result column="passing_time" property="passingTime"/>
         <result column="file" property="file"/>
-        <result column="img_file" property="imgFile"/>
-
     </resultMap>
 
     <select id="selectCopyForMe" parameterType="com.daqing.financial.guarantee.model.request.CopyForMeRequest"
@@ -39,7 +37,7 @@
         aai.business_type,aai.bank,aai.business_type,
         cc.name,cc.phone,cf.process_id,
         cf.update_time as approve_date,cf.detail_id,cf.business_id,
-        bps.business_status,pcc.img_file,
+        bps.business_status,
         lcc.loan_money,lcc.loan_tern,lcc.passing_time,lcc.file
         FROM
         dg_copy_user cu
@@ -48,7 +46,6 @@
         LEFT JOIN crms_company_customer ccc ON aai.company_id = ccc.id
         left join dg_loan_committee_consider lcc on cf.business_id = lcc.business_id
         LEFT JOIN crms_customer cc ON ccc.customer_id = cc.id
-        LEFT JOIN dg_payment_confirmation_consider pcc ON pcc.business_id = cf.business_id
         LEFT JOIN dg_business_process_status bps ON bps.business_id = aai.id
         WHERE cu.user_id = #{userId}
         <if test="startTime != null and endTime != ''">