保单导入优化

src/main/java/com/ydtech/modules/fnc/dao/InsPlyMainMapper.java

@@ -1,8 +1,19 @@
 package com.ydtech.modules.fnc.dao;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.fnc.entity.InsPlyMain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.fnc.entity.InsPlySettle;
+import com.ydtech.modules.fnc.vo.InsPlySettleVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +26,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface InsPlyMainMapper extends BaseMapper<InsPlyMain> {
 
+    @Select("select (select b.`name` from sys_dept b where a.dept_id=b.id) deptName,c.`name` companyName, (select d.`name` from sys_user d where a.user_id=d.id ) userName,a.* from ins_ply_main a " +
+            "left join esm_ins_company c on a.company_id=c.id  " +
+            " ${ew.customSqlSegment}")
+    List<InsPlyMain> selectByCondition( @Param(Constants.WRAPPER) LambdaQueryWrapper<InsPlyMain> wrapper);
+
 }

src/main/java/com/ydtech/modules/fnc/service/impl/InsPlyMainServiceImpl.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -91,6 +92,7 @@ public class InsPlyMainServiceImpl extends ServiceImpl<InsPlyMainMapper, InsPlyM
     public HttpResult<BasePageResult<InsPlyMain>> queryPly(InsPlyMainVo insPlyMainVo) {
 
         try {
+//            Page page = new Page(insPlyMainVo.getPageNum(), insPlyMainVo.getPageSize());
             PageInfo<List<InsPlyMain>> pageHelper = null;
             PageHelper.startPage(insPlyMainVo.getPageNum(), insPlyMainVo.getPageSize());
             LambdaQueryWrapper<InsPlyMain> wrapper=new LambdaQueryWrapper<InsPlyMain>();
@@ -101,7 +103,7 @@ public class InsPlyMainServiceImpl extends ServiceImpl<InsPlyMainMapper, InsPlyM
                             InsPlyMain::getCreatetime, insPlyMainVo.getStartDate(), insPlyMainVo.getEndDate())
                     .eq(StringUtils.isNotEmpty(insPlyMainVo.getCompanyId()),InsPlyMain::getCompanyId,insPlyMainVo.getCompanyId());
 
-            List<InsPlyMain> list = this.baseMapper.selectList(wrapper);
+            List<InsPlyMain> list = this.baseMapper.selectByCondition(wrapper);
             pageHelper = new PageInfo(list);
             BasePageResult<InsPlyMain> pageResult = new BasePageResult<InsPlyMain>(insPlyMainVo.getPageNum(), insPlyMainVo.getPageSize(), pageHelper.getTotal(), pageHelper.getPages(), list);
             return HttpResult.ok(pageResult);

src/main/java/com/ydtech/modules/fnc/xml/InsPlyMainMapper.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ydtech.modules.fnc.dao.InsPlyMainMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.ydtech.modules.fnc.entity.InsPlyMain">
-        <id column="policyno" property="policyno" />
-        <result column="batchno" property="batchno" />
-        <result column="orderno" property="orderno" />
-        <result column="dept_id" property="deptId" />
-        <result column="user_id" property="userId" />
-        <result column="riskcode" property="riskcode" />
-        <result column="pay_date" property="payDate" />
-        <result column="start_date" property="startDate" />
-        <result column="end_date" property="endDate" />
-        <result column="company_id" property="companyId" />
-        <result column="agreement_id" property="agreementId" />
-        <result column="licenseno" property="licenseno" />
-        <result column="applyname" property="applyname" />
-        <result column="applyphone" property="applyphone" />
-        <result column="insurername" property="insurername" />
-        <result column="insurerphone" property="insurerphone" />
-        <result column="taxamount" property="taxamount" />
-        <result column="premium" property="premium" />
-        <result column="no_tax_premium" property="noTaxPremium" />
-        <result column="commission_feerate" property="commissionFeerate" />
-        <result column="other_feerate" property="otherFeerate" />
-        <result column="commission_feevalue" property="commissionFeevalue" />
-        <result column="other_feevalue" property="otherFeevalue" />
-        <result column="all_fee_value" property="allFeeValue" />
-        <result column="first_dept_proportion" property="firstDeptProportion" />
-        <result column="first_dept_premiums" property="firstDeptPremiums" />
-        <result column="second_dept_proportion" property="secondDeptProportion" />
-        <result column="second_dept_premiums" property="secondDeptPremiums" />
-        <result column="third_dept_proportion" property="thirdDeptProportion" />
-        <result column="third_dept_premiums" property="thirdDeptPremiums" />
-        <result column="forth_dept_proportion" property="forthDeptProportion" />
-        <result column="forth_dept_premiums" property="forthDeptPremiums" />
-        <result column="fifth_dept_proportion" property="fifthDeptProportion" />
-        <result column="fifth_dept_premiums" property="fifthDeptPremiums" />
-        <result column="first_detail_proportion" property="firstDetailProportion" />
-        <result column="first_detail_premiums" property="firstDetailPremiums" />
-        <result column="second_detail_proportion" property="secondDetailProportion" />
-        <result column="second_detail_premiums" property="secondDetailPremiums" />
-        <result column="third_detail_proportion" property="thirdDetailProportion" />
-        <result column="third_detail_premiums" property="thirdDetailPremiums" />
-        <result column="user_fee_proportion" property="userFeeProportion" />
-        <result column="user_feel_premiums" property="userFeelPremiums" />
-        <result column="creator" property="creator" />
-        <result column="createtime" property="createtime" />
-        <result column="updateuser" property="updateuser" />
-        <result column="updatetime" property="updatetime" />
-    </resultMap>
-
-</mapper>

src/main/resources/mapper/modules/fnc/InsPlyMainMapper.xml

@@ -8,12 +8,15 @@
         <result column="batchno" property="batchno" />
         <result column="orderno" property="orderno" />
         <result column="dept_id" property="deptId" />
+        <result column="deptName" property="deptName" />
         <result column="user_id" property="userId" />
+        <result column="userName" property="userName" />
         <result column="riskcode" property="riskcode" />
         <result column="pay_date" property="payDate" />
         <result column="start_date" property="startDate" />
         <result column="end_date" property="endDate" />
         <result column="company_id" property="companyId" />
+        <result column="companyName" property="companyName" />
         <result column="agreement_id" property="agreementId" />
         <result column="licenseno" property="licenseno" />
         <result column="applyname" property="applyname" />