'新增基础信息管理-起火场所信息/消防检查信息、电子督察单管理3个导出接口'

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

@@ -8,6 +8,7 @@ import com.usky.common.log.annotation.Log;
 import com.usky.common.log.enums.BusinessType;
 import com.usky.fire.domain.BaseCompany;
 import com.usky.fire.service.BaseCompanyService;
+import com.usky.fire.service.vo.BaseCompanyExportVO;
 import com.usky.fire.service.vo.CompanyDataVo;
 import com.usky.fire.service.vo.CompanyExportVO;
 import com.usky.fire.service.vo.DemGridMemberVO;
@@ -149,5 +150,23 @@ public class BaseCompanyController {
                                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
         return ApiResult.success(baseCompanyService.fireInspectionData(companyName, organization, id, pageNum, pageSize));
     }
+
+    /**
+     * 消防检查信息-列表查询-导出
+     *
+     * @param companyName  单位名称
+     * @param organization 组织机构代码
+     * @param exportTitle  文件名
+     * @throws IOException
+     */
+    @PostMapping("fireInspectionDataExport")
+    public void fireInspectionDataExport(HttpServletResponse response,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "organization", required = false) String organization,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+        List<BaseCompanyExportVO> list = baseCompanyService.fireInspectionDataExport(companyName, organization);
+        ExcelUtil<BaseCompanyExportVO> util = new ExcelUtil<BaseCompanyExportVO>(BaseCompanyExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
 }
 

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

@@ -1,11 +1,13 @@
 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.AlarmFire;
+import com.usky.fire.service.vo.DemInspectExportVO;
 import com.usky.fire.service.vo.InspectDetailVO;
 import com.usky.fire.service.vo.InspectHandleVO;
 import com.usky.fire.service.vo.InspectManagerVO;
@@ -15,6 +17,8 @@ import com.usky.fire.service.DemInspectListService;
 
 import org.springframework.stereotype.Controller;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Map;
 import java.util.List;
 
@@ -53,6 +57,28 @@ public class DemInspectListController {
         return ApiResult.success(demInspectListService.demInspectList(inspectCode, companyName, deviceCode, handlingStatus, pageNum, pageSize));
     }
 
