任务池添加合作公司和支付时间的筛选，导出数据添加导出合作公司

src/main/java/com/ydtech/modules/esm/controller/EsmInsCompanyController.java

@@ -308,4 +308,17 @@ public class EsmInsCompanyController extends BaseController {
         List<EsmInsCompanyResVo> list = esmInsCompanyService.liveCompanyList();
         return HttpResult.ok(list);
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/1/18 15:26
+     *  @Description:  查询子订单的合作公司列表
+     */
+    @ApiOperation(value = "查询子订单中的合作公司列表")
+    @GetMapping(value = "/findOrderPartnerCompanyList")
+    public HttpResult<List<EsmInsCompanyResVo>> findOrderPartnerCompanyList() {
+        List<EsmInsCompanyResVo> esmInsCompanyList = esmInsCompanyService.findOrderPartnerCompanyList();
+        return HttpResult.ok(esmInsCompanyList);
+    }
 }

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

@@ -46,5 +46,11 @@ public interface EsmInsCompanyMapper extends BaseMapper<EsmInsCompany> {
 
 
     List<EsmInsCompanyResVo> liveCompanyList();
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/1/18 15:29
+     *  @Description: 查询子订单的合作公司的列表
+     */
+    List<EsmInsCompanyResVo> findOrderPartnerCompanyList();
 }

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

@@ -97,6 +97,13 @@ public interface EsmInsCompanyService extends IService<EsmInsCompany> {
      * @return
      */
     public List<EsmInsCompanyResVo> liveCompanyList();
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/1/18 15:27
+     *  @Description:  查詢子订单的合作公司列表
+     */
+    List<EsmInsCompanyResVo> findOrderPartnerCompanyList();
 }
 
 

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

@@ -216,6 +216,17 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
     public List<EsmInsCompanyResVo> liveCompanyList() {
         return baseMapper.liveCompanyList();
     }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/1/18 15:28
+     *  @Description: 查询子订单的合作公司的列表页面
+     */
+    @Override
+    public List<EsmInsCompanyResVo> findOrderPartnerCompanyList() {
+        return baseMapper.findOrderPartnerCompanyList();
+    }
 }
 
 

src/main/java/com/ydtech/modules/order/entity/dto/TaskPoolDataExcelDto.java

@@ -36,7 +36,10 @@ public class TaskPoolDataExcelDto {
     @ExcelProperty("录入来源")
     private String entryStatus;
 
-    @ExcelProperty("已承保公司")
+    @ExcelProperty("保险公司")
+    private String insCompany;
+
+    @ExcelProperty("合作公司")
     private String partnerCompaniesName;
 
     @ExcelProperty("车牌号")
@@ -88,6 +91,7 @@ public class TaskPoolDataExcelDto {
         }
 
         this.partnerCompaniesName = insOrder.getPartnerCompaniesName();
+        this.insCompany = insOrder.getInsCompany();
         this.licenseNo = insOrder.getLicenseno();
         this.jqPremium = insOrder.getJqpremium();
         this.syPremium = insOrder.getSypremium();

src/main/java/com/ydtech/modules/order/entity/vo/OrderQueryVo.java

@@ -1,6 +1,5 @@
 package com.ydtech.modules.order.entity.vo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ydtech.core.page.PageRequest;
 import io.swagger.annotations.ApiModel;
@@ -194,6 +193,10 @@ public class OrderQueryVo {
     private String updateStatus;
 
 
+    @ApiModelProperty("合作公司编号")
+    private String partnerCompaniesId;
+
+
 
     public LocalDate getEndDatePlusOneDay() {
         if(ObjectUtils.isEmpty(endDate)){

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

@@ -81,23 +81,7 @@
             ins.company_id,
             ins.inscompany
     </select>
-    <select id="getExternalAgreementCompanyList" resultType="com.ydtech.modules.esm.model.vo.res.EsmInsCompanyResVo">
-        SELECT DISTINCT
-            insurance_company_id AS id,
-            insurance_company AS NAME
-        FROM
-            ptl_agreement
-        <where>
-            is_external = '1'
-            <if test="name != null and name != ''">
-                and insurance_company like  concat('%',#{name},'%')
-            </if>
 
-        </where>
-        GROUP BY
-            insurance_company_id,
-            insurance_company
-    </select>
     <select id="getExternalAgreementCompanyList" resultType="com.ydtech.modules.esm.model.vo.res.EsmInsCompanyResVo">
         SELECT DISTINCT
             insurance_company_id AS id,
@@ -115,7 +99,6 @@
             insurance_company_id,
             insurance_company
     </select>
-
     <select id="liveCompanyList" resultType="com.ydtech.modules.esm.model.vo.res.EsmInsCompanyResVo">
         SELECT
             eic.id,
@@ -130,4 +113,21 @@
         GROUP BY
             eic.id
     </select>
+    <select id="findOrderPartnerCompanyList"
+            resultType="com.ydtech.modules.esm.model.vo.res.EsmInsCompanyResVo">
+        SELECT DISTINCT
+            agree.partner_companies_id AS id,
+            company.namesimple AS NAME
+        FROM
+            ins_area_company iac
+                left join
+            ptl_agreement agree on iac.agreement_id= agree.id
+                left join
+            esm_ins_company company on agree.partner_companies_id= company.id
+        WHERE
+            IFNULL( agree.partner_companies_id, '' )!= ''
+        GROUP BY
+            agree.partner_companies_id,
+            company.namesimple
+    </select>
 </mapper>

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

@@ -1115,6 +1115,10 @@
             <if test="orderQueryVo.updateStatus != null and orderQueryVo.updateStatus != null">
                 and  iac.update_status =  #{orderQueryVo.updateStatus}
             </if>
+            <if test="orderQueryVo.partnerCompaniesId != null and orderQueryVo.partnerCompaniesId != null">
+                and  agree.partner_companies_id =  #{orderQueryVo.partnerCompaniesId}
+            </if>
+
             and (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
         </where>
         order by io.createtime desc
@@ -1134,6 +1138,10 @@
         sys_dept dept ON dept.id = io.deptid
         LEFT JOIN
         sys_user u on io.userid = u.id
+        left join
+        ptl_agreement   agree  on  iac.agreement_id= agree.id
+        left join
+        esm_ins_company   company  on  agree.partner_companies_id= company.id
         <where>
             <if test="agentUserIds != null and agentUserIds.size>0" >
                 AND (
@@ -1270,6 +1278,9 @@
             <if test="orderQueryVo.updateStatus != null and orderQueryVo.updateStatus != null">
                 and  iac.update_status =  #{orderQueryVo.updateStatus}
             </if>
+            <if test="orderQueryVo.partnerCompaniesId != null and orderQueryVo.partnerCompaniesId != null">
+                and  agree.partner_companies_id =  #{orderQueryVo.partnerCompaniesId}
+            </if>
             and (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
         </where>
         ) as s
@@ -2042,6 +2053,9 @@
             <if test="orderQueryVo.updateStatus != null and orderQueryVo.updateStatus != null">
                 and iac.update_status = #{orderQueryVo.updateStatus}
             </if>
+            <if test="orderQueryVo.partnerCompaniesId != null and orderQueryVo.partnerCompaniesId != null">
+                and  agree.partner_companies_id =  #{orderQueryVo.partnerCompaniesId}
+            </if>
             and (iac.del_flag = '1' or io.del_flag IS NULL or io.del_flag = 1)
         </where>
         order by io.createtime desc