Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/esm/dao/InsOrderSetUserHisMapper.java

@@ -2,9 +2,12 @@ package com.ydtech.modules.esm.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -21,4 +24,11 @@ public interface InsOrderSetUserHisMapper extends BaseMapper<InsOrderSetUserHis>
      *  @Description: 通过子订单id查询最新的历史记录数据
      */
     InsOrderSetUserHis getOneBySubOrderId(@Param("subOrderId") String subOrderId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:16
+     *  @Description: 通过子订单id查询转发记录
+     */
+    List<InsOrderSetUserHisVo> findForwardingListBySubOrderId(@Param("subOrderId") String subOrderId);
 }

src/main/java/com/ydtech/modules/esm/model/vo/InsOrderSetUserHisVo.java

@@ -18,37 +18,42 @@ public class InsOrderSetUserHisVo {
     /***
      * 主键自增
      */
-    @ApiModelProperty("主键ID")
-    private Long id;
+    //@ApiModelProperty("主键ID")
+    //private Long id;
     /***
      * 订单号
      */
-    @ApiModelProperty(value = "订单号")
-    private  String orderno;
+    //@ApiModelProperty(value = "订单号")
+   // private  String orderno;
     /***
      * 报价单号
      */
-    @ApiModelProperty(value = "报价单号")
-    private String quoteno;
+    //@ApiModelProperty(value = "报价单号")
+   // private String quoteno;
+    /***
+     * 子订单id
+     */
+    @ApiModelProperty(value = "订单号")
+    private String subOrderId;
     /***
      * 原操作人
      */
-    @ApiModelProperty(value = "原操作人")
+    @ApiModelProperty(value = "转发人")
     private String oldOperatorId;
     /***
      * 现操作人
      */
-    @ApiModelProperty(value = "现操作人")
+    @ApiModelProperty(value = "接受人")
     private String newOperatorId;
     /***
      * 操作时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @ApiModelProperty(value = "操作时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "转发时间")
     private String createTime;
     /***
-     * 创建人
+     * 备注
      */
-    @ApiModelProperty(value = "创建人")
-    private String createId;
+    @ApiModelProperty(value = "转发信息")
+    private String remark;
 }

src/main/java/com/ydtech/modules/esm/service/InsOrderSetUserHisService.java

@@ -2,6 +2,9 @@ package com.ydtech.modules.esm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
+
+import java.util.List;
 
 public interface InsOrderSetUserHisService extends IService<InsOrderSetUserHis> {
     /**
@@ -18,4 +21,11 @@ public interface InsOrderSetUserHisService extends IService<InsOrderSetUserHis>
      *  @Description: 通过子订单id和状态查询最新一条转发的数据
      */
     InsOrderSetUserHis getOneBySubOrderId(String subOrderId);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:15
+     *  @Description:  通过子订单id查询转发记录信息
+     */
+    List<InsOrderSetUserHisVo> findForwardingListBySubOrderId(String subOrderId);
 }

src/main/java/com/ydtech/modules/esm/service/impl/InsOrderSetUserHisServiceImpl.java

@@ -3,10 +3,13 @@ package com.ydtech.modules.esm.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ydtech.modules.esm.dao.InsOrderSetUserHisMapper;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
 import com.ydtech.modules.esm.service.InsOrderSetUserHisService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -44,4 +47,9 @@ public class InsOrderSetUserHisServiceImpl extends ServiceImpl<InsOrderSetUserHi
         return insOrderSetUserHisMapper.getOneBySubOrderId(subOrderId);
     }
 
+    @Override
+    public List<InsOrderSetUserHisVo> findForwardingListBySubOrderId(String subOrderId) {
+        return insOrderSetUserHisMapper.findForwardingListBySubOrderId(subOrderId);
+    }
+
 }

src/main/java/com/ydtech/modules/fnc/controller/InsPlyIncomeController.java

