'基础信息管理-举报信息管理和基础信息管理-火灾数据管理两个接口导出，优化界面增加刷选字段值列表数据不变的问题'

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemEnforceReportComplaintController.java

@@ -10,6 +10,7 @@ import com.usky.fire.domain.DemEnforceReportComplaint;
 import com.usky.fire.domain.DemEnforceReportLabel;
 import com.usky.fire.service.DemEnforceReportComplaintService;
 import com.usky.fire.service.DemEnforceReportLabelService;
+import com.usky.fire.service.vo.CompanyExportVO;
 import com.usky.fire.service.vo.ParameterVo;
 import com.usky.fire.service.vo.DemEnforceReportComplaintVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -63,13 +64,13 @@ public class DemEnforceReportComplaintController {
      * @param exportTitle   导出文件名
      * @throws IOException
      */
-    @PutMapping("enforceReportComplaintListExport")
-    void export(HttpServletResponse response,
+    @PostMapping("enforceReportComplaintListExport")
+    public void export(HttpServletResponse response,
                 @RequestParam(value = "serialNumber", required = false) String serialNumber,
                 @RequestParam(value = "reportPhone", required = false) String reportPhone,
                 @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
         List<DemEnforceReportComplaintVO> list = demEnforceReportComplaintService.enforceReportComplaintListExport(serialNumber, reportPhone);
-        ExcelUtil<DemEnforceReportComplaintVO> util = new ExcelUtil<>(DemEnforceReportComplaintVO.class);
+        ExcelUtil<DemEnforceReportComplaintVO> util = new ExcelUtil<DemEnforceReportComplaintVO>(DemEnforceReportComplaintVO.class);
         util.exportExcel(response, list, exportTitle, exportTitle);
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemFireAccidentDescController.java

@@ -1,17 +1,23 @@
 package com.usky.fire.controller.web;
 
 
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.DemFileLabel;
 import com.usky.fire.service.DemFireStatisticsService;
+import com.usky.fire.service.vo.DemFireStatisticsExportVO;
 import com.usky.fire.service.vo.DemFireStatisticsVo;
 import com.usky.fire.service.vo.ParameterVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * <p>
  * 火灾事故说明总表 前端控制器
@@ -32,7 +38,7 @@ public class DemFireAccidentDescController {
      *
      * @param fireNumber 火灾序号
      * @param labelId    标签ID
-     * @param typeId     分类ID
+     * @param classifyId     分类ID
      * @param pageNum    当前页
      * @param pageSize   每页条数
      * @return
@@ -40,11 +46,31 @@ public class DemFireAccidentDescController {
     @GetMapping("fireAccidentStatistic")
     public ApiResult<CommonPage<Object>> fireAccidentStatistic(@RequestParam(value = "fireNumber", required = false) String fireNumber,
                                                                @RequestParam(value = "labelId", required = false) Integer labelId,
-                                                               @RequestParam(value = "typeId", required = false, defaultValue = "0") Integer typeId,
+                                                               @RequestParam(value = "classifyId", required = false, defaultValue = "0") Integer classifyId,
                                                                @RequestParam(value = "id", required = false, defaultValue = "0") Integer id,
                                                                @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
                                                                @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(demFireStatisticsService.fireAccidentStatistic(fireNumber, labelId, typeId, id, pageNum, pageSize));
+        return ApiResult.success(demFireStatisticsService.fireAccidentStatistic(fireNumber, labelId, classifyId, id, pageNum, pageSize));
+    }
+
+    /**
+     * 火灾数据管理-列表查询-导出
+     *
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param classifyId     分类ID
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("fireAccidentStatisticExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "fireNumber", required = false) String fireNumber,
+                       @RequestParam(value = "labelId", required = false) Integer labelId,
+                       @RequestParam(value = "classifyId", required = false, defaultValue = "0") Integer classifyId,
+                       @RequestParam(value = "exportTitle") String exportTitle) throws IOException {
+        List<DemFireStatisticsExportVO> list = demFireStatisticsService.fireAccidentStatisticExport(fireNumber, labelId, classifyId);
+        ExcelUtil<DemFireStatisticsExportVO> util = new ExcelUtil<DemFireStatisticsExportVO>(DemFireStatisticsExportVO.class);
+        util.exportExcel(response,list,exportTitle,exportTitle);
     }
 
     /**

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemFireStatisticsService.java

@@ -5,11 +5,9 @@ import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.DemFileLabel;
 import com.usky.fire.domain.DemFireStatistics;
 import com.usky.fire.service.po.FireStatisticsPO;
-import com.usky.fire.service.vo.DemFireStatisticsVo;
-import com.usky.fire.service.vo.FireBubbleVO;
-import com.usky.fire.service.vo.FireLevelRatioVO;
-import com.usky.fire.service.vo.ParameterVo;
+import com.usky.fire.service.vo.*;
 
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -30,12 +28,21 @@ public interface DemFireStatisticsService extends CrudService<DemFireStatistics>
      *
      * @param fireNumber 火灾序号
      * @param labelId    标签ID
-     * @param typeId     分类ID
+     * @param classifyId     分类ID
      * @param pageNum    当前页
      * @param pageSize   每页条数
      * @return
      */
-    CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer typeId, Integer id, Integer pageNum, Integer pageSize);
+    CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer classifyId, Integer id, Integer pageNum, Integer pageSize);
+
+    /**
+     * 火灾数据管理-列表查询-导出
+     *
+     * @param fireNumber 火灾序号
+     * @param labelId    标签ID
+     * @param classifyId     分类ID
+     */
+    List<DemFireStatisticsExportVO> fireAccidentStatisticExport(String fireNumber, Integer labelId, Integer classifyId);
 
     /**
      * 火灾数据管理-添加标签

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemEnforceReportComplaintServiceImpl.java

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -158,16 +159,55 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
                 DemEnforceReportComplaint::getReportPhone, DemEnforceReportComplaint::getWorkOrderStatus, DemEnforceReportComplaint::getReportMethod,
                 DemEnforceReportComplaint::getReportAddress, DemEnforceReportComplaint::getReportContent,DemEnforceReportComplaint::getReportTime,
                 DemEnforceReportComplaint::getAcceptTime, DemEnforceReportComplaint::getWorkOrderType, DemEnforceReportComplaint::getGovernCompany,
-                DemEnforceReportComplaint::getGovernArea, DemEnforceReportComplaint::getFactFind, DemEnforceReportComplaint::getCompleteTime,
-                DemEnforceReportComplaint::getFollowUpStatus, DemEnforceReportComplaint::getReportRecord, DemEnforceReportComplaint::getReportSource,
-                DemEnforceReportComplaint::getSatisfiedType)
+                DemEnforceReportComplaint::getGovernArea, DemEnforceReportComplaint::getFactFind, DemEnforceReportComplaint::getReportRecord,
+                DemEnforceReportComplaint::getReportSource, DemEnforceReportComplaint::getSatisfiedType)
                 .eq(DemEnforceReportComplaint::getEnable, 0)
                 .like(StringUtils.isNotBlank(serialNumber), DemEnforceReportComplaint::getSerialNumber, serialNumber)
                 .like(StringUtils.isNotBlank(reportPhone), DemEnforceReportComplaint::getReportPhone, reportPhone)
                 .orderByDesc(DemEnforceReportComplaint::getId);
         List<DemEnforceReportComplaint> list1 = this.list(queryWrapper);
         if(CollectionUtils.isNotEmpty(list1)){
+            List<String> reportIdList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                reportIdList.add(list1.get(i).getReportId());
+            }
+            List<DemEnforceReportAttach> list2 = new ArrayList<>();
+            if(CollectionUtils.isNotEmpty(reportIdList)){
+                LambdaQueryWrapper<DemEnforceReportAttach> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(DemEnforceReportAttach::getId, DemEnforceReportAttach::getReportId,
+                        DemEnforceReportAttach::getCompleteTime, DemEnforceReportAttach::getFollowUpStatus)
+                        .in(DemEnforceReportAttach::getReportId, reportIdList);
+                list2 = demEnforceReportAttachService.list(queryWrapper1);
+            }
 
+            for(int i=0;i<list1.size();i++){
+                DemEnforceReportComplaintVO demEnforceReportComplaintVO = new DemEnforceReportComplaintVO();
+                demEnforceReportComplaintVO.setSerialNumber(list1.get(i).getSerialNumber());
+                demEnforceReportComplaintVO.setReportPerson(list1.get(i).getReportPerson());
+                demEnforceReportComplaintVO.setReportPhone(list1.get(i).getReportPhone());
+                demEnforceReportComplaintVO.setWorkOrderStatus(list1.get(i).getWorkOrderStatus());
+                demEnforceReportComplaintVO.setReportMethod(list1.get(i).getReportMethod());
+                demEnforceReportComplaintVO.setReportAddress(list1.get(i).getReportAddress());
+                demEnforceReportComplaintVO.setReportContent(list1.get(i).getReportContent());
+                demEnforceReportComplaintVO.setReportTime((list1.get(i).getReportTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demEnforceReportComplaintVO.setAcceptTime((list1.get(i).getAcceptTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demEnforceReportComplaintVO.setWorkOrderType(list1.get(i).getWorkOrderType());
+                demEnforceReportComplaintVO.setGovernCompany(list1.get(i).getGovernCompany());
+                demEnforceReportComplaintVO.setGovernArea(list1.get(i).getGovernArea());
+                demEnforceReportComplaintVO.setFactFind(list1.get(i).getFactFind());
+                for(int j=0;j<list2.size();j++){
+                    if(list1.get(i).getReportId().equals(list2.get(j).getReportId())){
+                        demEnforceReportComplaintVO.setCompleteTime((list2.get(i).getCompleteTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                        demEnforceReportComplaintVO.setFollowUpStatus(list2.get(i).getFollowUpStatus());
+                    }
+                }
+
+                demEnforceReportComplaintVO.setReportRecord(list1.get(i).getReportRecord());
+                demEnforceReportComplaintVO.setReportSource(list1.get(i).getReportSource());
+                demEnforceReportComplaintVO.setSatisfiedType(list1.get(i).getSatisfiedType());
+
+                list.add(demEnforceReportComplaintVO);
+            }
         }
 
         return list;

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemFireStatisticsServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -59,7 +60,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
     private DemFireLabelAttributeService demFireLabelAttributeService;
 
     @Override
-    public CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer typeId, Integer id, Integer pageNum, Integer pageSize) {
+    public CommonPage<Object> fireAccidentStatistic(String fireNumber, Integer labelId, Integer classifyId, Integer id, Integer pageNum, Integer pageSize) {
         Integer type1 = 0;
         Integer type2 = 0;
         Integer type3 = 0;
@@ -72,19 +73,19 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
             if (list1.size() > 0) {
                 switch (list1.get(0).getAttribute()) {
                     case "typeName1":
-                        type1 = typeId;
+                        type1 = classifyId;
                         break;
                     case "typeName2":
-                        type2 = typeId;
+                        type2 = classifyId;
                         break;
                     case "typeName3":
-                        type3 = typeId;
+                        type3 = classifyId;
                         break;
                     case "typeName4":
-                        type4 = typeId;
+                        type4 = classifyId;
                         break;
                     case "typeName5":
-                        type5 = typeId;
+                        type5 = classifyId;
                         break;
                 }
             }
@@ -100,7 +101,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                 .eq(type1 != null && type1 != 0, DemFireStatistics::getTypeId1, type1)
                 .eq(type2 != null && type2 != 0, DemFireStatistics::getTypeId2, type2)
                 .eq(type3 != null && type3 != 0, DemFireStatistics::getTypeId3, type3)
-                .eq(type4 != null && type4 != 0, DemFireStatistics::getTypeId5, type4)
+                .eq(type4 != null && type4 != 0, DemFireStatistics::getTypeId4, type4)
                 .eq(type5 != null && type5 != 0, DemFireStatistics::getTypeId5, type5)
                 .eq(id != null & id != 0, DemFireStatistics::getId, id)
                 .orderByDesc(DemFireStatistics::getId);
@@ -177,6 +178,93 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemFireStatisticsExportVO> fireAccidentStatisticExport(String fireNumber, Integer labelId, Integer classifyId){
+        List<DemFireStatisticsExportVO> list = new ArrayList<>();
+
+        Integer type1 = 0;
+        Integer type2 = 0;
+        Integer type3 = 0;
+        Integer type4 = 0;
+        Integer type5 = 0;
+        if (labelId != null && labelId != 0) {
+            LambdaQueryWrapper<DemFireLabelAttribute> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.eq(DemFireLabelAttribute::getLabelId, labelId);
+            List<DemFireLabelAttribute> list1 = demFireLabelAttributeService.list(queryWrapper1);
+            if (list1.size() > 0) {
+                switch (list1.get(0).getAttribute()) {
+                    case "typeName1":
+                        type1 = classifyId;
+                        break;
+                    case "typeName2":
+                        type2 = classifyId;
+                        break;
+                    case "typeName3":
+                        type3 = classifyId;
+                        break;
+                    case "typeName4":
+                        type4 = classifyId;
+                        break;
+                    case "typeName5":
+                        type5 = classifyId;
+                        break;
+                }
+            }
+        }
+        LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemFireStatistics::getBurnedArea, DemFireStatistics::getDirectPropertyLoss, DemFireStatistics::getVictimNumber,
+                DemFireStatistics::getInjuredNumber, DemFireStatistics::getDeathToll, DemFireStatistics::getFileCase, DemFireStatistics::getFireGrade,
+                DemFireStatistics::getSubordinateDetachment, DemFireStatistics::getAdministrativeDivision, DemFireStatistics::getFireNumber,
+                DemFireStatistics::getFireAddress, DemFireStatistics::getFireTime, DemFireStatistics::getId, DemFireStatistics::getTypeId1,
+                DemFireStatistics::getTypeId2, DemFireStatistics::getTypeId3, DemFireStatistics::getTypeId4, DemFireStatistics::getTypeId5)
+                .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
+                .eq(type1 != null && type1 != 0, DemFireStatistics::getTypeId1, type1)
+                .eq(type2 != null && type2 != 0, DemFireStatistics::getTypeId2, type2)
+                .eq(type3 != null && type3 != 0, DemFireStatistics::getTypeId3, type3)
+                .eq(type4 != null && type4 != 0, DemFireStatistics::getTypeId4, type4)
+                .eq(type5 != null && type5 != 0, DemFireStatistics::getTypeId5, type5)
+                .orderByDesc(DemFireStatistics::getId);
+        List<DemFireStatistics> fireStatisticsList = this.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(fireStatisticsList)){
+            List<String> fireNumberList = new ArrayList<>();
+            for (int i = 0; i < fireStatisticsList.size(); i++) {
+                fireNumberList.add(fireStatisticsList.get(i).getFireNumber());
+            }
+            List<DemFireStatisticsAttach> demFireStatisticsAttaches = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(fireNumberList)) {
+                demFireStatisticsAttaches = demFireStatisticsAttachService.fireAccidentStatistic(fireNumberList);
+            }
+
+            List<DemFileLabel> demFileLabels = demFileLabelService.demFileLabelList(null, null, null);
+            for (int i = 0; i < fireStatisticsList.size(); i++) {
+                DemFireStatisticsExportVO demFireStatisticsExportVO = new DemFireStatisticsExportVO();
+                demFireStatisticsExportVO.setFireNumber(fireStatisticsList.get(i).getFireNumber());
+                demFireStatisticsExportVO.setFireAddress(fireStatisticsList.get(i).getFireAddress());
+                demFireStatisticsExportVO.setFireTime((fireStatisticsList.get(i).getFireTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                demFireStatisticsExportVO.setFireCause(null);
+                demFireStatisticsExportVO.setFireSite(null);
+                for (int j = 0; j < demFireStatisticsAttaches.size(); j++) {
+                    if (fireStatisticsList.get(i).getFireNumber().equals(demFireStatisticsAttaches.get(j).getFireNumber())) {
+                        demFireStatisticsExportVO.setFireCause(demFireStatisticsAttaches.get(j).getFireCauseType1());
+                        demFireStatisticsExportVO.setFireSite(demFireStatisticsAttaches.get(j).getFireSiteType1());
+                    }
+                }
+                demFireStatisticsExportVO.setDirectPropertyLoss(fireStatisticsList.get(i).getDirectPropertyLoss());
+                demFireStatisticsExportVO.setBurnedArea(fireStatisticsList.get(i).getBurnedArea());
+                demFireStatisticsExportVO.setVictimNumber(fireStatisticsList.get(i).getVictimNumber());
+                demFireStatisticsExportVO.setInjuredNumber(fireStatisticsList.get(i).getInjuredNumber());
+                demFireStatisticsExportVO.setDeathToll(fireStatisticsList.get(i).getDeathToll());
+                demFireStatisticsExportVO.setFileCase(fireStatisticsList.get(i).getFileCase());
+                demFireStatisticsExportVO.setFireGrade(fireStatisticsList.get(i).getFireGrade());
+                demFireStatisticsExportVO.setSubordinateDetachment(fireStatisticsList.get(i).getSubordinateDetachment());
+                demFireStatisticsExportVO.setAdministrativeDivision(fireStatisticsList.get(i).getAdministrativeDivision());
+                list.add(demFireStatisticsExportVO);
+            }
+        }
+
+        return list;
+    }
+
     @Transactional
     @Override
     public void addLabel(DemFileLabel demFileLabel) {

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemEnforceReportComplaintVO.java

@@ -82,7 +82,7 @@ public class DemEnforceReportComplaintVO {
      * 受理时间
      */
     @Excel(name = "受理时间")
-    private Integer acceptTime;
+    private String acceptTime;
 
     /**
      * 工单类别
@@ -137,10 +137,4 @@ public class DemEnforceReportComplaintVO {
      */
     @Excel(name = "是否满意")
     private Integer satisfiedType;
-
-    /**
-     * 测试标签1-1
-     */
-    @Excel(name = "测试标签1-1")
-    private String labelName;
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/DemFireStatisticsExportVO.java

@@ -0,0 +1,117 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author zyj
+ * @since 2023-02-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+
+public class DemFireStatisticsExportVO {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 火灾序号
+     */
+    @Excel(name = "火灾序号")
+    private String fireNumber;
+
+    /**
+     * 起火地址
+     */
+    @Excel(name = "起火地址")
+    private String fireAddress;
+
+    /**
+     * 起火时间
+     */
+    @Excel(name = "起火时间")
+    private String fireTime;
+
+    /**
+     * 起火原因
+     */
+    @Excel(name = "起火原因")
+    private String fireCause;
+
+    /**
+     * 起火场所
+     */
+    @Excel(name = "起火场所")
+    private String fireSite;
+
+    /**
+     * 财产损失
+     */
+    @Excel(name = "财产损失")
+    private String directPropertyLoss;
+
+    /**
+     * 过火面积
+     */
+    @Excel(name = "过火面积")
+    private String burnedArea;
+
+    /**
+     * 受灾数
+     */
+    @Excel(name = "受灾数")
+    private String victimNumber;
+
+    /**
+     * 受伤数
+     */
+    @Excel(name = "受伤数")
+    private String injuredNumber;
+
+    /**
+     * 死亡数
+     */
+    @Excel(name = "死亡数")
+    private String deathToll;
+
+    /**
+     * 是否立案
+     */
+    @Excel(name = "是否立案")
+    private String fileCase;
+
+    /**
+     * 火灾等级
+     */
+    @Excel(name = "火灾等级")
+    private String fireGrade;
+
+    /**
+     * 所属支队
+     */
+    @Excel(name = "所属支队")
+    private String subordinateDetachment;
+
+    /**
+     * 行政区域
+     */
+    @Excel(name = "行政区域")
+    private String administrativeDivision;
+}