+    /**
+     * 事件管理-数字平台电子督察单-列表查询-导出
+     *
+     * @param inspectCode    督查单编号
+     * @param companyName    单位名称
+     * @param deviceCode     设备编号
+     * @param handlingStatus 处置状态（1、已处置 2、待处置 3、督查超时）
+     * @param exportTitle    文件名
+     * @throws IOException
+     */
+    @PostMapping("demInspectListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "inspectCode", required = false) String inspectCode,
+                       @RequestParam(value = "companyName", required = false) String companyName,
+                       @RequestParam(value = "deviceCode", required = false) String deviceCode,
+                       @RequestParam(value = "handlingStatus", required = false) Integer handlingStatus,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException {
+        List<DemInspectExportVO> list = demInspectListService.demInspectListExport(inspectCode, companyName, deviceCode, handlingStatus);
+        ExcelUtil<DemInspectExportVO> util = new ExcelUtil<DemInspectExportVO>(DemInspectExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 事件管理-企业电子督察单-列表管理
      *

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

@@ -1,20 +1,24 @@
 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.fire.domain.DemPoliceInfo;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.fire.domain.DemPoliceRecord;
 import com.usky.fire.service.DemMicroStationService;
 import com.usky.fire.service.DemPoliceInfoService;
 import com.usky.fire.service.DemVehicleFightService;
 import com.usky.fire.service.DemWaterSourceService;
 import com.usky.fire.service.vo.AlertStatisticsVO;
+import com.usky.fire.service.vo.DemPoliceRecordExportVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -36,12 +40,64 @@ public class DemPoliceInfoController {
     @Autowired
     private DemPoliceInfoService demPoliceInfoService;
 
+    @Autowired
+    private DemPoliceInfoService demPoliceRecordService;
+
     @Autowired
     private DemWaterSourceService demWaterSourceService;
 
     @Autowired
     private DemVehicleFightService demVehicleFightService;
 
+    /**
+     * 接处警数据-列表
+     *
+     * @param caseCode 案件编号
+     * @param branch   主管支队
+     * @param id       主键ID
+     * @param pageNum  当前页面
+     * @param pageSize 每页条数
+     * @return
+     */
+    @GetMapping("policeRecordList")
+    public ApiResult<CommonPage<Object>> policeRecordList(@RequestParam(value = "caseCode", required = false) String caseCode,
+                                                          @RequestParam(value = "branch", required = false) String branch,
+                                                          @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(demPoliceInfoService.policeRecordList(caseCode, branch, id, pageNum, pageSize));
+    }
+
+    /**
+     * 接处警数据-列表-导出
+     *
+     * @param caseCode 案件编号
+     * @param branch   主管支队
+     * @param exportTitle   文件名
+     * @throws IOException
+     */
+    @PostMapping("policeRecordListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "caseCode", required = false) String caseCode,
+                       @RequestParam(value = "branch", required = false) String branch,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+        List<DemPoliceRecordExportVO> list = demPoliceInfoService.policeRecordListExport(caseCode, branch);
+        ExcelUtil<DemPoliceRecordExportVO> util = new ExcelUtil<DemPoliceRecordExportVO>(DemPoliceRecordExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
+    /**
+     * 接处警数据-修改
+     *
+     * @param demPoliceInfo
+     */
+    @Log(title = "接处警数据-修改", businessType = BusinessType.UPDATE)
+    @PutMapping("updatePoliceRecord")
+    public ApiResult<Void> updatePoliceRecord(@RequestBody DemPoliceInfo demPoliceInfo) {
+        demPoliceRecordService.updatePoliceRecord(demPoliceInfo);
+        return ApiResult.success();
+    }
+
     /**
      * 综合警情-撒点
      *

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

@@ -31,54 +31,54 @@ public class DemPoliceRecordController {
     @Autowired
     private DemPoliceRecordService demPoliceRecordService;
 
-    /**
-     * 接处警数据-列表
-     *
-     * @param caseCode 案件编号
-     * @param branch   主管支队
-     * @param id       主键ID
-     * @param pageNum  当前页面
-     * @param pageSize 每页条数
-     * @return
-     */
-    @GetMapping("policeRecordList")
-    public ApiResult<CommonPage<Object>> policeRecordList(@RequestParam(value = "caseCode", required = false) String caseCode,
-                                                          @RequestParam(value = "branch", required = false) String branch,
-                                                          @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(demPoliceRecordService.policeRecordList(caseCode, branch, id, pageNum, pageSize));
-    }
-
-    /**
-     * 接处警数据-列表-导出
-     *
-     * @param caseCode 案件编号
-     * @param branch   主管支队
-     * @param exportTitle   文件名
-     * @throws IOException
-     */
-    @PostMapping("policeRecordListExport")
-    public void export(HttpServletResponse response,
-                       @RequestParam(value = "caseCode", required = false) String caseCode,
-                       @RequestParam(value = "branch", required = false) String branch,
-                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
-        List<DemPoliceRecordExportVO> list = demPoliceRecordService.policeRecordListExport(caseCode, branch);
-        ExcelUtil<DemPoliceRecordExportVO> util = new ExcelUtil<DemPoliceRecordExportVO>(DemPoliceRecordExportVO.class);
-        util.exportExcel(response, list, exportTitle, exportTitle);
-    }
+//    /**
+//     * 接处警数据-列表
+//     *
+//     * @param caseCode 案件编号
+//     * @param branch   主管支队
+//     * @param id       主键ID
+//     * @param pageNum  当前页面
+//     * @param pageSize 每页条数
+//     * @return
+//     */
+//    @GetMapping("policeRecordList")
+//    public ApiResult<CommonPage<Object>> policeRecordList(@RequestParam(value = "caseCode", required = false) String caseCode,
+//                                                          @RequestParam(value = "branch", required = false) String branch,
+//                                                          @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(demPoliceRecordService.policeRecordList(caseCode, branch, id, pageNum, pageSize));
+//    }
+//
+//    /**
+//     * 接处警数据-列表-导出
+//     *
+//     * @param caseCode 案件编号
+//     * @param branch   主管支队
+//     * @param exportTitle   文件名
+//     * @throws IOException
+//     */
+//    @PostMapping("policeRecordListExport")
+//    public void export(HttpServletResponse response,
+//                       @RequestParam(value = "caseCode", required = false) String caseCode,
+//                       @RequestParam(value = "branch", required = false) String branch,
+//                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException{
+//        List<DemPoliceRecordExportVO> list = demPoliceRecordService.policeRecordListExport(caseCode, branch);
+//        ExcelUtil<DemPoliceRecordExportVO> util = new ExcelUtil<DemPoliceRecordExportVO>(DemPoliceRecordExportVO.class);
+//        util.exportExcel(response, list, exportTitle, exportTitle);
+//    }
 
-    /**
-     * 接处警数据-修改
-     *
-     * @param demPoliceRecord
-     */
-    @Log(title = "接处警数据-修改", businessType = BusinessType.UPDATE)
-    @PutMapping("updatePoliceRecord")
-    public ApiResult<Void> updatePoliceRecord(@RequestBody DemPoliceRecord demPoliceRecord) {
-        demPoliceRecordService.updatePoliceRecord(demPoliceRecord);
-        return ApiResult.success();
-    }
+//    /**
+//     * 接处警数据-修改
+//     *
+//     * @param demPoliceRecord
+//     */
+//    @Log(title = "接处警数据-修改", businessType = BusinessType.UPDATE)
+//    @PutMapping("updatePoliceRecord")
+//    public ApiResult<Void> updatePoliceRecord(@RequestBody DemPoliceRecord demPoliceRecord) {
+//        demPoliceRecordService.updatePoliceRecord(demPoliceRecord);
+//        return ApiResult.success();
+//    }
 
     /**
      * 接处警数据-删除

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

@@ -1,16 +1,21 @@
 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.DemFireStatistics;
 import com.usky.fire.service.DemFireStatisticsService;
+import com.usky.fire.service.vo.FirePlaceExportVO;
 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.Map;
+import java.util.List;
 
 /**
  * <p>
@@ -44,6 +49,22 @@ public class FirePlaceController {
         return ApiResult.success(demFireStatisticsService.firePlaceList(fireNumber, id, pageNum, pageSize));
     }
 
+    /**
+     * 起火场所信息-列表查询-导出
+     *
+     * @param fireNumber 火灾序号
+     * @param exportTitle 文件名
+     * @throws IOException
+     */
+    @PostMapping("firePlaceListExport")
+    public void export(HttpServletResponse response,
+                       @RequestParam(value = "fireNumber", required = false) String fireNumber,
+                       @RequestParam(value = "exportTitle") String exportTitle)throws IOException {
+        List<FirePlaceExportVO> list = demFireStatisticsService.firePlaceListExport(fireNumber);
+        ExcelUtil<FirePlaceExportVO> util = new ExcelUtil<FirePlaceExportVO>(FirePlaceExportVO.class);
+        util.exportExcel(response, list, exportTitle, exportTitle);
+    }
+
     /**
      * 起火场所信息-修改
      *

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemPoliceInfo.java

@@ -3,6 +3,8 @@ package com.usky.fire.domain;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDate;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -222,5 +224,11 @@ public class DemPoliceInfo implements Serializable {
      */
     private Integer fairIs;
 
+    /**
+     * 处警情况主键ID
+     */
+    @TableField(exist = false)
+    private Integer id1;
+
 
 }

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

@@ -3,6 +3,7 @@ package com.usky.fire.service;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.service.vo.BaseCompanyExportVO;
 import com.usky.fire.service.vo.CompanyDataVo;
 import com.usky.fire.service.vo.CompanyExportVO;
 
@@ -112,4 +113,6 @@ public interface BaseCompanyService extends CrudService<BaseCompany> {
     List<String> companyIdList(String StreetTown);
 
     CommonPage<Map<String, Object>> fireInspectionData(String companyName, String organization, Integer id, Integer pageNum, Integer pageSize);
+
+    List<BaseCompanyExportVO> fireInspectionDataExport(String companyName, String organization);
 }

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

@@ -100,6 +100,8 @@ public interface DemFireStatisticsService extends CrudService<DemFireStatistics>
 
     CommonPage<Map<String, Object>> firePlaceList(String fireNumber, Integer id, Integer pageNum, Integer pageSize);
 
+    List<FirePlaceExportVO> firePlaceListExport(String fireNumber);
+
     void updateFirePlace(DemFireStatistics demFireStatistics);
 
     List<Object> getFireCountByData(String startTime, String endTime, String address, String fireType);

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

@@ -27,6 +27,11 @@ public interface DemInspectListService extends CrudService<DemInspectList> {
      */
     CommonPage<InspectDetailVO> demInspectList(String inspectCode, String companyName, String deviceCode, Integer handlingStatus, Integer pageNum, Integer pageSize);
 
+    /**
+     * 事件管理-电子督察单-列表查询-导出
+     */
+    List<DemInspectExportVO> demInspectListExport(String inspectCode, String companyName, String deviceCode, Integer handlingStatus);
+
     /**
      * 件管理-企业电子督察单-列表管理
      */

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

@@ -2,8 +2,10 @@ package com.usky.fire.service;
 
 import com.usky.common.core.bean.CommonPage;
 import com.usky.fire.domain.DemPoliceInfo;
+import com.usky.fire.domain.DemPoliceRecord;
 import com.usky.common.mybatis.core.CrudService;
 import com.usky.fire.service.vo.AlertStatisticsVO;
+import com.usky.fire.service.vo.DemPoliceRecordExportVO;
 
 import java.util.List;
 import java.util.Map;
@@ -18,6 +20,34 @@ import java.util.Map;
  */
 public interface DemPoliceInfoService extends CrudService<DemPoliceInfo> {
 
+    /**
+     * 接处警数据-列表
+     *
+     * @param caseCode 案件编号
+     * @param branch   主管支队
+     * @param id       主键ID
+     * @param pageNum  当前页面
+     * @param pageSize 每页条数
+     * @return
+     */
+    CommonPage<Object> policeRecordList(String caseCode, String branch, Integer id, Integer pageNum, Integer pageSize);
+
+    /**
+     * 接处警数据-列表-导出
+     *
+     * @param caseCode 案件编号
+     * @param branch   主管支队
+     */
+    List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch);
+
+    /**
+     * 接处警数据-修改
+     *
+     * @param demPoliceInfo
+     */
+    void updatePoliceRecord(DemPoliceInfo demPoliceInfo);
+
+
     Map<String, List<AlertStatisticsVO>> getAlertStatisticsByMonth(String startTime, String endTime, String streetTown);
 
     List<AlertStatisticsVO> getAlertStatistics(String startTime, String endTime, String streetTown);

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

@@ -17,32 +17,32 @@ import java.util.List;
  */
 public interface DemPoliceRecordService extends CrudService<DemPoliceRecord> {
 
-    /**
-     * 接处警数据-列表
-     *
-     * @param caseCode 案件编号
-     * @param branch   主管支队
-     * @param id       主键ID
-     * @param pageNum  当前页面
-     * @param pageSize 每页条数
-     * @return
-     */
-    CommonPage<Object> policeRecordList(String caseCode, String branch, Integer id, Integer pageNum, Integer pageSize);
-
-    /**
-     * 接处警数据-列表-导出
-     *
-     * @param caseCode 案件编号
-     * @param branch   主管支队
-     */
-    List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch);
-
-    /**
-     * 接处警数据-修改
-     *
-     * @param demPoliceRecord
-     */
-    void updatePoliceRecord(DemPoliceRecord demPoliceRecord);
+//    /**
+//     * 接处警数据-列表
+//     *
+//     * @param caseCode 案件编号
+//     * @param branch   主管支队
+//     * @param id       主键ID
+//     * @param pageNum  当前页面
+//     * @param pageSize 每页条数
+//     * @return
+//     */
+//    CommonPage<Object> policeRecordList(String caseCode, String branch, Integer id, Integer pageNum, Integer pageSize);
+//
+//    /**
+//     * 接处警数据-列表-导出
+//     *
+//     * @param caseCode 案件编号
+//     * @param branch   主管支队
+//     */
+//    List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch);
+//
+//    /**
+//     * 接处警数据-修改
+//     *
+//     * @param demPoliceRecord
+//     */
+//    void updatePoliceRecord(DemPoliceRecord demPoliceRecord);
 
     /**
      * 接处警数据-删除

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

@@ -14,6 +14,7 @@ import com.usky.fire.domain.*;
 import com.usky.fire.mapper.BaseCompanyMapper;
 import com.usky.fire.service.*;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.BaseCompanyExportVO;
 import com.usky.fire.service.vo.CompanyDataVo;
 import com.usky.fire.service.vo.CompanyExportVO;
 import com.usky.fire.service.vo.LocateInfo;
@@ -97,7 +98,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(BaseCompany::getId, BaseCompany::getCompanyId, BaseCompany::getCompanyName, BaseCompany::getOrganization,
                 BaseCompany::getAddress, BaseCompany::getCompanyType, BaseCompany::getFireHazard, BaseCompany::getLinkPhone,
-                BaseCompany::getFoundTime, BaseCompany::getCompanyNature, BaseCompany::getAdministrativeDivision)
+                BaseCompany::getFoundTime, BaseCompany::getCompanyNature, BaseCompany::getAdministrativeDivision, BaseCompany::getCreateTime)
                 .eq(BaseCompany::getEnable, 0)
                 .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
                 .like(StringUtils.isNotBlank(organization), BaseCompany::getOrganization, organization)
@@ -212,7 +213,19 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 companyDataVo.setCompanyName(baseCompanyList.get(i).getCompanyName());
                 companyDataVo.setOrganization(baseCompanyList.get(i).getOrganization());
                 companyDataVo.setAddress(baseCompanyList.get(i).getAddress());
-                companyDataVo.setCompanyType(baseCompanyList.get(i).getCompanyType());
+                String companyTypeName = null;
+                if (StringUtils.isNotBlank(baseCompanyList.get(i).getCompanyType())) {
+                    if (baseCompanyList.get(i).getCompanyType().equals("1")) {
+                        companyTypeName = "重点单位";
+                    } else if (baseCompanyList.get(i).getCompanyType().equals("2")) {
+                        companyTypeName = "一般单位";
+                    } else if (baseCompanyList.get(i).getCompanyType().equals("3")) {
+                        companyTypeName = "九小场所";
+                    } else if (baseCompanyList.get(i).getCompanyType().equals("9")) {
+                        companyTypeName = "其他单位";
+                    }
+                }
+                companyDataVo.setCompanyType(companyTypeName);
                 companyDataVo.setFireHazard(baseCompanyList.get(i).getFireHazard());
                 companyDataVo.setLinkPhone(baseCompanyList.get(i).getLinkPhone());
                 companyDataVo.setFoundTime(baseCompanyList.get(i).getFoundTime());
@@ -534,20 +547,20 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                 Map<String, Object> map = new HashMap<>();
                 map.put("id", list1.get(i).getId());
                 map.put("companyName", list1.get(i).getCompanyName());
-                String companyTyepName = null;
+                String companyTypeName = null;
                 if (StringUtils.isNotBlank(list1.get(i).getCompanyType())) {
                     if (list1.get(i).getCompanyType().equals("1")) {
-                        companyTyepName = "重点单位";
+                        companyTypeName = "重点单位";
                     } else if (list1.get(i).getCompanyType().equals("2")) {
-                        companyTyepName = "一般单位";
+                        companyTypeName = "一般单位";
                     } else if (list1.get(i).getCompanyType().equals("3")) {
-                        companyTyepName = "九小场所";
+                        companyTypeName = "九小场所";
                     } else if (list1.get(i).getCompanyType().equals("9")) {
-                        companyTyepName = "其他单位";
+                        companyTypeName = "其他单位";
                     }
                 }
 
-                map.put("companyTypeName", companyTyepName);
+                map.put("companyTypeName", companyTypeName);
                 map.put("linkPhone", list1.get(i).getLinkPhone());
                 map.put("address", list1.get(i).getAddress());
                 map.put("longitude", null);
@@ -714,4 +727,83 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
         }
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
+
+    @Override
+    public List<BaseCompanyExportVO> fireInspectionDataExport(String companyName, String organization){
+        List<BaseCompanyExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<BaseCompany> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(BaseCompany::getId, BaseCompany::getCompanyId, BaseCompany::getCompanyName,
+                BaseCompany::getOrganization, BaseCompany::getAddress, BaseCompany::getCompanyType,
+                BaseCompany::getLinkPhone)
+                .eq(BaseCompany::getEnable, 0)
+                .like(StringUtils.isNotBlank(companyName), BaseCompany::getCompanyName, companyName)
+                .like(StringUtils.isNotBlank(organization), BaseCompany::getOrganization, organization)
+                .orderByDesc(BaseCompany::getId);
+        List<BaseCompany> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<String> companyIdList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                companyIdList.add(list1.get(i).getCompanyId());
+            }
+            List<BaseCompanyAttach1> list2 = new ArrayList<>();
+            List<BaseCompanyPerson> list3 = new ArrayList<>();
+            if (CollectionUtils.isNotEmpty(companyIdList)) {
+                LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.select(BaseCompanyAttach1::getId, BaseCompanyAttach1::getEmployeeNum, BaseCompanyAttach1::getBuildArea,
+                        BaseCompanyAttach1::getCompanyId)
+                        .in(BaseCompanyAttach1::getCompanyId, companyIdList);
+                list2 = baseCompanyAttach1Service.list(queryWrapper1);
+                LambdaQueryWrapper<BaseCompanyPerson> queryWrapper2 = Wrappers.lambdaQuery();
+                queryWrapper2.select(BaseCompanyPerson::getId, BaseCompanyPerson::getDelegateName, BaseCompanyPerson::getFireDutyName,
+                        BaseCompanyPerson::getFireManageName, BaseCompanyPerson::getCompanyId)
+                        .in(BaseCompanyPerson::getCompanyId, companyIdList);
+                list3 = baseCompanyPersonService.list(queryWrapper2);
+            }
+            for (int i = 0; i < list1.size(); i++) {
+                BaseCompanyExportVO baseCompanyExportVO = new BaseCompanyExportVO();
+                baseCompanyExportVO.setCompanyName(list1.get(i).getCompanyName());
+                baseCompanyExportVO.setOrganization(list1.get(i).getOrganization());
+                baseCompanyExportVO.setDelegateName(null);
+                baseCompanyExportVO.setAddress(list1.get(i).getAddress());
+                //单位类型（1：重点单位、2：一般单位、3：九小场所、9：其他单位）
+                String companyTypeName = "";
+                if (StringUtils.isNotBlank(list1.get(i).getCompanyType())) {
+                    if (list1.get(i).getCompanyType().equals("1")) {
+                        companyTypeName = "重点单位";
+                    } else if (list1.get(i).getCompanyType().equals("2")) {
+                        companyTypeName = "一般单位";
+                    } else if (list1.get(i).getCompanyType().equals("3")) {
+                        companyTypeName = "九小场所";
+                    } else if (list1.get(i).getCompanyType().equals("9")) {
+                        companyTypeName = "其他单位";
+                    }
+                }
+                baseCompanyExportVO.setCompanyType(companyTypeName);
+                baseCompanyExportVO.setLinkPhone(list1.get(i).getLinkPhone());
+                baseCompanyExportVO.setFireDutyName(null);
+                baseCompanyExportVO.setFireManageName(null);
+                baseCompanyExportVO.setEmployeeNum(null);
+                baseCompanyExportVO.setBuildArea(null);
+                for (int j = 0; j < list2.size(); j++) {
+                    if (list1.get(i).getCompanyId().equals(list2.get(j).getCompanyId())) {
+                        baseCompanyExportVO.setEmployeeNum(list2.get(j).getEmployeeNum());
+                        baseCompanyExportVO.setBuildArea(list2.get(j).getBuildArea());
+                    }
+                }
+                for (int j = 0; j < list3.size(); j++) {
+                    if (list1.get(i).getCompanyId().equals(list3.get(j).getCompanyId())) {
+                        baseCompanyExportVO.setDelegateName(list3.get(j).getDelegateName());
+                        baseCompanyExportVO.setFireDutyName(list3.get(j).getFireDutyName());
+                        baseCompanyExportVO.setFireManageName(list3.get(j).getFireManageName());
+                    }
+                }
+                list.add(baseCompanyExportVO);
+            }
+        }
+
+        return list;
+    }
 }
+
+
+

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

@@ -155,7 +155,7 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
     public List<DemEnforceReportComplaintVO> enforceReportComplaintListExport(String serialNumber, String reportPhone){
         List<DemEnforceReportComplaintVO> list = new ArrayList<>();
         LambdaQueryWrapper<DemEnforceReportComplaint> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DemEnforceReportComplaint::getSerialNumber, DemEnforceReportComplaint::getReportPerson,
+        queryWrapper.select(DemEnforceReportComplaint::getReportId, DemEnforceReportComplaint::getSerialNumber, DemEnforceReportComplaint::getReportPerson,
                 DemEnforceReportComplaint::getReportPhone, DemEnforceReportComplaint::getWorkOrderStatus, DemEnforceReportComplaint::getReportMethod,
                 DemEnforceReportComplaint::getReportAddress, DemEnforceReportComplaint::getReportContent,DemEnforceReportComplaint::getReportTime,
                 DemEnforceReportComplaint::getAcceptTime, DemEnforceReportComplaint::getWorkOrderType, DemEnforceReportComplaint::getGovernCompany,
@@ -194,11 +194,27 @@ public class DemEnforceReportComplaintServiceImpl extends AbstractCrudService<De
                 demEnforceReportComplaintVO.setWorkOrderType(list1.get(i).getWorkOrderType());
                 demEnforceReportComplaintVO.setGovernCompany(list1.get(i).getGovernCompany());
                 demEnforceReportComplaintVO.setGovernArea(list1.get(i).getGovernArea());
-                demEnforceReportComplaintVO.setFactFind(list1.get(i).getFactFind());
+                String factFindName = null;
+                if (StringUtils.isNotBlank(list1.get(i).getFactFind())) {
+                    if (list1.get(i).getFactFind().equals("1")) {
+                        factFindName = "属实";
+                    } else if (list1.get(i).getFactFind().equals("2")) {
+                        factFindName = "部分属实";
+                    } else if (list1.get(i).getFactFind().equals("3")) {
+                        factFindName = "不属实";
+                    }
+                }
+                demEnforceReportComplaintVO.setFactFind(factFindName);
                 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());
+                        String followUpStatusName = null;
+                        if (list2.get(i).getFollowUpStatus() == 0) {
+                            followUpStatusName = "未回访";
+                        } else if (list2.get(i).getFollowUpStatus() == 1) {
+                            followUpStatusName = "已回访";
+                        }
+                        demEnforceReportComplaintVO.setFollowUpStatus(followUpStatusName);
                     }
                 }
 

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

@@ -522,7 +522,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(DemFireStatistics::getId, DemFireStatistics::getFireNumber, DemFireStatistics::getBurnedArea,
                 DemFireStatistics::getAffectedHouse, DemFireStatistics::getVictimNumber, DemFireStatistics::getDirectPropertyLoss,
-                DemFireStatistics::getFireTimeText, DemFireStatistics::getFireGrade)
+                DemFireStatistics::getFireTime, DemFireStatistics::getFireGrade)
                 .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
                 .eq(id != null && id != 0, DemFireStatistics::getId, id)
                 .orderByDesc(DemFireStatistics::getId);
@@ -545,7 +545,7 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
                 map.put("affectedHouse", page.getRecords().get(i).getAffectedHouse());
                 map.put("victimNumber", page.getRecords().get(i).getVictimNumber());
                 map.put("directPropertyLoss", page.getRecords().get(i).getDirectPropertyLoss());
-                map.put("fireTimeText", page.getRecords().get(i).getFireTimeText());
+                map.put("fireTimeText", page.getRecords().get(i).getFireTime());
                 map.put("fireGrade", page.getRecords().get(i).getFireGrade());
                 map.put("id1", 0);
                 map.put("initialFuelType1", null);
@@ -565,6 +565,52 @@ public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireSta
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<FirePlaceExportVO> firePlaceListExport(String fireNumber){
+        List<FirePlaceExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemFireStatistics> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemFireStatistics::getId, DemFireStatistics::getFireNumber, DemFireStatistics::getBurnedArea,
+                DemFireStatistics::getAffectedHouse, DemFireStatistics::getVictimNumber, DemFireStatistics::getDirectPropertyLoss,
+                DemFireStatistics::getFireTime, DemFireStatistics::getFireGrade)
+                .like(StringUtils.isNotBlank(fireNumber), DemFireStatistics::getFireNumber, fireNumber)
+                .orderByDesc(DemFireStatistics::getId);
+        List<DemFireStatistics> list1= this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<String> fireNumberList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                fireNumberList.add(list1.get(i).getFireNumber());
+            }
+            LambdaQueryWrapper<DemFireStatisticsAttach> queryWrapper1 = Wrappers.lambdaQuery();
+            queryWrapper1.select(DemFireStatisticsAttach::getId, DemFireStatisticsAttach::getFireNumber, DemFireStatisticsAttach::getInitialFuelType1,
+                    DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getBuildName)
+                    .in(CollectionUtils.isNotEmpty(fireNumberList), DemFireStatisticsAttach::getFireNumber, fireNumberList);
+            List<DemFireStatisticsAttach> list2 = demFireStatisticsAttachService.list(queryWrapper1);
+            for (int i = 0; i < list1.size(); i++) {
+                FirePlaceExportVO firePlaceExportVO = new FirePlaceExportVO();
+                firePlaceExportVO.setFireNumber(list1.get(i).getFireNumber());
+                firePlaceExportVO.setInitialFuelType1(null);
+                firePlaceExportVO.setBurnedArea(list1.get(i).getBurnedArea());
+                firePlaceExportVO.setAffectedHouse(list1.get(i).getAffectedHouse());
+                firePlaceExportVO.setVictimNumber(list1.get(i).getVictimNumber());
+                firePlaceExportVO.setFireCause(null);
+                firePlaceExportVO.setDirectPropertyLoss(list1.get(i).getDirectPropertyLoss());
+                firePlaceExportVO.setFireTime((list1.get(i).getFireTime()).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                firePlaceExportVO.setFireGrade(list1.get(i).getFireGrade());
+                firePlaceExportVO.setBuildName(null);
+                for (int j = 0; j < list2.size(); j++) {
+                    if (list1.get(i).getFireNumber().equals(list2.get(j).getFireNumber())) {
+                        firePlaceExportVO.setInitialFuelType1(list2.get(j).getInitialFuelType1());
+                        firePlaceExportVO.setFireCause(list2.get(j).getFireCauseType1());
+                        firePlaceExportVO.setBuildName(list2.get(j).getBuildName());
+                    }
+                }
+                list.add(firePlaceExportVO);
+            }
+        }
+
+        return list;
+    }
+
     @Transactional
     @Override
     public void updateFirePlace(DemFireStatistics demFireStatistics) {

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

@@ -15,6 +15,7 @@ import com.usky.fire.mapper.DemInspectListMapper;
 import com.usky.fire.service.DemInspectListService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.service.util.OnlineMethod;
+import com.usky.fire.service.vo.DemInspectExportVO;
 import com.usky.fire.service.vo.InspectDetailVO;
 import com.usky.fire.service.vo.InspectHandleVO;
 import com.usky.fire.service.vo.InspectManagerVO;
@@ -130,6 +131,84 @@ public class DemInspectListServiceImpl extends AbstractCrudService<DemInspectLis
         return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
     }
 
+    @Override
+    public List<DemInspectExportVO> demInspectListExport(String inspectCode, String companyName, String deviceCode, Integer handlingStatus){
+        List<DemInspectExportVO> list = new ArrayList<>();
+        List<BaseCompany> companyIdList = new ArrayList<>();
+        LambdaQueryWrapper<BaseUserCompany> QueryWrapper = Wrappers.lambdaQuery();
+        QueryWrapper.select(BaseUserCompany::getCompanyId)
+                .eq(BaseUserCompany::getUserId, SecurityUtils.getUserId());
+        List<BaseUserCompany> comoanyList = baseUserCompanyService.list(QueryWrapper);
+
+        LambdaQueryWrapper<BaseCompany> QueryWrapperCompany = Wrappers.lambdaQuery();
+        if(StringUtils.isNotBlank(companyName)){
+            QueryWrapperCompany.select(BaseCompany::getCompanyId)
+                    .eq(BaseCompany::getEnable, 0)
+                    .like(BaseCompany::getCompanyName, companyName);
+            companyIdList = baseCompanyService.list(QueryWrapperCompany);
+        }
+
+        if(CollectionUtils.isNotEmpty(comoanyList)){
+            List<String> companyList = new ArrayList<>();
+            for(int i=0;i<comoanyList.size();i++){
+                companyList.add(comoanyList.get(i).getCompanyId());
+            }
+            for(int j=0;j<companyIdList.size();j++){
+                companyList.add(comoanyList.get(j).getCompanyId());
+            }
+
+            LambdaQueryWrapper<DemInspectList> QueryWrapper1 = Wrappers.lambdaQuery();
+            QueryWrapper1.in(DemInspectList::getCompanyId,companyList)
+                    .eq(StringUtils.isNotBlank(inspectCode), DemInspectList::getInspectCode, inspectCode)
+                    .eq(StringUtils.isNotBlank(deviceCode), DemInspectList::getDeviceId, deviceCode)
+                    .eq(handlingStatus != null, DemInspectList::getHandlingStatus, handlingStatus);
+            QueryWrapper1.orderByDesc(DemInspectList::getId);
+            List<DemInspectList> list1 = this.list(QueryWrapper1);
+            if(CollectionUtils.isNotEmpty(list1)){
+                for(int k=0;k<list1.size();k++){
+                    DemInspectExportVO demInspectExportVO = new DemInspectExportVO();
+                    demInspectExportVO.setInspectCode(list1.get(k).getInspectCode());
+                    demInspectExportVO.setDeviceCode(list1.get(k).getDeviceId());
+                    //设备名称和安装位置
+                    LambdaQueryWrapper<BaseDevice> QueryWrapperDevice = Wrappers.lambdaQuery();
+                    QueryWrapperDevice.select(BaseDevice::getDeviceCode,BaseDevice::getDeviceName,BaseDevice::getInstallAddress)
+                            .eq(BaseDevice::getDeviceCode, list1.get(k).getDeviceId());
+                    List<BaseDevice> deviceList = baseDeviceService.list(QueryWrapperDevice);
+                    demInspectExportVO.setDeviceName(deviceList.get(0).getDeviceName());
+                    demInspectExportVO.setInstallAddress(deviceList.get(0).getInstallAddress());
+                    //设备报告内容和报告时间
+                    LambdaQueryWrapper<AlarmFire> QueryWrapperAlarm = Wrappers.lambdaQuery();
+                    QueryWrapperAlarm.select(AlarmFire::getAlarmTime, AlarmFire::getAttributeValue2, AlarmFire::getAttributeValue4)
+                            .eq(AlarmFire::getId, list1.get(k).getAlarmId());
+                    List<AlarmFire> alarmFireList = alarmFireService.list(QueryWrapperAlarm);
+                    demInspectExportVO.setAlarmTime(alarmFireList.get(0).getAlarmTime());
+                    demInspectExportVO.setDeviceContent(alarmFireList.get(0).getAttributeValue2()+" "+alarmFireList.get(0).getAttributeValue4());
+
+                    LambdaQueryWrapper<BaseCompanyPerson> queryWrapperPerson = Wrappers.lambdaQuery();
+                    queryWrapperPerson.select(BaseCompanyPerson::getCompanyName, BaseCompanyPerson::getDelegateName, BaseCompanyPerson::getDelegatePhone,
+                            BaseCompanyPerson::getFireDutyName, BaseCompanyPerson::getFireDutyPhone,
+                            BaseCompanyPerson::getFireManageName, BaseCompanyPerson::getFireManagePhone)
+                            .in(BaseCompanyPerson::getCompanyId, list1.get(k).getCompanyId());
+                    List<BaseCompanyPerson> companyPersonList = baseCompanyPersonService.list(queryWrapperPerson);
+                    demInspectExportVO.setCompanyName(companyPersonList.get(0).getCompanyName());
+                    demInspectExportVO.setDelegateName(companyPersonList.get(0).getDelegateName());
+                    demInspectExportVO.setDelegatePhone(companyPersonList.get(0).getDelegatePhone());
+                    demInspectExportVO.setFireDutyName(companyPersonList.get(0).getFireDutyName());
+                    demInspectExportVO.setFireDutyPhone(companyPersonList.get(0).getFireDutyPhone());
+                    demInspectExportVO.setFireManageName(companyPersonList.get(0).getFireManageName());
+                    demInspectExportVO.setFireManagePhone(companyPersonList.get(0).getFireManagePhone());
+
+                    demInspectExportVO.setHandlingStatus(list1.get(k).getHandlingStatus());
+                    demInspectExportVO.setInspectTime(list1.get(k).getCreateTime());
+                    demInspectExportVO.setHandlingRecord(null);
+                    list.add(demInspectExportVO);
+                }
+            }
+        }
+
+        return list;
+    }
+
     @Override
     public CommonPage<InspectManagerVO> inspectManageList(String inspectCode, String deviceCode, Integer handlingStatus, Integer pageNum, Integer pageSize){
         IPage<DemInspectList> page = new Page<>(pageNum, pageSize);

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

@@ -14,13 +14,15 @@ import com.usky.common.core.util.Arith;
 import com.usky.common.core.util.DateUtils;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemPoliceInfo;
+import com.usky.fire.domain.DemPoliceRecord;
 import com.usky.fire.mapper.DemPoliceInfoMapper;
-import com.usky.fire.service.DemFireStatisticsAttachService;
-import com.usky.fire.service.DemPoliceInfoService;
+import com.usky.fire.service.*;
 import com.usky.fire.service.vo.AlertStatisticsVO;
+import com.usky.fire.service.vo.DemPoliceRecordExportVO;
 import com.usky.fire.service.vo.FireLevelRatioVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.time.Instant;
@@ -46,6 +48,131 @@ public class DemPoliceInfoServiceImpl extends AbstractCrudService<DemPoliceInfoM
     @Autowired
     private DemFireStatisticsAttachService demFireStatisticsAttachService;
 
+    @Autowired
+    private DemPoliceRecordService demPoliceRecordService;
+
+    @Override
+    public CommonPage<Object> policeRecordList(String caseCode, String branch, Integer id, Integer pageNum, Integer pageSize) {
+        List<Object> list = new ArrayList<>();
+        IPage<DemPoliceInfo> page = new Page<>(pageNum, pageSize);
+        LambdaQueryWrapper<DemPoliceInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
+                DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
+                DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
+                DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
+                DemPoliceInfo::getPoliceId)
+                .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
+                .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode)
+                .orderByDesc(DemPoliceInfo::getId);
+        page = this.page(page, queryWrapper);
+        if (CollectionUtils.isNotEmpty(page.getRecords())) {
+            List<String> policeIdList = new ArrayList<>();
+            for (int i = 0; i < page.getRecords().size(); i++) {
+                policeIdList.add(page.getRecords().get(i).getPoliceId());
+            }
+            if (CollectionUtils.isNotEmpty(policeIdList)) {
+                LambdaQueryWrapper<DemPoliceRecord> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.eq(DemPoliceRecord::getDeleteFlag, "0")
+                        .in(DemPoliceRecord::getCaseInfoId, policeIdList);
+                List<DemPoliceRecord> list1 = demPoliceRecordService.list(queryWrapper1);
+                for (int i = 0; i < page.getRecords().size(); i++) {
+                    for (int j = 0; j < list1.size(); j++) {
+                        if (page.getRecords().get(i).getPoliceId().equals(list1.get(j).getCaseInfoId())) {
+                            Map<String, Object> map = new HashMap<>();
+                            map.put("id", page.getRecords().get(i).getId());
+                            map.put("handleStartTime", list1.get(j).getHandleStartTime());
+                            map.put("handleEndTime", list1.get(j).getHandleEndTime());
+                            map.put("id1", list1.get(j).getId());
+                            map.put("caseCode", page.getRecords().get(i).getCaseCode());
+                            map.put("branch", page.getRecords().get(i).getBranch());
+                            map.put("timeSlot", page.getRecords().get(i).getTimeSlot());
+                            map.put("area", page.getRecords().get(i).getArea());
+                            map.put("caseType", page.getRecords().get(i).getCaseType());
+                            map.put("filingDate", page.getRecords().get(i).getFilingDate());
+                            map.put("filingTime", page.getRecords().get(i).getFilingTime());
+                            map.put("handleObject", page.getRecords().get(i).getHandleObject());
+                            map.put("caseStatus", page.getRecords().get(i).getCaseStatus());
+                            map.put("caseNature", page.getRecords().get(i).getCaseNature());
+                            map.put("dispatchVehicle", page.getRecords().get(i).getDispatchVehicle());
+                            list.add(map);
+                        }
+                    }
+                }
+            }
+        }
+        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+    }
+
+    @Override
+    public List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch){
+        List<DemPoliceRecordExportVO> list = new ArrayList<>();
+        LambdaQueryWrapper<DemPoliceInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
+                DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
+                DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
+                DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
+                DemPoliceInfo::getPoliceId)
+                .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
+                .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode)
+                .orderByDesc(DemPoliceInfo::getId).last("limit 1000");
+        List<DemPoliceInfo> list1 = this.list(queryWrapper);
+        if (CollectionUtils.isNotEmpty(list1)) {
+            List<String> policeIdList = new ArrayList<>();
+            for (int i = 0; i < list1.size(); i++) {
+                policeIdList.add(list1.get(i).getPoliceId());
+            }
+            if (CollectionUtils.isNotEmpty(policeIdList)) {
+                LambdaQueryWrapper<DemPoliceRecord> queryWrapper1 = Wrappers.lambdaQuery();
+                queryWrapper1.eq(DemPoliceRecord::getDeleteFlag, "0")
+                        .in(DemPoliceRecord::getCaseInfoId, policeIdList);
+                List<DemPoliceRecord> list2 = demPoliceRecordService.list(queryWrapper1);
+                for (int i = 0; i < list1.size(); i++) {
+                    for (int j = 0; j < list2.size(); j++) {
+                        if (list1.get(i).getPoliceId().equals(list2.get(j).getCaseInfoId())) {
+                            DemPoliceRecordExportVO demPoliceRecordExportVO = new DemPoliceRecordExportVO();
+                            demPoliceRecordExportVO.setCaseCode(list1.get(i).getCaseCode());
+                            demPoliceRecordExportVO.setHandleStartTime(list2.get(j).getHandleStartTime());
+                            demPoliceRecordExportVO.setHandleEndTime(list2.get(j).getHandleEndTime());
+                            demPoliceRecordExportVO.setBranch(list1.get(i).getBranch());
+                            demPoliceRecordExportVO.setTimeSlot(list1.get(i).getTimeSlot());
+                            demPoliceRecordExportVO.setArea(list1.get(i).getArea());
+                            demPoliceRecordExportVO.setCaseType(list1.get(i).getCaseType());
+                            demPoliceRecordExportVO.setFilingDate(list1.get(i).getFilingDate());
+                            demPoliceRecordExportVO.setFilingTime(list1.get(i).getFilingTime());
+                            demPoliceRecordExportVO.setHandleObject(list1.get(i).getHandleObject());
+                            demPoliceRecordExportVO.setCaseStatus(list1.get(i).getCaseStatus());
+                            demPoliceRecordExportVO.setCaseNature(list1.get(i).getCaseNature());
+                            demPoliceRecordExportVO.setDispatchVehicle(list1.get(i).getDispatchVehicle());
+                            list.add(demPoliceRecordExportVO);
+                        }
+                    }
+                }
+            }
+        }
+
+        return list;
+    }
+
+    @Transactional
+    @Override
+    public void updatePoliceRecord(DemPoliceInfo demPoliceInfo) {
+        this.updateById(demPoliceInfo);
+        DemPoliceRecord demPoliceRecord = new DemPoliceRecord();
+        demPoliceRecord.setId(demPoliceInfo.getId1());
+        demPoliceRecord.setCaseCode(demPoliceInfo.getCaseCode());
+        demPoliceRecord.setBranch(demPoliceInfo.getBranch());
+        demPoliceRecord.setTimeSlot(demPoliceInfo.getTimeSlot());
+        demPoliceRecord.setArea(demPoliceInfo.getArea());
+        demPoliceRecord.setCaseType(demPoliceInfo.getCaseType());
+        demPoliceRecord.setFilingDate(demPoliceInfo.getFilingDate());
+        demPoliceRecord.setFilingTime(demPoliceInfo.getFilingTime());
+        demPoliceRecord.setHandleObject(demPoliceInfo.getHandleObject());
+        demPoliceRecord.setCaseStatus(demPoliceInfo.getCaseStatus());
+        demPoliceRecord.setCaseNature(demPoliceInfo.getCaseNature());
+        demPoliceRecord.setDispatchVehicle(demPoliceInfo.getDispatchVehicle());
+        demPoliceRecordService.updateById(demPoliceRecord);
+    }
+
     @Override
     public Map<String, List<AlertStatisticsVO>> getAlertStatisticsByMonth(String startTime, String endTime, String streetTown) {
         QueryWrapper<DemPoliceInfo> queryWrapper = new QueryWrapper<>();

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

@@ -33,143 +33,132 @@ import java.util.Map;
  */
 @Service
 public class DemPoliceRecordServiceImpl extends AbstractCrudService<DemPoliceRecordMapper, DemPoliceRecord> implements DemPoliceRecordService {
+//
+//    @Autowired
+//    private DemPoliceInfoService demPoliceInfoService;
 
-    @Autowired
-    private DemPoliceInfoService demPoliceInfoService;
-
-    @Override
-    public CommonPage<Object> policeRecordList(String caseCode, String branch, Integer id, Integer pageNum, Integer pageSize) {
-        List<Object> list = new ArrayList<>();
-        IPage<DemPoliceRecord> page = new Page<>(pageNum, pageSize);
-        LambdaQueryWrapper<DemPoliceRecord> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DemPoliceRecord::getDeleteFlag, "0")
-                .orderByDesc(DemPoliceRecord::getId);
-        page = this.page(page, queryWrapper);
-        if (CollectionUtils.isNotEmpty(page.getRecords())) {
-            List<String> policeIdList = new ArrayList<>();
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                policeIdList.add(page.getRecords().get(i).getCaseInfoId());
-            }
-            if (CollectionUtils.isNotEmpty(policeIdList)) {
-                LambdaQueryWrapper<DemPoliceInfo> queryWrapper1 = Wrappers.lambdaQuery();
-                queryWrapper1.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
-                        DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
-                        DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
-                        DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
-                        DemPoliceInfo::getPoliceId)
-                        .in(DemPoliceInfo::getPoliceId, policeIdList)
-                        .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
-                        .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode);
-                List<DemPoliceInfo> list1 = demPoliceInfoService.list(queryWrapper1);
-                for (int i = 0; i < page.getRecords().size(); i++) {
-                    for (int j = 0; j < list1.size(); j++) {
-                        if (page.getRecords().get(i).getCaseInfoId().equals(list1.get(j).getPoliceId())) {
-                            Map<String, Object> map = new HashMap<>();
-                            map.put("id", page.getRecords().get(i).getId());
-                            map.put("handleStartTime", page.getRecords().get(i).getHandleStartTime());
-                            map.put("handleEndTime", page.getRecords().get(i).getHandleEndTime());
-                            map.put("id1", list1.get(j).getId());
-                            map.put("caseCode", list1.get(j).getCaseCode());
-                            map.put("branch", list1.get(j).getBranch());
-                            map.put("timeSlot", list1.get(j).getTimeSlot());
-                            map.put("area", list1.get(j).getArea());
-                            map.put("caseType", list1.get(j).getCaseType());
-                            map.put("filingDate", list1.get(j).getFilingDate());
-                            map.put("filingTime", list1.get(j).getFilingTime());
-                            map.put("handleObject", list1.get(j).getHandleObject());
-                            map.put("caseStatus", list1.get(j).getCaseStatus());
-                            map.put("caseNature", list1.get(j).getCaseNature());
-                            map.put("dispatchVehicle", list1.get(j).getDispatchVehicle());
-                            list.add(map);
-                        }
-                    }
-                }
-            }
-        }
-        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
-    }
-
-    @Override
-    public List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch){
-        List<DemPoliceRecordExportVO> list = new ArrayList<>();
-        LambdaQueryWrapper<DemPoliceRecord> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.select(DemPoliceRecord::getCaseInfoId, DemPoliceRecord::getHandleStartTime, DemPoliceRecord::getHandleEndTime)
-                .eq(DemPoliceRecord::getDeleteFlag, "0")
-                .orderByDesc(DemPoliceRecord::getId);
-        List<DemPoliceRecord> list1 = this.list(queryWrapper);
-        if (CollectionUtils.isNotEmpty(list1)) {
-            List<String> policeIdList = new ArrayList<>();
-            for (int i = 0; i < list1.size(); i++) {
-                policeIdList.add(list1.get(i).getCaseInfoId());
-            }
-            if (CollectionUtils.isNotEmpty(policeIdList)) {
-                LambdaQueryWrapper<DemPoliceInfo> queryWrapper1 = Wrappers.lambdaQuery();
-                queryWrapper1.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
-                        DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
-                        DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
-                        DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
-                        DemPoliceInfo::getPoliceId)
-                        .in(DemPoliceInfo::getPoliceId, policeIdList)
-                        .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
-                        .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode);
-                List<DemPoliceInfo> list2 = demPoliceInfoService.list(queryWrapper1);
-                for (int i = 0; i < list1.size(); i++) {
-                    DemPoliceRecordExportVO demPoliceRecordExportVO = new DemPoliceRecordExportVO();
-                    demPoliceRecordExportVO.setCaseCode(null);
-                    demPoliceRecordExportVO.setHandleStartTime(list1.get(i).getHandleStartTime());
-                    demPoliceRecordExportVO.setHandleEndTime(list1.get(i).getHandleEndTime());
-                    demPoliceRecordExportVO.setBranch(null);
-                    demPoliceRecordExportVO.setTimeSlot(null);
-                    demPoliceRecordExportVO.setArea(null);
-                    demPoliceRecordExportVO.setCaseType(null);
-                    demPoliceRecordExportVO.setFilingDate(null);
-                    demPoliceRecordExportVO.setFilingTime(null);
-                    demPoliceRecordExportVO.setHandleObject(null);
-                    demPoliceRecordExportVO.setCaseStatus(null);
-                    demPoliceRecordExportVO.setCaseNature(null);
-                    demPoliceRecordExportVO.setDispatchVehicle(null);
-                    for (int j = 0; j < list2.size(); j++) {
-                        if (list1.get(i).getCaseInfoId().equals(list2.get(j).getPoliceId())) {
-                            demPoliceRecordExportVO.setCaseCode(list2.get(j).getCaseCode());
-                            demPoliceRecordExportVO.setBranch(list2.get(j).getBranch());
-                            demPoliceRecordExportVO.setTimeSlot(list2.get(j).getTimeSlot());
-                            demPoliceRecordExportVO.setArea(list2.get(j).getArea());
-                            demPoliceRecordExportVO.setCaseType(list2.get(j).getCaseType());
-                            demPoliceRecordExportVO.setFilingDate(list2.get(j).getFilingDate());
-                            demPoliceRecordExportVO.setFilingTime(list2.get(j).getFilingTime());
-                            demPoliceRecordExportVO.setHandleObject(list2.get(j).getHandleObject());
-                            demPoliceRecordExportVO.setCaseStatus(list2.get(j).getCaseStatus());
-                            demPoliceRecordExportVO.setCaseNature(list2.get(j).getCaseNature());
-                            demPoliceRecordExportVO.setDispatchVehicle(list2.get(j).getDispatchVehicle());
-                        }
-                    }
-                    list.add(demPoliceRecordExportVO);
-                }
-            }
-        }
-
-        return list;
-    }
+//    @Override
+//    public CommonPage<Object> policeRecordList(String caseCode, String branch, Integer id, Integer pageNum, Integer pageSize) {
+//        List<Object> list = new ArrayList<>();
+//        IPage<DemPoliceRecord> page = new Page<>(pageNum, pageSize);
+//        LambdaQueryWrapper<DemPoliceRecord> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.eq(DemPoliceRecord::getDeleteFlag, "0")
+//                .orderByDesc(DemPoliceRecord::getId);
+//        page = this.page(page, queryWrapper);
+//        if (CollectionUtils.isNotEmpty(page.getRecords())) {
+//            List<String> policeIdList = new ArrayList<>();
+//            for (int i = 0; i < page.getRecords().size(); i++) {
+//                policeIdList.add(page.getRecords().get(i).getCaseInfoId());
+//            }
+//            if (CollectionUtils.isNotEmpty(policeIdList)) {
+//                LambdaQueryWrapper<DemPoliceInfo> queryWrapper1 = Wrappers.lambdaQuery();
+//                queryWrapper1.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
+//                        DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
+//                        DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
+//                        DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
+//                        DemPoliceInfo::getPoliceId)
+//                        .in(DemPoliceInfo::getPoliceId, policeIdList)
+//                        .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
+//                        .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode);
+//                List<DemPoliceInfo> list1 = demPoliceInfoService.list(queryWrapper1);
+//                for (int i = 0; i < page.getRecords().size(); i++) {
+//                    for (int j = 0; j < list1.size(); j++) {
+//                        if (page.getRecords().get(i).getCaseInfoId().equals(list1.get(j).getPoliceId())) {
+//                            Map<String, Object> map = new HashMap<>();
+//                            map.put("id", page.getRecords().get(i).getId());
+//                            map.put("handleStartTime", page.getRecords().get(i).getHandleStartTime());
+//                            map.put("handleEndTime", page.getRecords().get(i).getHandleEndTime());
+//                            map.put("id1", list1.get(j).getId());
+//                            map.put("caseCode", list1.get(j).getCaseCode());
+//                            map.put("branch", list1.get(j).getBranch());
+//                            map.put("timeSlot", list1.get(j).getTimeSlot());
+//                            map.put("area", list1.get(j).getArea());
+//                            map.put("caseType", list1.get(j).getCaseType());
+//                            map.put("filingDate", list1.get(j).getFilingDate());
+//                            map.put("filingTime", list1.get(j).getFilingTime());
+//                            map.put("handleObject", list1.get(j).getHandleObject());
+//                            map.put("caseStatus", list1.get(j).getCaseStatus());
+//                            map.put("caseNature", list1.get(j).getCaseNature());
+//                            map.put("dispatchVehicle", list1.get(j).getDispatchVehicle());
+//                            list.add(map);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//        return new CommonPage<>(list, page.getTotal(), pageSize, pageNum);
+//    }
+//
+//    @Override
+//    public List<DemPoliceRecordExportVO> policeRecordListExport(String caseCode, String branch){
+//        List<DemPoliceRecordExportVO> list = new ArrayList<>();
+//        LambdaQueryWrapper<DemPoliceRecord> queryWrapper = Wrappers.lambdaQuery();
+//        queryWrapper.select(DemPoliceRecord::getCaseInfoId, DemPoliceRecord::getHandleStartTime, DemPoliceRecord::getHandleEndTime)
+//                .eq(DemPoliceRecord::getDeleteFlag, "0")
+//                .orderByDesc(DemPoliceRecord::getId).last("limit 1000");
+//        List<DemPoliceRecord> list1 = this.list(queryWrapper);
+//        if (CollectionUtils.isNotEmpty(list1)) {
+//            List<String> policeIdList = new ArrayList<>();
+//            for (int i = 0; i < list1.size(); i++) {
+//                policeIdList.add(list1.get(i).getCaseInfoId());
+//            }
+//            if (CollectionUtils.isNotEmpty(policeIdList)) {
+//                LambdaQueryWrapper<DemPoliceInfo> queryWrapper1 = Wrappers.lambdaQuery();
+//                queryWrapper1.select(DemPoliceInfo::getId, DemPoliceInfo::getCaseCode, DemPoliceInfo::getBranch,
+//                        DemPoliceInfo::getTimeSlot, DemPoliceInfo::getArea, DemPoliceInfo::getCaseType,
+//                        DemPoliceInfo::getFilingDate, DemPoliceInfo::getFilingTime, DemPoliceInfo::getHandleObject,
+//                        DemPoliceInfo::getCaseStatus, DemPoliceInfo::getCaseNature, DemPoliceInfo::getDispatchVehicle,
+//                        DemPoliceInfo::getPoliceId)
+//                        .in(DemPoliceInfo::getPoliceId, policeIdList)
+//                        .like(StringUtils.isNotBlank(branch), DemPoliceInfo::getBranch, branch)
+//                        .like(StringUtils.isNotBlank(caseCode), DemPoliceInfo::getCaseCode, caseCode);
+//                List<DemPoliceInfo> list2 = demPoliceInfoService.list(queryWrapper1);
+//                for (int i = 0; i < list1.size(); i++) {
+//                    for (int j = 0; j < list2.size(); j++) {
+//                        if (list1.get(i).getCaseInfoId().equals(list2.get(j).getPoliceId())) {
+//                            DemPoliceRecordExportVO demPoliceRecordExportVO = new DemPoliceRecordExportVO();
+//                            demPoliceRecordExportVO.setCaseCode(list2.get(j).getCaseCode());
+//                            demPoliceRecordExportVO.setHandleStartTime(list1.get(i).getHandleStartTime());
+//                            demPoliceRecordExportVO.setHandleEndTime(list1.get(i).getHandleEndTime());
+//                            demPoliceRecordExportVO.setBranch(list2.get(j).getBranch());
+//                            demPoliceRecordExportVO.setTimeSlot(list2.get(j).getTimeSlot());
+//                            demPoliceRecordExportVO.setArea(list2.get(j).getArea());
+//                            demPoliceRecordExportVO.setCaseType(list2.get(j).getCaseType());
+//                            demPoliceRecordExportVO.setFilingDate(list2.get(j).getFilingDate());
+//                            demPoliceRecordExportVO.setFilingTime(list2.get(j).getFilingTime());
+//                            demPoliceRecordExportVO.setHandleObject(list2.get(j).getHandleObject());
+//                            demPoliceRecordExportVO.setCaseStatus(list2.get(j).getCaseStatus());
+//                            demPoliceRecordExportVO.setCaseNature(list2.get(j).getCaseNature());
+//                            demPoliceRecordExportVO.setDispatchVehicle(list2.get(j).getDispatchVehicle());
+//                            list.add(demPoliceRecordExportVO);
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//
+//        return list;
+//    }
 
     @Transactional
