Merge remote-tracking branch 'origin/master'

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

@@ -43,19 +43,7 @@ public class DgCopyUserController {
     @PostMapping("/queryCopyForMe")
     public R queryCopyForMe(@RequestBody CopyForMeRequest copyForMeRequest){
         List<CopyForMeResponse> copyForMeList = copyUserService.queryCopyForMe(copyForMeRequest);
-        //转换任务节点
-        copyForMeList.forEach(copyForMeResponse -> {
-            //提单人为空，默认赋值客户
-            if (StringUtils.isEmpty(copyForMeResponse.getApplicant())){
-                copyForMeResponse.setApplicant("客户");
-            }
-            String taskNode = copyForMeResponse.getTaskNode();
-            if (taskNode != null) {
-                String converter = TaskNodeUtil.converter(taskNode);
-                copyForMeResponse.setTaskNode(converter);
-            }
-        });
-        return R.ok().data("copyForMeList",copyForMeList);
+        return R.ok().data("copyForMeList",copyForMeList).data("total",copyUserService.queryTotal(copyForMeRequest));
     }
 
     @Log(detail = "导出抄送我的列表",level = 4,operationUnit = OperationUnit.COPYFOR,operationType = OperationType.SELECT)

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

@@ -206,10 +206,9 @@ public class DgEfficiencyController {
         String userId = DgApplyAmountInfoController.getUserId();
         CopyForMeRequest copyForMeRequest = new CopyForMeRequest();
         copyForMeRequest.setUserId(Integer.parseInt(userId));
-        List<CopyForMeResponse> copyForMeList = copyUserService.queryCopyForMe(copyForMeRequest);
-        int size = copyForMeList.size();
+        Integer total = copyUserService.queryTotal(copyForMeRequest);
         NumResponse numResponse = new NumResponse();
-        numResponse.setCopySendNum(size);
+        numResponse.setCopySendNum(total);
         //转换任务节点，并统计操作状态个数
         responseList.forEach(personalEfficiencyListResponse -> {
             //耗时为空，默认为0

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

@@ -21,4 +21,6 @@ import java.util.List;
 public interface DgCopyUserMapper extends BaseMapper<DgCopyUser> {
 
     List<CopyForMeResponse> selectCopyForMe(CopyForMeRequest copyForMeRequest);
+
+    Integer selectCopyForMeTotal(CopyForMeRequest copyForMeRequest);
 }

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

@@ -12,6 +12,12 @@ import lombok.Data;
 @Data
 public class CopyForMeRequest {
 
+    @ApiModelProperty(value = "当前页码,默认为第一页")
+    private Integer page = 0;
+
+    @ApiModelProperty(value = "每页记录数,默认显示10条")
+    private Integer size = 10;
+
     @ApiModelProperty("申请时间,固定类型,0:今天,1:昨天,2:本周,3:本月,4:本年")
     private Integer createFixedTime;
 

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

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author chen
  * @DATE 2021/1/18 9:56
@@ -35,20 +37,16 @@ public class CopyForMeResponse {
     @ApiModelProperty("申请日期")
     @ExcelProperty(value = "申请日期",index = 2)
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private String applicationDate;
+    private Date applicationDate;
 
     @ApiModelProperty("任务节点")
     @ExcelProperty(value = "任务节点",index = 3,converter = TaskNodeConverter.class)
     private String taskNode;
 
-    // @ApiModelProperty("审批人")
-    // @ExcelProperty(value = "审批人",index = 4)
-    // private String approve;
-
     @ApiModelProperty("完成时间")
     @ExcelProperty(value = "完成时间",index = 4)
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private String approveDate;
+    private Date approveDate;
 
     @ApiModelProperty("业务状态")
     @ExcelProperty(value = "业务状态",index = 5,converter = BusinessStatusConverter.class)
@@ -66,4 +64,37 @@ public class CopyForMeResponse {
     @ApiModelProperty("业务id")
     private Integer businessId;
 
+    /**
+     * 下列属性用于解决抄送详情跳转问题
+     */
+
+    @ApiModelProperty("业务编号")
+    @ExcelIgnore
+    private String businessCode;
+
+    @ApiModelProperty("联系电话")
+    @ExcelIgnore
+    private String phone;
+
+    @ApiModelProperty("业务类别")
+    @ExcelIgnore
+    private String businessType;
+
+    @ApiModelProperty("申请额度")
+    @ExcelIgnore
+    private Double loanMoney;
+
+    @ApiModelProperty("申请期限(月)")
+    @ExcelIgnore
+    private String loanTern;
+
+    @ExcelIgnore
+    @ApiModelProperty("贷审会同意时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date passingTime;
+
+    @ExcelIgnore
+    @ApiModelProperty("银行名称")
+    private String bank;
+
 }

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

@@ -22,5 +22,7 @@ public interface IDgCopyUserService extends IService<DgCopyUser> {
 
     List<CopyForMeResponse> queryCopyForMe(CopyForMeRequest copyForMeRequest);
 
+    Integer queryTotal(CopyForMeRequest copyForMeRequest);
+
     void exportCopyForMe(HttpServletResponse response) throws IOException;
 }

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

@@ -1,26 +1,19 @@
 package com.daqing.financial.guarantee.service.impl;
 
-import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.daqing.financial.guarantee.mapper.DgCopyForMapper;
 import com.daqing.financial.guarantee.mapper.DgCopyUserMapper;
 import com.daqing.financial.guarantee.mapper.DgProcessUserMapper;
 import com.daqing.financial.guarantee.service.IDgCopyForService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.daqing.financial.guarantee.service.IDgCopyUserService;
-import com.daqing.financial.guarantee.service.IDgProcessUserService;
-import com.daqing.financial.guarantee.util.ImgUtil;
 import com.daqing.framework.domain.guarantee.DgCopyFor;
 import com.daqing.framework.domain.guarantee.DgCopyUser;
 import com.daqing.framework.domain.guarantee.DgProcessUser;
-import com.daqing.framework.model.response.PromptSuccess;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.List;
 

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

@@ -8,10 +8,12 @@ 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.model.response.ResponseResult;
 import com.daqing.framework.util.RedisUtil;
 import com.daqing.framework.utils.excel.EasyExcelUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -101,20 +103,32 @@ public class DgCopyUserServiceImpl extends ServiceImpl<DgCopyUserMapper, DgCopyU
                         if (response.getApplicantId()!=null && response.getApplicantId().equals(res.get("id"))) {//如果提单人id相同情况下，就往对象里面赋值
                             response.setApplicant(JSONObject.toJSONString(res.get("account")).replace("\"", ""));
                         }
-                        // if (response.getApproveId()!=null){
-                        //     if (response.getApproveId().equals(res.get("id"))) {//如果审批人id相同情况下，就往对象里面赋值
-                        //         response.setApprove(JSONObject.toJSONString(res.get("account")).replace("\"", ""));
-                        //     }
-                        // }
                     }
                 }
             }
 
+            //转换任务节点
+            copyForMeResponseList.forEach(copyForMeResponse -> {
+                //提单人为空，默认赋值客户
+                if (StringUtils.isEmpty(copyForMeResponse.getApplicant())){
+                    copyForMeResponse.setApplicant("客户");
+                }
+                String taskNode = copyForMeResponse.getTaskNode();
+                if (taskNode != null) {
+                    String converter = TaskNodeUtil.converter(taskNode);
+                    copyForMeResponse.setTaskNode(converter);
+                }
+            });
         }
 
         return copyForMeResponseList;
     }
 
+    @Override
+    public Integer queryTotal(CopyForMeRequest copyForMeRequest) {
+        return baseMapper.selectCopyForMeTotal(copyForMeRequest);
+    }
+
     /**
      * 获取当前登录用户信息
      */

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

@@ -826,6 +826,7 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
 
     /**
      * 更新担保函模块角色或用户确认状态及审核意见
+     * I hope the friends behind can watch it patiently and wish you a happy life
      */
     @Transactional
     @Override

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

@@ -4,45 +4,48 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgCopyUser">
-        <id column="id" property="id" />
-        <result column="copy_id" property="copyId" />
-        <result column="user_id" property="userId" />
+        <id column="id" property="id"/>
+        <result column="copy_id" property="copyId"/>
+        <result column="user_id" property="userId"/>
     </resultMap>
 
     <resultMap id="CopyForMeMap" type="com.daqing.financial.guarantee.model.response.CopyForMeResponse">
-        <result column="presenter_id" property="applicantId" />
-        <result column="name" property="clientName" />
-        <result column="create_time" property="applicationDate" />
-        <result column="process_id" property="taskNode" />
-        <result column="approval_id" property="approveId" />
-        <result column="business_status" property="businessStatus" />
-        <result column="approve_date" property="approveDate" />
-        <result column="pic_url" property="picUrl" />
-        <result column="detail_id" property="detailId" />
-        <result column="business_id" property="businessId" />
+        <result column="presenter_id" property="applicantId"/>
+        <result column="name" property="clientName"/>
+        <result column="create_time" property="applicationDate"/>
+        <result column="process_id" property="taskNode"/>
+        <result column="approval_id" property="approveId"/>
+        <result column="business_status" property="businessStatus"/>
+        <result column="approve_date" property="approveDate"/>
+        <result column="pic_url" property="picUrl"/>
+        <result column="detail_id" property="detailId"/>
+        <result column="business_id" property="businessId"/>
+        <result column="business_code" property="businessCode"/>
+        <result column="phone" property="phone"/>
+        <result column="business_type" property="businessType"/>
+        <result column="loan_money" property="loanMoney"/>
+        <result column="loan_tern" property="loanTern"/>
+        <result column="bank" property="bank"/>
+        <result column="passing_time" property="passingTime"/>
     </resultMap>
 
     <select id="selectCopyForMe" parameterType="com.daqing.financial.guarantee.model.request.CopyForMeRequest"
             resultMap="CopyForMeMap">
         SELECT
-            aai.presenter_id,
-            cc.name,
-            aai.create_time,
-            cf.process_id,
-            aai.approval_id,
-            aai.status,
-            bps.business_status,
-            cf.update_time as approve_date,
-            cf.pic_url,
-            cf.detail_id,
-            cf.business_id
+        aai.presenter_id,aai.business_code,aai.create_time,aai.approval_id,aai.status,
+        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,
+        lcc.loan_money,lcc.loan_tern,lcc.passing_time
         FROM
-            dg_copy_user cu
-            JOIN dg_copy_for cf ON cu.copy_id = cf.id
-            LEFT JOIN dg_apply_amount_info aai ON cf.business_id = aai.id
-            LEFT JOIN crms_company_customer ccc ON aai.company_id = ccc.id
-            LEFT JOIN crms_customer cc ON ccc.customer_id = cc.id
-            LEFT JOIN dg_business_process_status bps ON bps.business_id = aai.id
+        dg_copy_user cu
+        JOIN dg_copy_for cf ON cu.copy_id = cf.id
+        LEFT JOIN dg_apply_amount_info aai ON cf.business_id = aai.id
+        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_business_process_status bps ON bps.business_id = aai.id
         WHERE cu.user_id = #{userId}
         <if test="startTime != null and endTime != ''">
             AND cf.update_time BETWEEN #{startTime} and #{endTime}
@@ -51,6 +54,27 @@
             AND cc.name LIKE '%' #{clientName} '%'
         </if>
         order by aai.create_time desc
+        limit #{page},#{size}
+    </select>
+
+    <select id="selectCopyForMeTotal" parameterType="com.daqing.financial.guarantee.model.request.CopyForMeRequest"
+            resultType="integer">
+        SELECT count(1)
+        FROM
+        dg_copy_user cu
+        JOIN dg_copy_for cf ON cu.copy_id = cf.id
+        LEFT JOIN dg_apply_amount_info aai ON cf.business_id = aai.id
+        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_business_process_status bps ON bps.business_id = aai.id
+        WHERE cu.user_id = #{userId}
+        <if test="startTime != null and endTime != ''">
+            AND cf.update_time BETWEEN #{startTime} and #{endTime}
+        </if>
+        <if test="clientName != null and clientName != ''">
+            AND cc.name LIKE '%' #{clientName} '%'
+        </if>
     </select>
 
 </mapper>

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

@@ -4,42 +4,44 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.daqing.framework.domain.guarantee.DgGuaranteeLetterAssignUser">
-        <id column="id" property="id" />
-        <result column="business_id" property="businessId" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
+        <id column="id" property="id"/>
+        <result column="business_id" property="businessId"/>
+        <result column="company_id" property="companyId"/>
+        <result column="user_id" property="userId"/>
+        <result column="status" property="status"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
     </resultMap>
 
-    <resultMap id="GuaranteeLetterListResponseMap" type="com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse">
-        <id column="id" property="id" />
-        <result column="business_code" property="businessCode" />
-        <result column="bank" property="bank" />
-        <result column="passing_time" property="passingTime" />
-        <result column="file" property="file" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="loan_tern" property="loanTern" />
-        <result column="loan_money" property="loanMoney" />
-        <result column="business_type" property="businessType" />
-        <result column="audit_opinion" property="auditOpinion" />
-        <result column="operating_status" property="operatingStatus" />
-        <result column="business_status" property="businessStatus" />
-        <result column="business_id" property="businessId" />
-        <result column="role_id" property="roleId" />
+    <resultMap id="GuaranteeLetterListResponseMap"
+               type="com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse">
+        <id column="id" property="id"/>
+        <result column="business_code" property="businessCode"/>
+        <result column="bank" property="bank"/>
+        <result column="passing_time" property="passingTime"/>
+        <result column="file" property="file"/>
+        <result column="name" property="name"/>
+        <result column="phone" property="phone"/>
+        <result column="status" property="status"/>
+        <result column="create_time" property="createTime"/>
+        <result column="loan_tern" property="loanTern"/>
+        <result column="loan_money" property="loanMoney"/>
+        <result column="business_type" property="businessType"/>
+        <result column="audit_opinion" property="auditOpinion"/>
+        <result column="operating_status" property="operatingStatus"/>
+        <result column="business_status" property="businessStatus"/>
+        <result column="business_id" property="businessId"/>
+        <result column="role_id" property="roleId"/>
     </resultMap>
 
     <select id="pageByCondition" resultMap="GuaranteeLetterListResponseMap">
-        select lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,lau.status,
+        select
+        lau.id,aai.business_code,cc.name,cc.phone,aai.business_type,lcc.loan_money,lcc.loan_tern,aai.create_time,lau.status,
         aai.bank,lcc.passing_time,lcc.file,lau.audit_opinion,lau.operating_status,bps.business_status,lau.business_id,lau.role_id
         from dg_guarantee_letter_assign_user lau
         left join dg_apply_amount_info aai on lau.business_id = aai.id
         left join dg_business_company cc on cc.business_id = aai.id
-/*        left join crms_company_customer ccc on lau.company_id = ccc.id
+        /* left join crms_company_customer ccc on lau.company_id = ccc.id
         left join crms_customer cc on ccc.customer_id = cc.id*/
         left join dg_loan_committee_consider lcc on lau.business_id = lcc.business_id
         left join dg_business_process_status bps on lau.business_id = bps.business_id
@@ -52,7 +54,8 @@
                 AND (lau.user_id = #{userId} or lau.user_id is null OR lau.user_id = '')
             </if>
             <if test="customerNumberOrName != null and customerNumberOrName != ''">
-                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%' #{customerNumberOrName} '%'))
+                AND (aai.business_code LIKE CONCAT('%' #{customerNumberOrName} '%') OR cc.name LIKE CONCAT('%'
+                #{customerNumberOrName} '%'))
             </if>
             <if test="status != null and status != ''">
                 AND lau.status = #{status}
@@ -68,7 +71,7 @@
         from dg_guarantee_letter_assign_user lau
         left join dg_apply_amount_info aai on lau.business_id = aai.id
         left join dg_business_company cc on cc.business_id = aai.id
-/*        left join crms_company_customer ccc on lau.company_id = ccc.id
+        /* left join crms_company_customer ccc on lau.company_id = ccc.id
         left join crms_customer cc on ccc.customer_id = cc.id*/
         left join dg_loan_committee_consider lcc on lau.business_id = lcc.business_id
         left join dg_business_process_status bps on lau.business_id = bps.business_id
@@ -78,7 +81,8 @@
         </foreach>
     </select>
 
-    <select id="selectGuaranteeLetter" resultType="com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse">
+    <select id="selectGuaranteeLetter"
+            resultType="com.daqing.financial.guarantee.model.response.GuaranteeLetterListResponse">
         select cc.name,lcc.loan_money,lcc.loan_tern,aai.bank,lcc.passing_time
         from dg_guarantee_letter_assign_user lau
         left join dg_apply_amount_info aai on lau.business_id = aai.id
@@ -89,8 +93,10 @@
         where lau.business_id = #{businessId} and lau.role_id = #{roleId}
     </select>
 
-    <select id="selectGuaranteeLetterList" resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
-        select au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
+    <select id="selectGuaranteeLetterList"
+            resultType="com.daqing.financial.guarantee.model.response.DgNoticeListResponse">
+        select
+        au.id,au.role_id,au.company_id,au.business_id,ai.business_code,ai.business_type,ai.apply_amount,ai.apply_time,au.create_time,
         au.status,au.operating_status,cc.name,cc.phone,ps.business_status
         from dg_guarantee_letter_assign_user au
         left join dg_apply_amount_info ai on au.business_id = ai.id