修改合同导出

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/dao/entity/model/response/ContractManageExportDto.java

@@ -1,12 +1,15 @@
 package cn.com.ty.lift.business.contract.dao.entity.model.response;
 
 
+import lombok.Data;
+
 import java.math.BigDecimal;
 import java.time.LocalDate;
 
 /**
  * 合同管理导出数据
  */
+@Data
 public class ContractManageExportDto {
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/contract/service/ContractService.java

@@ -328,6 +328,22 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
          */
         List<ContractExportDto> contractTemList=contractsMapper.findAllErContracts(contractRequest);
 
+
+        /**
+         * 维保/大修合同管理数据
+         */
+        List<ContractManageExportDto> findAllContractsManageData=contractsMapper.findAllContractsManageData(contractRequest);
+
+        /**
+         * 急修数据
+         */
+        List<ContractManageExportDto> findAllErContractsManageData=contractsMapper.findAllErContractsManageData(contractRequest);
+
+        /**
+         * 数据合并
+         */
+        findAllContractsManageData.addAll(findAllErContractsManageData);
+
         /**
          * 数据合并
          */
@@ -358,21 +374,6 @@ public class ContractService extends ServiceImpl<ContractsMapper, Contracts> {
         headerAliasE.put("NoPayMoney", "未收金额");
         headerAliasE.put("partsRules", "配件条款");
         writer.setHeaderAlias(headerAliasE);
-
-        /**
-         * 维保/大修合同管理数据
-         */
-        List<ContractManageExportDto> findAllContractsManageData=contractsMapper.findAllContractsManageData(contractRequest);
-
-        /**
-         * 急修数据
-         */
-        List<ContractManageExportDto> findAllErContractsManageData=contractsMapper.findAllErContractsManageData(contractRequest);
-
-        /**
-         * 数据合并
-         */
-        findAllContractsManageData.addAll(findAllErContractsManageData);
         writer.write(findAllContractsManageData,true);
         writer.autoSizeColumnAll();
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");

lift-business-service/src/main/resources/mapper/contract/ContractsMapper.xml

@@ -263,7 +263,6 @@
             parameterType="cn.com.ty.lift.business.contract.dao.entity.model.request.ContractRequest"
             resultType="cn.com.ty.lift.business.contract.dao.entity.model.response.ContractManageExportDto">
         select
-
         <!--项目名称-->
         p.project_name as projectName,
 
@@ -341,7 +340,8 @@
     <select id="findAllErContractsManageData"
             parameterType="cn.com.ty.lift.business.contract.dao.entity.model.request.ContractRequest"
             resultType="cn.com.ty.lift.business.contract.dao.entity.model.response.ContractManageExportDto">
-        <!--项目名称-->
+       select
+       <!--项目名称-->
         p.project_name as projectName,
         <!--客户名称-->
         (select name from property_company where id=p.pp_company_id) as memberName,