@@ -15,6 +15,7 @@ import com.ydtech.modules.order.entity.vo.OrderQueryVo;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -82,9 +83,13 @@ public class InsPlyIncomeController extends BaseController {
     }
     @PostMapping("/totalAmount")
     @ApiModelProperty(value = "平台手续费合计金额")
-    public HttpResult<InsPlyIncome>totalAmount(@RequestBody @Valid InsPlyIncomeVo insPlyIncomeVo){
-        InsPlyIncome  result = insPlyIncomeService.totalAmount(insPlyIncomeVo);
-        return  HttpResult.ok(result);
+    public HttpResult<HashMap<String,Object>>totalAmount(@RequestBody @Valid InsPlyIncomeVo insPlyIncomeVo){
+        if(!CollectionUtils.isEmpty(insPlyIncomeVo.getSelectIds())){
+            HashMap<String,Object>  result = insPlyIncomeService.totalAmount(insPlyIncomeVo.getSelectIds());
+            return  HttpResult.ok(result);
+        }else {
+            return HttpResult.ok();
+        }
     }
     @PostMapping("/totalPinAmount")
     @ApiModelProperty(value = "平台结算未结算接口")

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

@@ -85,7 +85,7 @@ public interface InsPlyIncomeMapper extends BaseMapper<InsPlyIncome> {
 
     List<InsPlyIncome> NonSettlementQuery(HashMap<String, Object> params);
 
-    InsPlyIncome totalAmount(HashMap<String, Object> params);
+    HashMap<String,Object> totalAmount(HashMap<String,Object> params);
 
     List<InsPlyIncome> totalPinAmount(HashMap<String, Object> params);
 

src/main/java/com/ydtech/modules/fnc/entity/InsPlyIncome.java

@@ -296,6 +296,11 @@ public class InsPlyIncome implements Serializable {
     private String partnerCompaniesName;
 
 
+    @ApiModelProperty("被保人名称")
+    @TableField("insured_name")
+    private String insuredName;
+
+
     @ApiModelProperty("总单数")
     @TableField(exist = false)
     private String totalorders;

src/main/java/com/ydtech/modules/fnc/service/InsPlyIncomeService.java

@@ -55,7 +55,7 @@ public interface InsPlyIncomeService extends IService<InsPlyIncome> {
 
     HttpResult<InsPlyIncome> insertByEntity(InsPlyIncomeVo insPlyIncomeVo);
 
-    InsPlyIncome totalAmount(InsPlyIncomeVo insPlyIncomeVo);
+    HashMap<String,Object> totalAmount(List<String> selectIds);
 
     HttpResult<Object> batchPinBalance(InsPlyIncomeVo insPlyIncomeVo);
 

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

@@ -213,6 +213,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setIsNotDocumentary("0");
         insPlyIncome.setAllFeeValue(insFeeOrderNew.getNoSuperviseCostsPremiums());
         insPlyIncome.setUserId(insFeeOrderNew.getUserId());
+        insPlyIncome.setInsuredName(order.getInsuredname());
         insPlyIncome.setNoPremium(insFeeOrderNew.getNoPremium()); //非车保费
         insPlyIncome.setNoNoTaxPremium(insFeeOrderNew.getNoNoTaxPremium());  //非车不含税保费
         this.saveByCompanyId(insFeeOrderNew ,insAreaCompany.getCompanyId(),insPlyIncome);
@@ -260,6 +261,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setSyOtherCostsPremium(insFeeOrderNew.getSyOtherCostsPremiums());
         insPlyIncome.setJqOtherCostsPremium(insFeeOrderNew.getJqOtherCostsPremiums());
         insPlyIncome.setUserId(insFeeOrderNew.getUserId());
+        insPlyIncome.setInsuredName(order.getInsuredname());
         this.saveByCompanyId(insFeeOrderNew ,insAreaCompany.getCompanyId(),insPlyIncome);
 
         baseMapper.insert(insPlyIncome);
@@ -284,6 +286,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         this.saveRiskCode(order.getProductid(),insPlyIncome);
         insPlyIncome.setTaxPremium(allTaxPremium);
         insPlyIncome.setUserId(insFeeOrderNew.getUserId());
+        insPlyIncome.setInsuredName(order.getInsuredname());
         this.saveByCompanyId(insFeeOrderNew ,insAreaCompany.getCompanyId(),insPlyIncome);
         baseMapper.insert(insPlyIncome);
     }
@@ -347,6 +350,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         insPlyIncome.setSyOtherCostsProportion(insFeeOrderNew.getSyOtherCostsProportion());  //商业跟单费比例
         insPlyIncome.setNoOtherCostsProportion(insFeeOrderNew.getNoOtherCostsProportion());  //非车跟单费比例
         insPlyIncome.setUserId(insFeeOrderNew.getUserId());
+        insPlyIncome.setInsuredName(order.getInsuredname());
         this.saveByCompanyId(insFeeOrderNew ,insAreaCompany.getCompanyId(),insPlyIncome);
         baseMapper.insert(insPlyIncome);
     }
@@ -426,36 +430,30 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         }
     }
     @Override