-    @Override
-    public void updatePoliceRecord(DemPoliceRecord demPoliceRecord) {
-        this.updateById(demPoliceRecord);
-        DemPoliceInfo demPoliceInfo = new DemPoliceInfo();
-        demPoliceInfo.setId(demPoliceRecord.getId1());
-        demPoliceInfo.setCaseCode(demPoliceRecord.getCaseCode());
-        demPoliceInfo.setBranch(demPoliceRecord.getBranch());
-        demPoliceInfo.setTimeSlot(demPoliceRecord.getTimeSlot());
-        demPoliceInfo.setArea(demPoliceRecord.getArea());
-        demPoliceInfo.setCaseType(demPoliceRecord.getCaseType());
-        demPoliceInfo.setFilingDate(demPoliceRecord.getFilingDate());
-        demPoliceInfo.setFilingTime(demPoliceRecord.getFilingTime());
-        demPoliceInfo.setHandleObject(demPoliceRecord.getHandleObject());
-        demPoliceInfo.setCaseStatus(demPoliceRecord.getCaseStatus());
-        demPoliceInfo.setCaseNature(demPoliceRecord.getCaseNature());
-        demPoliceInfo.setDispatchVehicle(demPoliceRecord.getDispatchVehicle());
-        demPoliceInfoService.updateById(demPoliceInfo);
-    }
+//    @Override
+//    public void updatePoliceRecord(DemPoliceRecord demPoliceRecord) {
+//        this.updateById(demPoliceRecord);
+//        DemPoliceInfo demPoliceInfo = new DemPoliceInfo();
+//        demPoliceInfo.setId(demPoliceRecord.getId1());
+//        demPoliceInfo.setCaseCode(demPoliceRecord.getCaseCode());
+//        demPoliceInfo.setBranch(demPoliceRecord.getBranch());
+//        demPoliceInfo.setTimeSlot(demPoliceRecord.getTimeSlot());
+//        demPoliceInfo.setArea(demPoliceRecord.getArea());
+//        demPoliceInfo.setCaseType(demPoliceRecord.getCaseType());
+//        demPoliceInfo.setFilingDate(demPoliceRecord.getFilingDate());
+//        demPoliceInfo.setFilingTime(demPoliceRecord.getFilingTime());
+//        demPoliceInfo.setHandleObject(demPoliceRecord.getHandleObject());
+//        demPoliceInfo.setCaseStatus(demPoliceRecord.getCaseStatus());
+//        demPoliceInfo.setCaseNature(demPoliceRecord.getCaseNature());
+//        demPoliceInfo.setDispatchVehicle(demPoliceRecord.getDispatchVehicle());
+//        demPoliceInfoService.updateById(demPoliceInfo);
+//    }
 
     @Override
     public void delPoliceRecord(Integer id) {

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

@@ -0,0 +1,94 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BaseCompanyExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 组织机构代码
+     */
+    @Excel(name = "组织机构代码")
+    private String organization;
+
+    /**
+     * 法人代表
+     */
+    @Excel(name = "法人代表")
+    private String delegateName;
+
+    /**
+     * 单位地址
+     */
+    @Excel(name = "单位地址")
+    private String address;
+
+    /**
+     * 单位类型
+     */
+    @Excel(name = "单位类型")
+    private String companyType;
+
+    /**
+     * 单位电话
+     */
+    @Excel(name = "单位电话")
+    private String linkPhone;
+
+    /**
+     * 消防安全负责人
+     */
+    @Excel(name = "消防安全负责人")
+    private String fireDutyName;
+
+    /**
+     * 消防安全管理人
+     */
+    @Excel(name = "消防安全管理人")
+    private String fireManageName;
+
+    /**
+     * 职工人数
+     */
+    @Excel(name = "职工人数")
+    private String employeeNum;
+
+    /**
+     * 建筑面积（㎡）
+     */
+    @Excel(name = "建筑面积（㎡）")
+    private String BuildArea;
+}

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

