电站停留时间支持筛选导出

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PowerStationTimeStatisticsBatchDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
+@ApiModel("电站时间批量处理Dto")
 public class PowerStationTimeStatisticsBatchDto {
+    @ApiModelProperty("主键Id")
     private List<String> sequenceNbrList;
+    @ApiModelProperty("过滤字段")
+    private Map<String, Object> filters;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/PeasantHouseholdMapper.java

@@ -73,10 +73,11 @@ public interface PeasantHouseholdMapper extends BaseMapper<PeasantHousehold> {
 
     /**
      * 获取所有电站详情
+     * @param map
      * @return
      */
     @UserEmpower(field = {"hph.regional_companies_code"}, dealerField = {"hph.regional_companies_code"}, fieldConditions = {"in"}, relationship = "and")
-    List<PowerStationTimeStatisticsDto> getAllPowerStationTimeDetail();
+    List<PowerStationTimeStatisticsDto> getAllPowerStationTimeDetail(@Param("map")Map<String, Object> map);
 
     List<PowerStationTimeStatisticsDto> getKcTime(@Param("list") List<Long> peasantHouseholdIdList);
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/PeasantHouseholdMapper.xml

@@ -264,6 +264,20 @@ on hygf_document_station.preparation_money_id=hygf_preparation_money.sequence_nb
         LEFT JOIN hygf_commercial hc ON hc.survey_information_id = hph.survey_information_id
         LEFT JOIN hygf_work_order_power_station hwops ON hph.sequence_nbr = hwops.peasant_household_id
         LEFT JOIN hygf_power_station_engineering_info hpsei ON hwops.sequence_nbr = hpsei.work_order_power_station_id
+        <where>
+            <if test="map.ownersName!=null and map.ownersName !=''">
+                and hph.owners_name like concat ('%',#{map.ownersName},'%')
+            </if>
+            <if test="map.province!=null and map.province !=''">
+                and hph.project_address_name like concat ('%',#{map.province},'%')
+            </if>
+            <if test="map.regionalCompaniesName!=null and map.regionalCompaniesName !=''">
+                and hph.regional_companies_name like concat ('%',#{map.regionalCompaniesName},'%')
+            </if>
+            <if test="map.serviceAgent!=null and map.serviceAgent !=''">
+                and hph.developer_name like concat ('%',#{map.serviceAgent},'%')
+            </if>
+        </where>
         ORDER BY hph.rec_date DESC ,hph.sequence_nbr DESC
     </select>
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/BusinessFieldController.java

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
-import com.yeejoin.amos.boot.module.hygf.api.dto.BasicGridRecordDto;
-import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationTimeStatisticsBatchDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.StationFieldDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.HygfBusinessField;
 import com.yeejoin.amos.boot.module.hygf.biz.service.impl.BusinessFieldServiceImpl;

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/PowerStationStatisticsController.java

@@ -49,8 +49,8 @@ public class PowerStationStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/exportPowerStationExcel")
     @ApiOperation(httpMethod = "POST", value = "导出电站Excel", notes = "导出电站Excel")
-    public ResponseModel<?> exportPowerStationExcel(@RequestBody PowerStationTimeStatisticsBatchDto powerStationTimeStatisticsBatchDto, HttpServletResponse response) {
-        powerStationStatisticsService.exportPowerStationExcel(powerStationTimeStatisticsBatchDto.getSequenceNbrList(), response);
+    public ResponseModel<?> exportPowerStationExcel(@RequestBody PowerStationTimeStatisticsBatchDto statisticsBatchDto, HttpServletResponse response) {
+        powerStationStatisticsService.exportPowerStationExcel(statisticsBatchDto, response);
         return ResponseHelper.buildResponse(null);
     }
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PowerStationStatisticsServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.ExcelUtils;
+import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationTimeStatisticsBatchDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationTimeStatisticsDto;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.PeasantHouseholdMapper;
 import com.yeejoin.amos.boot.module.hygf.api.util.ListUtils;
@@ -305,8 +306,8 @@ public class PowerStationStatisticsServiceImpl {
 
     }
 
-    public void exportPowerStationExcel(List<String> sequenceNbrList, HttpServletResponse response) {
-        List<PowerStationTimeStatisticsDto> powerStationTimeStatisticsDtoList = getAllDetail(sequenceNbrList);
+    public void exportPowerStationExcel(PowerStationTimeStatisticsBatchDto statisticsBatchDto, HttpServletResponse response) {
+        List<PowerStationTimeStatisticsDto> powerStationTimeStatisticsDtoList = getAllDetail(statisticsBatchDto);
         if (CollectionUtil.isNotEmpty(powerStationTimeStatisticsDtoList)) {
             try {
                 List<PowerStationTimeStatisticsExcelVO> dataList = new ArrayList<>();
@@ -340,11 +341,12 @@ public class PowerStationStatisticsServiceImpl {
 
     /**
      * 获取全部的详情
-     * @param sequenceNbrList
+     * @param statisticsBatchDto
      * @return
      */
-    private List<PowerStationTimeStatisticsDto> getAllDetail(List<String> sequenceNbrList) {
+    private List<PowerStationTimeStatisticsDto> getAllDetail(PowerStationTimeStatisticsBatchDto statisticsBatchDto) {
         List<PowerStationTimeStatisticsDto> statisticsDtos = new ArrayList<>();
+        List<String> sequenceNbrList = statisticsBatchDto.getSequenceNbrList();
         if (CollectionUtil.isNotEmpty(sequenceNbrList)) {
             if (sequenceNbrList.size() < 1000) {
                 statisticsDtos = peasantHouseholdMapper.getPowerStationTimeDetail(sequenceNbrList);
@@ -355,7 +357,7 @@ public class PowerStationStatisticsServiceImpl {
                 }
             }
         } else {
-            statisticsDtos = peasantHouseholdMapper.getAllPowerStationTimeDetail();
+            statisticsDtos = peasantHouseholdMapper.getAllPowerStationTimeDetail(statisticsBatchDto.getFilters());
         }
         addPowerStationTime(statisticsDtos);
         return statisticsDtos;