-    public InsPlyIncome totalAmount(InsPlyIncomeVo insPlyIncomeVo) {
+    public HashMap<String,Object> totalAmount(List<String> selectIds) {
         HashMap<String, Object> params = new HashMap<>();
-        params = this.saveParams(insPlyIncomeVo, params);
-        InsPlyIncome totalledAmount =baseMapper.totalAmount(params);  //总金额
-        params.put("handlingFeesStatus","0");
-        InsPlyIncome noTotalAmount =baseMapper.totalAmount(params);
-        if(ObjectUtils.isNotEmpty(totalledAmount) && ObjectUtils.isNotEmpty(noTotalAmount)){
-            totalledAmount.setReadyTotalFeevalue(noTotalAmount.getTotalFeevalue());
-            totalledAmount.setReadyCommissionFeevalue(noTotalAmount.getCommissionFeevalue());
-            totalledAmount.setReadyOtherFeevalue(noTotalAmount.getOtherFeevalue());
-            return totalledAmount;
-        }
-
-        return  new InsPlyIncome();
+        params.put("selectIds",selectIds);
+        HashMap<String,Object>  resultMap  =baseMapper.totalAmount(params);
+        return  resultMap;
     }
 
     @Override
     @Transactional
     public HttpResult<Object> batchPinBalance(InsPlyIncomeVo insPlyIncomeVo) {
 
-            HashMap<String, Object> params = new HashMap<>();
-            List<InsPlyIncome> list= this.baseMapper.queryNew(params);
-            for (InsPlyIncome item : list) {
-                item.setHandlingFeesStatus("1");
-                item.setSettlementTime(LocalDate.now());
-                baseMapper.updateById(item);
+        if(!CollectionUtils.isEmpty(insPlyIncomeVo.getSelectIds())){
+            List<String> selectIds = insPlyIncomeVo.getSelectIds();
+            for(String  id: selectIds){
+                InsPlyIncome insPlyIncome = new InsPlyIncome();
+                insPlyIncome.setHandlingFeesStatus("1");
+                insPlyIncome.setSettlementTime(LocalDate.now());
+                insPlyIncome.setId(id);
+                baseMapper.updateById(insPlyIncome);
             }
+        }
             SettlementDocumentaryLogEntity settlementDocumentaryLogEntity = new SettlementDocumentaryLogEntity();
             settlementDocumentaryLogEntity.setIds(insPlyIncomeVo.getIds());
-            settlementDocumentaryLogEntity.setCompanyId(insPlyIncomeVo.getCompanyId());
+//          settlementDocumentaryLogEntity.setCompanyId(insPlyIncomeVo.getCompanyId());
             settlementDocumentaryLogEntity.setAmount(insPlyIncomeVo.getOtherFeevalue());  //跟单费金额
             settlementDocumentaryLogEntity.setHandingAmount(insPlyIncomeVo.getCommissionFeevalue());  //手续费金额
             settlementDocumentaryLogEntity.setCreateTime(new Date());
@@ -523,7 +521,7 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
             params.put("handlingFeesStatus",insPlyIncomeVo.getHandlingFeesStatus());
         }
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getPartnerCompaniesId())){
-            params.put("partnerCompaniesId",insPlyIncomeVo.getHandlingFeesStatus());
+            params.put("partnerCompaniesId",insPlyIncomeVo.getPartnerCompaniesId());
         }
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getYear())){
             params.put("year",insPlyIncomeVo.getYear());
@@ -543,6 +541,9 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
         if(StringUtils.isNotEmpty(insPlyIncomeVo.getCompanyName())){
             params.put("companyName",insPlyIncomeVo.getCompanyName());
         }
+        if(StringUtils.isNotEmpty(insPlyIncomeVo.getInsuredName())){
+            params.put("insuredName",insPlyIncomeVo.getInsuredName());
+        }
         return params;
     }
 
