费用审核列表更改sql

src/main/java/com/ydtech/modules/protocols/dao/PtlAgreementProductCostsNewMapper.java

@@ -1,8 +1,12 @@
 package com.ydtech.modules.protocols.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementUndwrtRulesAttr;
+import com.ydtech.modules.protocols.entity.vo.AgreementProductCosts;
+import com.ydtech.modules.protocols.entity.vo.AgreementProductQueryVo;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -11,7 +15,7 @@ import com.ydtech.modules.protocols.entity.po.PtlAgreementUndwrtRulesAttr;
  * @createDate 2024-2-22 15:44:29
  */
 public interface PtlAgreementProductCostsNewMapper extends BaseMapper<PtlAgreementProductCostsNew> {
-
+    Page<PtlAgreementProductCostsNew> getCostsPage(Page page,@Param("params") AgreementProductQueryVo agreementProductQueryVo);
 }
 
 

src/main/java/com/ydtech/modules/protocols/entity/po/PtlAgreementProductCostsNew.java

@@ -26,6 +26,14 @@ public class PtlAgreementProductCostsNew {
     @TableId(value = "id",type= IdType.AUTO)
     private String id;
 
+    @ApiModelProperty(value = "保险公司名称")
+    @TableField(exist = false)
+    private String insuranceCompany;
+
+    @ApiModelProperty(value = "协议名称")
+    @TableField(exist = false)
+    private String agreementName;
+
     @ApiModelProperty(value = "协议id")
     @TableField(value = "agreement_id")
     private String agreementId;

src/main/java/com/ydtech/modules/protocols/entity/vo/AgreementProductQueryVo.java

@@ -11,6 +11,9 @@ public class AgreementProductQueryVo extends PageRequest {
     @ApiModelProperty(value = "保险公司id")
     private String companyId;
 
+    @ApiModelProperty(value = "协议ids")
+    private String agreementIds;
+
     @ApiModelProperty(value = "协议id")
     private String agreementId;
 

src/main/java/com/ydtech/modules/protocols/service/impl/PtlAgreementProductCostsNewServiceImpl.java

@@ -78,6 +78,9 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
     @Autowired
     PtlAgreementProductCostsTrajectoryService ptlAgreementProductCostsTrajectoryService;
 
+    @Autowired
+    PtlAgreementProductCostsNewService ptlAgreementProductCostsNewService;
+
     @Override
     public Page<PtlAgreementProductCostsNew> getByAgreementId(Page page, AgreementProductQueryVo agreementProductQueryVo) {
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -1206,40 +1209,19 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
     public Page<PtlAgreementProductCostsNew> getCostsAuditList(Page page, AgreementProductQueryVo agreementProductQueryVo){
         LambdaQueryWrapper<PtlAgreementProductCostsNew> ptlAgreementProductCostsNewLambdaQueryWrapper = new LambdaQueryWrapper<>();
 //        ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId, agreementProductQueryVo.getAgreementId());
+
+
         //保险公司id
         if(agreementProductQueryVo.getCompanyId() != null){
             LambdaQueryWrapper<PtlAgreement> eq = new LambdaQueryWrapper<PtlAgreement>().eq(PtlAgreement::getInsuranceCompanyId, agreementProductQueryVo.getCompanyId());
             List<PtlAgreement> list = ptlAgreementService.list(eq);
             List<String> agreementIds = list.stream().map(PtlAgreement::getId).collect(Collectors.toList());
             ptlAgreementProductCostsNewLambdaQueryWrapper.in(PtlAgreementProductCostsNew::getAgreementId, agreementIds);
+            agreementProductQueryVo.setAgreementIds(String.join(",",agreementIds));
         }
 
-        //协议id
-        if(agreementProductQueryVo.getAgreementId() != null){
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getAgreementId,agreementProductQueryVo.getAgreementId());
-        }
-        //审核条件
-        if(agreementProductQueryVo.getIsAudit() != null){
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit, Integer.parseInt(agreementProductQueryVo.getIsAudit()));
-        }else{
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getIsAudit,"0");
-        }
-
-        //产品code
-        if(agreementProductQueryVo.getProductCode() != null){
-            ptlAgreementProductCostsNewLambdaQueryWrapper.eq(PtlAgreementProductCostsNew::getProductId, agreementProductQueryVo.getProductCode());
-        }
-
-        //创建时间
-        if(agreementProductQueryVo.getCreateStartTime() != null)
-        {
-            ptlAgreementProductCostsNewLambdaQueryWrapper.between(PtlAgreementProductCostsNew::getCreateTime,agreementProductQueryVo.getCreateStartTime(),agreementProductQueryVo.getCreateEndTime());
-        }
-
-        Page<PtlAgreementProductCostsNew> pages = baseMapper.selectPage(page, ptlAgreementProductCostsNewLambdaQueryWrapper);
+        Page<PtlAgreementProductCostsNew> pages = baseMapper.getCostsPage(page, agreementProductQueryVo);
 
-//                .lt(PtlAgreementProductCostsNew::getCostsStartDate, formattedDateTime)
-//                .gt(PtlAgreementProductCostsNew::getCostsEndDate, formattedDateTime));
         //遍历费用列表
         List<String> ids = new ArrayList<>();
         pages.getRecords().forEach(x -> {

src/main/resources/mapper/modules/protocols/PtlAgreementProductCostsNewMapper.xml

@@ -0,0 +1,33 @@
+<?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.protocols.dao.PtlAgreementProductCostsNewMapper">
+
+    <select id="getCostsPage" resultType="com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew">
+        SELECT
+        pa.insurance_company,
+        pa.agreement_name,
+        papcn.*
+        FROM
+        ptl_agreement_product_costs_new papcn
+        LEFT JOIN ptl_agreement pa ON papcn.agreement_id = pa.id
+        where 1=1
+        <if test="params.agreementIds != null and params.agreementIds != ''">
+            AND pa.id in (#{params.agreementIds})
+        </if>
+        <if test="params.agreementId != null and params.agreementId != ''">
+            AND pa.id in (#{params.agreementId})
+        </if>
+        <if test="params.isAudit != null and params.isAudit != ''">
+            AND papcn.is_audit = #{params.isAudit}
+        </if>
+        <if test="params.productCode != null and params.productCode != ''">
+            AND papcn.product_id = #{params.productCode}
+        </if>
+        <if test="params.createStartTime != null and params.createStartTime != ''">
+            and papcn.create_time BETWEEN #{params.createStartTime} and #{params.createEndTime}
+        </if>
+
+    </select>
+</mapper>