@@ -118,7 +118,7 @@ public class DemEnforceReportComplaintVO {
      * 回访状态
      */
     @Excel(name = "回访状态")
-    private Integer followUpStatus;
+    private String followUpStatus;
 
     /**
      * 举报的录音

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

@@ -0,0 +1,130 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DemInspectExportVO {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 督查单编号
+     */
+    @Excel(name = "督查单编号")
+    private String inspectCode;
+
+    /**
+     * 设备编号
+     */
+    @Excel(name = "设备编号")
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /**
+     * 设备位置
+     */
+    @Excel(name = "设备位置")
+    private String installAddress;
+
+    /**
+     * 设备报告内容
+     */
+    @Excel(name = "设备报告内容")
+    private String deviceContent;
+
+    /**
+     * 报告时间
+     */
+    @Excel(name = "报告时间")
+    private LocalDateTime alarmTime;
+
+    /**
+     * 单位名称
+     */
+    @Excel(name = "单位名称")
+    private String companyName;
+
+    /**
+     * 法人名称
+     */
+    @Excel(name = "法人名称")
+    private String delegateName;
+
+    /**
+     * 法人联系电话
+     */
+    @Excel(name = "法人联系电话")
+    private String delegatePhone;
+
+    /**
+     * 消防安全责任人
+     */
+    @Excel(name = "消防安全责任人")
+    private String fireDutyName;
+
+    /**
+     * 消防安全责任人联系电话
+     */
+    @Excel(name = "消防安全责任人联系电话")
+    private String fireDutyPhone;
+
+    /**
+     * 消防安全管理人
+     */
+    @Excel(name = "消防安全管理人")
+    private String fireManageName;
+
+    /**
+     * 消防安全管理人联系电话
+     */
+    @Excel(name = "消防安全管理人联系电话")
+    private String fireManagePhone;
+
+    /**
+     * 处置状态
+     */
+    @Excel(name = "处置状态")
+    private Integer handlingStatus;
+
+    /**
+     * 督查单生成时间
+     */
+    @Excel(name = "督查单生成时间")
+    private LocalDateTime inspectTime;
+
+    /**
+     * 处置记录
+     */
+    @Excel(name = "处置记录")
+    private LocalDateTime handlingRecord;
+}

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

@@ -0,0 +1,94 @@
+package com.usky.fire.service.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+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-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class FirePlaceExportVO {
+
+    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 initialFuelType1;
+
+    /**
+     * 过火面积
+     */
+    @Excel(name = "过火面积")
+    private String burnedArea;
+
+    /**
+     * 受灾户数
+     */
+    @Excel(name = "受灾户数")
+    private String affectedHouse;
+
+    /**
+     * 受灾人数
+     */
+    @Excel(name = "受灾人数")
+    private String victimNumber;
+
+    /**
+     * 火灾原因
+     */
+    @Excel(name = "火灾原因")
+    private String fireCause;
+
+    /**
+     * 财产损失
+     */
+    @Excel(name = "财产损失")
+    private String directPropertyLoss;
+
+    /**
+     * 起火时间
+     */
+    @Excel(name = "起火时间")
+    private String fireTime;
+
+    /**
+     * 火灾等级
+     */
+    @Excel(name = "火灾等级")
+    private String fireGrade;
+
+    /**
+     * 建筑结构
+     */
+    @Excel(name = "建筑结构")
+    private String buildName;
+}