协议调度查询的bug修复

src/main/java/com/ydtech/modules/protocol/controller/TaxSourceController.java

@@ -7,12 +7,15 @@ import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.esm.model.EsmInsCompany;
+import com.ydtech.modules.protocol.entity.vo.CompanyPageVo;
+import com.ydtech.modules.protocol.entity.vo.PtlAgreementPageVo;
 import com.ydtech.modules.protocol.entity.vo.TaxSourceVo;
 import com.ydtech.modules.protocol.service.ITaxSourceService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocol.service.PtlAreaLicenseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,14 +42,10 @@ public class TaxSourceController extends BaseController {
 
     @GetMapping("/insureCompany")
     @ApiOperation("获取保险公司")
-    public HttpResult insureCompany(Integer pageNum,Integer pageSize) {
-        PageRequest pageRequest = new PageRequest();
-        pageRequest.setPageNum(pageNum);
-        pageRequest.setPageSize(pageSize);
-        Page page = PageRequest.buildPageRequest(pageRequest);
-        IPage<EsmInsCompany> insureCompany = taxSourceService.getInsureCompany(page);
-        PageResult pageResult = PageResult.buildPageResult(insureCompany);
-        return HttpResult.ok(pageResult);
+    public HttpResult insureCompany(CompanyPageVo companyPageVo) {
+        Page page = buildPageRequest(companyPageVo.getPageDto());
+        Page<EsmInsCompany> insureCompany = taxSourceService.getInsureCompany(page, companyPageVo);
+        return HttpResult.ok(insureCompany);
     }
 
     @GetMapping("/agreement")

src/main/java/com/ydtech/modules/protocol/dao/TaxSourceMapper.java

@@ -7,14 +7,16 @@ import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.protocol.entity.dto.TaxSourceDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
+import com.ydtech.modules.protocol.entity.vo.CompanyPageVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 @Mapper
 public interface TaxSourceMapper extends BaseMapper<TaxSourceDto> {
 
-    IPage<EsmInsCompany> getInsureCompany(Page page);
+    Page<EsmInsCompany> getInsureCompany(Page page, @Param("params") CompanyPageVo companyPageVo);
 
     List<PtlAgreement> getAgreementByCompanyId(String companyId);
 

src/main/java/com/ydtech/modules/protocol/entity/vo/CompanyPageVo.java

@@ -0,0 +1,16 @@
+package com.ydtech.modules.protocol.entity.vo;
+
+import com.ydtech.core.page.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CompanyPageVo extends PageRequest {
+
+    @ApiModelProperty(value = "保险公司id")
+    private String id;
+}

src/main/java/com/ydtech/modules/protocol/service/ITaxSourceService.java

@@ -7,13 +7,14 @@ import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
 import com.ydtech.modules.protocol.entity.dto.TaxSourceDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
+import com.ydtech.modules.protocol.entity.vo.CompanyPageVo;
 import com.ydtech.modules.protocol.entity.vo.TaxSourceVo;
 
 import java.util.List;
 
 public interface ITaxSourceService extends IService<TaxSourceDto> {
 
-    IPage<EsmInsCompany> getInsureCompany(Page page);
+    Page<EsmInsCompany> getInsureCompany(Page page, CompanyPageVo companyPageVo);
 
     List<PtlAgreement> getAgreementByCompanyId(String companyId,String deptId,String userId);
 

src/main/java/com/ydtech/modules/protocol/service/impl/TaxSourceServiceImpl.java

@@ -23,11 +23,13 @@ import com.ydtech.modules.protocol.entity.dto.TaxSourceDto;
 import com.ydtech.modules.protocol.entity.dto.TaxSourceExcludeDto;
 import com.ydtech.modules.protocol.entity.po.PtlAgreement;
 import com.ydtech.modules.protocol.entity.po.PtlTaxSourceNew;
+import com.ydtech.modules.protocol.entity.vo.CompanyPageVo;
 import com.ydtech.modules.protocol.entity.vo.TaxSourceVo;
 import com.ydtech.modules.protocol.service.ITaxSourceExcludeService;
 import com.ydtech.modules.protocol.service.ITaxSourceService;
 import com.ydtech.modules.protocol.service.PtlAgreementService;
 import com.ydtech.modules.protocol.utils.AssertionUtils;
+import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
 import com.ydtech.utils.idgen.IdGenerate;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,8 +69,9 @@ public class TaxSourceServiceImpl extends ServiceImpl<TaxSourceMapper, TaxSource
 
 
     @Override
-    public IPage<EsmInsCompany> getInsureCompany(Page page) {
-        return baseMapper.getInsureCompany(page);
+    public Page<EsmInsCompany> getInsureCompany(Page page, CompanyPageVo companyPageVo) {
+        Page<EsmInsCompany> companyPage = baseMapper.getInsureCompany(page,companyPageVo);
+        return companyPage;
     }
 
     @Override

src/main/resources/mapper/modules/protocol/TaxSourceMapper.xml

@@ -27,18 +27,6 @@
         <result property="insuranceCompany" column="insurance_company" jdbcType="VARCHAR"/>
     </resultMap>
 
-    <select id="getInsureCompany" resultMap="CompanyResultMap">
-        SELECT
-            eic.*
-        FROM
-            esm_ins_company eic,
-            ptl_agreement pa
-        WHERE
-            eic.id = pa.insurance_company_id
-        GROUP BY
-            eic.id
-    </select>
-
     <select id="getAgreementByCompanyId" resultMap="AgreementResultMap">
         SELECT
             *
@@ -47,5 +35,20 @@
         WHERE
             insurance_company_id = #{companyId}
     </select>
+    <select id="getInsureCompany" resultType="com.ydtech.modules.esm.model.EsmInsCompany">
+
+        SELECT
+            eic.*
+        FROM
+        esm_ins_company eic
+        LEFT JOIN ptl_agreement pa ON eic.id = pa.insurance_company_id
+        <where>
+            <if test="params.id != null and params.id != ''">
+                eic.id = #{params.id}
+            </if>
+        </where>
+        GROUP BY
+            eic.id
+    </select>
 
 </mapper>