@@ -1033,10 +1034,10 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     @Transactional
     public void uodateBalance(InsPlyIncomeVo insPlyIncomeVo) {
         InsPlyIncome insPlyIncome = new InsPlyIncome();
-        insPlyIncomeVo.setHandlingFeesStatus("1");
+            insPlyIncomeVo.setHandlingFeesStatus("1");
         insPlyIncomeVo.setSettlementTime(LocalDate.now());
         BeanUtils.copyProperties(insPlyIncomeVo, insPlyIncome);
-        baseMapper.uopdateByOrderno(insPlyIncome);
+        baseMapper.updateById(insPlyIncome);
 
 //        生成记录
         SettlementDocumentaryLogEntity settlementDocumentaryLogEntity = new SettlementDocumentaryLogEntity();
@@ -1328,7 +1329,6 @@ public class InsPlyIncomeServiceImpl extends ServiceImpl<InsPlyIncomeMapper, Ins
     public InsPlyIncome bxTotalAmount(InsPlyIncomeVo insPlyIncomeVo) {
         HashMap<String, Object> params = new HashMap<>();
         params = this.saveParams(insPlyIncomeVo, params);
-        params.remove("handlingFeesStatus");
         InsPlyIncome totalledAmount =baseMapper.bxTotalAmount(params);  //总金额
         return totalledAmount;
     }

src/main/java/com/ydtech/modules/fnc/vo/InsPlyIncomeVo.java

@@ -18,6 +18,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -253,4 +254,11 @@ public class InsPlyIncomeVo implements Serializable {
     @ApiModelProperty("非车跟单比例")
     private BigDecimal noOtherCostsProportion;
 
+
+    @ApiModelProperty("被保人名称")
+    private String insuredName;
+
+    @ApiModelProperty("选择ids")
+    private List<String> selectIds;
+
 }

src/main/java/com/ydtech/modules/order/aop/aspect/AuditVerificationAspect.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.order.aop.aspect;
 
 
 import com.alibaba.fastjson.JSONObject;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.service.SysUserRoleService;
 import com.ydtech.modules.fee.service.FeeRuleSchemeNewService;
 import com.ydtech.modules.order.components.InsOrdersComponents;
@@ -14,6 +15,8 @@ import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.service.PtlAgreementDeptService;
 import com.ydtech.modules.protocol.service.impl.TaxSourceServiceImpl;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
@@ -35,6 +38,8 @@ public class AuditVerificationAspect {
 
     private final InsAreaCompanyAccidentalDrivingService insAreaCompanyAccidentalDrivingService;
 
+    private final InsFeeOrderNewService insFeeOrderNewService;
+
     @Before("@annotation(com.ydtech.modules.order.aop.AuditVerification)")
     public void doBefore(JoinPoint point) {
         Object[] args = point.getArgs();
@@ -51,7 +56,11 @@ public class AuditVerificationAspect {
             InsAreaCompanyAccidentalDriving insAreaCompanyAccidentalDriving = insAreaCompanyAccidentalDrivingService.getByCompanyId(insAreaCompany.getId());
             insAreaCompany.setAccidentalDriving(insAreaCompanyAccidentalDriving);
             InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
-
+            //查找费用 找不到则抛出异常
+            InsFeeOrderNew insFeeOrderNewByCompanyId = insFeeOrderNewService.getInsFeeOrderNewByCompanyId(companyId);
+            if(insFeeOrderNewByCompanyId == null){
+                throw new SystemException("费用信息不匹配");
+            }
             //再进行费用因子判断
             try {
                 //先进行承保规则判断

src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -6,6 +6,7 @@ import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.constants.enums.dict.agreement.ProductsType;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
 import com.ydtech.modules.admin.service.SysUserRoleService;

src/main/java/com/ydtech/modules/order/controller/OrderTaskPoolsController.java

@@ -12,10 +12,7 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.OrderTaskPoolsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -85,4 +82,10 @@ public class OrderTaskPoolsController {
     public HttpResult recover(@RequestBody TaskForwardingVo taskForwardingVo) {
         return orderTaskPoolsService.recover(taskForwardingVo,getUser());
     }
+
+    @GetMapping(value = "/findForwardingListBySubOrderId")
+    @ApiOperation(value = "通过子订单Id查询任务转发列表")
+    public HttpResult findForwardingListBySubOrderId(@RequestParam  String  subOrderId) {
+        return orderTaskPoolsService.findForwardingListBySubOrderId(subOrderId);
+    }
 }

src/main/java/com/ydtech/modules/order/service/OrderTaskPoolsService.java

@@ -46,4 +46,11 @@ public interface OrderTaskPoolsService {
      *  @Description: 子订单的转发
      */
     HttpResult forwardingSubOrders(TaskForwardingVo taskForwardingVo,SysUser sysUser);
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:06
+     *  @Description:  通过子订单id查询任务转发列表
+     */
+    HttpResult findForwardingListBySubOrderId(String subOrderId);
 }

src/main/java/com/ydtech/modules/order/service/impl/OrderTaskPoolsServiceImpl.java

@@ -10,6 +10,7 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.po.InsOrderSetUserHis;
+import com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo;
 import com.ydtech.modules.esm.service.InsOrderSetUserHisService;
 import com.ydtech.modules.ins.model.InsTaskHistory;
 import com.ydtech.modules.ins.service.InsTaskHistoryService;
@@ -187,6 +188,8 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         insAreaCompanyService.updateById(insAreaCompany);
         return HttpResult.ok("转发成功");
     }
+
+
     /**
      *  @version
      *  @author: hxl
@@ -228,4 +231,20 @@ public class OrderTaskPoolsServiceImpl extends BaseController implements OrderTa
         insAreaCompanyService.updateById(insAreaCompany);
         return HttpResult.ok("收回成功");
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2024/5/11 9:14
+     *  @Description:  通过子订单id查询转发记录
+     */
+    @Override
+    public HttpResult findForwardingListBySubOrderId(String subOrderId) {
+        if(StringUtils.isEmpty(subOrderId) ){
+            throw  new SystemException("参数错误，子订单号subOrderId不能为空！！");
+        }
+        List<InsOrderSetUserHisVo> list= insOrderSetUserHisService.findForwardingListBySubOrderId(subOrderId);
+        return HttpResult.ok(list);
+    }
+
 }

src/main/resources/mapper/modules/esm/InsOrderSetUserHisMapper.xml

@@ -4,7 +4,27 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ydtech.modules.esm.dao.InsOrderSetUserHisMapper">
 
+    <select id="getOneBySubOrderId"  resultType="com.ydtech.modules.esm.model.po.InsOrderSetUserHis">
+        SELECT
+            *
+        FROM
+            ins_order_set_user_his
+        WHERE
+            suborder_id = #{subOrderId}
+        ORDER BY
+            create_time DESC
+            LIMIT 1;
+    </select>
 
 
-
+    <select id="findForwardingListBySubOrderId"  resultType="com.ydtech.modules.esm.model.vo.InsOrderSetUserHisVo">
+        SELECT
+            *
+        FROM
+            ins_order_set_user_his
+        WHERE
+            suborder_id = #{subOrderId}
+        ORDER BY
+            create_time DESC
+    </select>
 </mapper>

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

@@ -67,6 +67,7 @@
         <result column="partner_companies_id" property="partnerCompaniesId"/>
         <result column="partner_companies_name" property="partnerCompaniesName"/>
         <result column="receivable_amount" property="receivableAmount"/>
+        <result column="insured_name" property="insuredName"/>
     </resultMap>
     <sql id="income_com">
                 a.id      as  "id",
@@ -130,6 +131,7 @@
                 a.company_name  as  "companyName",
                 a.receivable_amount  as  "receivableAmount",
                 a.invoic_time  as  "invoicTime",
+                a.insured_name  as  "insuredName",
                 a.user_id  as  "userId",
                 a.create_time  as  "createTime"
     </sql>
@@ -181,7 +183,6 @@
                 </if>
                 <if test="licenseno != null and licenseno != ''">
                     and a.licenseno  =#{licenseno}
-
                 </if>
 
                 <if test="policyno != null and policyno != ''  and policyno.length > 0">
@@ -236,6 +237,9 @@
                 <if test="day !=null  and  day !=''">
                     AND day(a.signdate) =#{day}
                 </if>
+                <if test="insuredName !=null  and  insuredName !=''">
+                    a.insured_name =#{insuredName}
+                </if>
             </where>
     </select>
 
@@ -388,12 +392,12 @@
         </where>
     </select>
 
-    <select id="totalAmount" resultType="com.ydtech.modules.fnc.entity.InsPlyIncome">
+    <select id="totalAmount" resultType="java.util.HashMap">
             select
-                sum(a.commission_feevalue) as "commissionFeevalue",
-                sum(a.other_feevalue)  as "otherFeevalue",
-                SUM(a.commission_feevalue + a.other_feevalue) as "totalFeevalue"
-            from  ins_ply_income a
+                COALESCE( sum(a.commission_feevalue),0) as "commissionFeevalue",
+                COALESCE(sum(a.other_feevalue),0)   as "otherFeevalue",
+                COALESCE(SUM(COALESCE(a.commission_feevalue, 0) + COALESCE(a.other_feevalue, 0)), 0) AS "totalFeevalue"
+        from  ins_ply_income a
             LEFT JOIN   ptl_agreement  pa  on pa.id= a.agreement_id
             <where>
                 1=1
@@ -421,6 +425,13 @@
                     and a.documentary_fees_status =#{documentaryFeesStatus}
                 </if>
 
+                <if test="selectIds != null and selectIds != '' and selectIds.size() > 0">
+                    and a.id in
+                    <foreach collection="selectIds" item="item" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+
                 <if test="isNotCar !=null  and  isNotCar  !=''">
                     and a.is_not_car =#{isNotCar}
                 </if>

src/main/resources/mapper/modules/ins/InsOrderSetUserHisMapper.xml

@@ -1,17 +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.esm.dao.InsOrderSetUserHisMapper">
-
-
-   <select id="getOneBySubOrderId"  resultType="com.ydtech.modules.esm.model.po.InsOrderSetUserHis">
-       SELECT
-           *
-       FROM
-           ins_order_set_user_his
-       WHERE
-          suborder_id = #{subOrderId}
-       ORDER BY
-           create_time DESC
-           LIMIT 1;
-   </select>
-</mapper>

src/main/resources/mapper/modules/order/InsAreaCompanyMapper.xml

@@ -134,7 +134,10 @@
         SELECT
         io.*,
         sd.management_source,
-        su2.name AS auditUser,
+        CASE ifa.audituser
+        WHEN '自动审核' THEN ifa.audituser
+        ELSE su2.name  END
+        AS auditUser,
         ifa.audittime as auditTime,
         ifa.auditstatus as auditStatus,
         eic.namesimple as partnerCompaniesName,