火灾事故说明相关接口开发（暂时没有设计原稿，不完整接口）

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

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_fire_accident_desc");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_fire_statistics_attach");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -3,16 +3,14 @@ package com.usky.fire.controller.web;
 
 import com.usky.common.core.bean.ApiResult;
 import com.usky.common.core.bean.CommonPage;
-import com.usky.fire.domain.DemFireAccidentDesc;
-import com.usky.fire.service.DemFireAccidentDescService;
+import com.usky.fire.domain.DemFireStatistics;
+import com.usky.fire.service.DemFireStatisticsService;
 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 java.util.List;
-
 /**
  * <p>
  * 火灾事故说明总表 前端控制器
@@ -26,7 +24,7 @@ import java.util.List;
 public class DemFireAccidentDescController {
 
     @Autowired
-    private DemFireAccidentDescService demFireAccidentDescService;
+    private DemFireStatisticsService demFireStatisticsService;
 
     /**
      * 火灾事故说明信息列表查询
@@ -39,58 +37,12 @@ public class DemFireAccidentDescController {
      * @return
      */
     @GetMapping("fireAccidentExplainList")
-    public ApiResult<CommonPage<DemFireAccidentDesc>> fireAccidentExplainList(@RequestParam(value = "companyCode", required = false) String companyCode,
-                                                                              @RequestParam(value = "startDate", required = false) String startDate,
-                                                                              @RequestParam(value = "endDate", required = false) String endDate,
-                                                                              @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                                                                              @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
-        return ApiResult.success(demFireAccidentDescService.fireAccidentExplainList(companyCode, startDate, endDate, pageNum, pageSize));
+    public ApiResult<CommonPage<DemFireStatistics>> fireAccidentExplainList(@RequestParam(value = "companyCode", required = false) String companyCode,
+                                                                            @RequestParam(value = "startDate", required = false) String startDate,
+                                                                            @RequestParam(value = "endDate", required = false) String endDate,
+                                                                            @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                            @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize) {
+        return ApiResult.success(demFireStatisticsService.fireAccidentStatistic(companyCode, startDate, endDate, pageNum, pageSize));
     }
-
-    /**
-     * 火灾事故统计信息查询
-     *
-     * @param companyCode 单位编号
-     * @param startDate   开始时间
-     * @param endDate     结束时间
-     * @return
-     */
-    @GetMapping("fireAccidentStatistic")
-    public ApiResult<List<DemFireAccidentDesc>> fireAccidentStatistic(@RequestParam(value = "companyCode", required = false) String companyCode,
-                                                                      @RequestParam(value = "startDate", required = false) String startDate,
-                                                                      @RequestParam(value = "endDate", required = false) String endDate) {
-        return ApiResult.success(demFireAccidentDescService.fireAccidentStatistic(companyCode, startDate, endDate));
-    }
-
-    /**
-     * 简易火灾事故认定书数据查询
-     *
-     * @param companyCode 单位编号
-     * @param startDate   开始时间
-     * @param endDate     结束时间
-     * @return
-     */
-    @GetMapping("fireAccidentSimpleConList")
-    public ApiResult<List<DemFireAccidentDesc>> fireAccidentSimpleConList(@RequestParam(value = "companyCode", required = false) String companyCode,
-                                                                          @RequestParam(value = "startDate", required = false) String startDate,
-                                                                          @RequestParam(value = "endDate", required = false) String endDate) {
-        return ApiResult.success(demFireAccidentDescService.fireAccidentSimpleConList(companyCode, startDate, endDate));
-    }
-
-    /**
-     * 火灾事故认定书数据查询
-     *
-     * @param companyCode 单位编号
-     * @param startDate   开始时间
-     * @param endDate     结束时间
-     * @return
-     */
-    @GetMapping("fireAccidentConList")
-    public ApiResult<List<DemFireAccidentDesc>> fireAccidentConList(@RequestParam(value = "companyCode", required = false) String companyCode,
-                                                                    @RequestParam(value = "startDate", required = false) String startDate,
-                                                                    @RequestParam(value = "endDate", required = false) String endDate) {
-        return ApiResult.success(demFireAccidentDescService.fireAccidentConList(companyCode, startDate, endDate));
-    }
-
 }
 

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

@@ -0,0 +1,266 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 火灾统计表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFireStatistics implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 火灾序号
+     */
+    private String fireNumber;
+
+    /**
+     * 填表时间
+     */
+    private LocalDateTime fillTime;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 是否简项报告
+     */
+    private String briefReport;
+
+    /**
+     * 对应的火灾案例路径
+     */
+    private String fireCaseUrl;
+
+    /**
+     * 对应的灭火救援表
+     */
+    private String fireRescueForm;
+
+    /**
+     * 出动情况
+     */
+    private String mobilizationDesc;
+
+    /**
+     * 起火时间
+     */
+    private String fireTimeText;
+
+    /**
+     * 起火时间_日期型
+     */
+    private LocalDateTime fireTime;
+
+    /**
+     * 起火地点
+     */
+    private String fireAddress;
+
+    /**
+     * 单位代码
+     */
+    private String companyCode;
+
+    /**
+     * 户主名
+     */
+    private String ownerName;
+
+    /**
+     * 火灾从失火建筑蔓延到临近建筑
+     */
+    private String fireBuildSpread;
+
+    /**
+     * 发生轰燃
+     */
+    private String flashOver;
+
+    /**
+     * 失火建筑门窗在火灾过程中开启
+     */
+    private String doorWindowOpen;
+
+    /**
+     * 起火经过
+     */
+    private String fireProcess;
+
+    /**
+     * 直接财产损失
+     */
+    private String directPropertyLoss;
+
+    /**
+     * 过火面积
+     */
+    private String burnedArea;
+
+    /**
+     * 受灾户数
+     */
+    private String affectedHouse;
+
+    /**
+     * 受灾人数
+     */
+    private String victimNumber;
+
+    /**
+     * 死亡人数
+     */
+    private String deathToll;
+
+    /**
+     * 受伤人数
+     */
+    private String injuredNumber;
+
+    /**
+     * 是否重大火灾
+     */
+    private String majorFire;
+
+    /**
+     * 是否立案
+     */
+    private String fileCase;
+
+    /**
+     * 追究人数
+     */
+    private String investigateNumber;
+
+    /**
+     * 建议处理人数
+     */
+    private String suggestHandleNumber;
+
+    /**
+     * 审核状态
+     */
+    private String reviewStatus;
+
+    /**
+     * 最后审核者
+     */
+    private String lastReviewer;
+
+    /**
+     * 修改原因
+     */
+    private String modifyReason;
+
+    /**
+     * 正在调查
+     */
+    private String underInvestiga;
+
+    /**
+     * 退回者
+     */
+    private String returnee;
+
+    /**
+     * 火灾等级
+     */
+    private String fireGrade;
+
+    /**
+     * 轻伤人数
+     */
+    private String minorInjurieNumber;
+
+    /**
+     * 重伤人数
+     */
+    private String seriouslyInjureNumber;
+
+    /**
+     * 现场处置费用
+     */
+    private String siteDisposalExpense;
+
+    /**
+     * 人身伤亡
+     */
+    private String personalInjuryDeath;
+
+    /**
+     * 直接经济损失
+     */
+    private String directEconomicLoss;
+
+    /**
+     * 所属消防队
+     */
+    private String subordinateFireBrigade;
+
+    /**
+     * 所属大队
+     */
+    private String subordinateBrigade;
+
+    /**
+     * 所属支队
+     */
+    private String subordinateDetachment;
+
+    /**
+     * 所属总队
+     */
+    private String subordinateCorps;
+
+    /**
+     * 所属区县
+     */
+    private String subordinateDistrict;
+
+    /**
+     * 行政区域
+     */
+    private String administrativeDivision;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

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

@@ -0,0 +1,221 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 火灾统计表附表
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemFireStatisticsAttach implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 火灾序号
+     */
+    private String fireNumber;
+
+    /**
+     * 火灾原因分类（一级）
+     */
+    private String fireCauseType1;
+
+    /**
+     * 火灾原因分类（二级）
+     */
+    private String fireCauseType2;
+
+    /**
+     * 火灾原因分类（三级）
+     */
+    private String fireCauseType3;
+
+    /**
+     * 起火物（一级）
+     */
+    private String initialFuelType1;
+
+    /**
+     * 起火物（二级）
+     */
+    private String initialFuelType2;
+
+    /**
+     * 起火场所（一级）
+     */
+    private String fireSiteType1;
+
+    /**
+     * 起火场所（二级）
+     */
+    private String fireSiteType2;
+
+    /**
+     * 保险情况
+     */
+    private String insuranceDesc;
+
+    /**
+     * 与城市远程报警系统联网情况
+     */
+    private String alarmSystemNetwork;
+
+    /**
+     * 应急疏散照明情况
+     */
+    private String emergencyEvacuaLight;
+
+    /**
+     * 应急出口情况
+     */
+    private String emergencyExit;
+
+    /**
+     * 疏散通道情况
+     */
+    private String evacuationRoute;
+
+    /**
+     * 室内消火栓系统启动情况
+     */
+    private String indoorHydrantStartup;
+
+    /**
+     * 室内消火栓系统安装情况
+     */
+    private String indoorHydrantInstall;
+
+    /**
+     * 防排烟系统启动情况
+     */
+    private String smokeControlStartup;
+
+    /**
+     * 防排烟系统安装情况
+     */
+    private String smokeControlInstall;
+
+    /**
+     * 自动灭火系统启动情况
+     */
+    private String autoFireExtinguishStartup;
+
+    /**
+     * 自动灭火系统安装情况
+     */
+    private String autoFireExtinguishInstall;
+
+    /**
+     * 自动报警系统启动情况
+     */
+    private String autoAlarmStartup;
+
+    /**
+     * 自动报警系统安装情况
+     */
+    private String autoAlarmInstall;
+
+    /**
+     * 建筑结构名称
+     */
+    private String buildName;
+
+    /**
+     * 建筑耐火等级名称
+     */
+    private String fireRatingName;
+
+    /**
+     * 建筑类别名称
+     */
+    private String buildTypeName;
+
+    /**
+     * 建筑使用性质名称
+     */
+    private String useCharacterName;
+
+    /**
+     * 是否世界遗产情况
+     */
+    private String worldHeritage;
+
+    /**
+     * 经济类型名称
+     */
+    private String economicTypeName;
+
+    /**
+     * 行业类别名称
+     */
+    private String industryCategoryName;
+
+    /**
+     * 分级管理类型
+     */
+    private String hierarchicalManageType;
+
+    /**
+     * 区域类型
+     */
+    private String areaType;
+
+    /**
+     * 填表人消防队名称
+     */
+    private String fireBrigadeName;
+
+    /**
+     * 出动情况名称
+     */
+    private String mobilizationName;
+
+    /**
+     * BDP_AUDIT
+     */
+    private String bdpAudit;
+
+    /**
+     * unionKey
+     */
+    private String unionKey;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemFireStatisticsAttachMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemFireStatisticsAttach;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 火灾统计表附表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+public interface DemFireStatisticsAttachMapper extends CrudMapper<DemFireStatisticsAttach> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemFireStatisticsMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemFireStatistics;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 火灾统计表 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+public interface DemFireStatisticsMapper extends CrudMapper<DemFireStatistics> {
+
+}

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

@@ -15,12 +15,4 @@ import java.util.List;
  * @since 2022-09-13
  */
 public interface DemFireAccidentDescService extends CrudService<DemFireAccidentDesc> {
-
-    CommonPage<DemFireAccidentDesc> fireAccidentExplainList(String companyCode, String startDate, String endDate, Integer pageNum, Integer pageSize);
-
-    List<DemFireAccidentDesc> fireAccidentStatistic(String companyCode, String startDate, String endDate);
-
-    List<DemFireAccidentDesc> fireAccidentSimpleConList(String companyCode, String startDate, String endDate);
-
-    List<DemFireAccidentDesc> fireAccidentConList(String companyCode, String startDate, String endDate);
 }

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

@@ -0,0 +1,25 @@
+package com.usky.fire.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemFireStatisticsAttach;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 火灾统计表附表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+public interface DemFireStatisticsAttachService extends CrudService<DemFireStatisticsAttach> {
+
+    /**
+     * 火灾统计表附表数据查询
+     *
+     * @param fireNumberList 火灾序号
+     * @return
+     */
+    List<DemFireStatisticsAttach> fireAccidentStatistic(List<String> fireNumberList);
+}

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

@@ -0,0 +1,28 @@
+package com.usky.fire.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemFireAccidentDesc;
+import com.usky.fire.domain.DemFireStatistics;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 火灾统计表 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+public interface DemFireStatisticsService extends CrudService<DemFireStatistics> {
+
+    /**
+     * 火灾统计表 数据查询
+     *
+     * @param companyCode
+     * @return
+     */
+    CommonPage<DemFireStatistics> fireAccidentStatistic(String companyCode, String startDate, String endDate, Integer pageNum, Integer pageSize);
+
+}

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

@@ -8,10 +8,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.domain.DemFireAccidentDesc;
+import com.usky.fire.domain.DemFireStatistics;
+import com.usky.fire.domain.DemFireStatisticsAttach;
 import com.usky.fire.mapper.DemFireAccidentDescMapper;
 import com.usky.fire.service.DemFireAccidentDescService;
+import com.usky.fire.service.DemFireStatisticsAttachService;
+import com.usky.fire.service.DemFireStatisticsService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -24,42 +30,4 @@ import java.util.List;
  */
 @Service
 public class DemFireAccidentDescServiceImpl extends AbstractCrudService<DemFireAccidentDescMapper, DemFireAccidentDesc> implements DemFireAccidentDescService {
-
-    @Override
-    public CommonPage<DemFireAccidentDesc> fireAccidentExplainList(String companyCode, String startDate, String endDate, Integer pageNum, Integer pageSize) {
-        IPage<DemFireAccidentDesc> page = new Page<>(pageNum, pageSize);
-        LambdaQueryWrapper<DemFireAccidentDesc> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.between(StringUtils.isNotBlank(startDate) & StringUtils.isNotBlank(endDate), DemFireAccidentDesc::getAlarmTime, startDate, endDate)
-                .orderByDesc(DemFireAccidentDesc::getId);
-        page = this.page(page, queryWrapper);
-        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
-    }
-
-    @Override
-    public List<DemFireAccidentDesc> fireAccidentStatistic(String companyCode, String startDate, String endDate) {
-        LambdaQueryWrapper<DemFireAccidentDesc> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.between(StringUtils.isNotBlank(startDate) & StringUtils.isNotBlank(endDate), DemFireAccidentDesc::getAlarmTime, startDate, endDate)
-                .orderByDesc(DemFireAccidentDesc::getId);
-        List<DemFireAccidentDesc> list = this.list(queryWrapper);
-        return list;
-    }
-
-    @Override
-    public List<DemFireAccidentDesc> fireAccidentSimpleConList(String companyCode, String startDate, String endDate) {
-        LambdaQueryWrapper<DemFireAccidentDesc> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.between(StringUtils.isNotBlank(startDate) & StringUtils.isNotBlank(endDate), DemFireAccidentDesc::getAlarmTime, startDate, endDate)
-                .orderByDesc(DemFireAccidentDesc::getId);
-        List<DemFireAccidentDesc> list = this.list(queryWrapper);
-        return list;
-    }
-
-    @Override
-    public List<DemFireAccidentDesc> fireAccidentConList(String companyCode, String startDate, String endDate) {
-        LambdaQueryWrapper<DemFireAccidentDesc> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.between(StringUtils.isNotBlank(startDate) & StringUtils.isNotBlank(endDate), DemFireAccidentDesc::getAlarmTime, startDate, endDate)
-                .orderByDesc(DemFireAccidentDesc::getId);
-        List<DemFireAccidentDesc> list = this.list(queryWrapper);
-        return list;
-    }
-
 }

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

@@ -0,0 +1,33 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.domain.DemFireStatisticsAttach;
+import com.usky.fire.mapper.DemFireStatisticsAttachMapper;
+import com.usky.fire.service.DemFireStatisticsAttachService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 火灾统计表附表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+@Service
+public class DemFireStatisticsAttachServiceImpl extends AbstractCrudService<DemFireStatisticsAttachMapper, DemFireStatisticsAttach> implements DemFireStatisticsAttachService {
+
+    @Override
+    public List<DemFireStatisticsAttach> fireAccidentStatistic(List<String> fireNumberList) {
+        LambdaQueryWrapper<DemFireStatisticsAttach> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.select(DemFireStatisticsAttach::getFireCauseType1, DemFireStatisticsAttach::getFireSiteType1,
+                DemFireStatisticsAttach::getFireNumber, DemFireStatisticsAttach::getId)
+                .in(DemFireStatisticsAttach::getFireNumber, fireNumberList);
+        List<DemFireStatisticsAttach> list = this.list(queryWrapper);
+        return list;
+    }
+}

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

@@ -0,0 +1,44 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.domain.DemFireAccidentDesc;
+import com.usky.fire.domain.DemFireStatistics;
+import com.usky.fire.mapper.DemFireStatisticsMapper;
+import com.usky.fire.service.DemFireStatisticsService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 火灾统计表 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-13
+ */
+@Service
+public class DemFireStatisticsServiceImpl extends AbstractCrudService<DemFireStatisticsMapper, DemFireStatistics> implements DemFireStatisticsService {
+
+    @Override
+    public CommonPage<DemFireStatistics> fireAccidentStatistic(String companyCode, String startDate, String endDate, Integer pageNum, Integer pageSize) {
+        IPage<DemFireStatistics> page = new Page<>(pageNum, pageSize);
+        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)
+                .eq(StringUtils.isNotBlank(companyCode), DemFireStatistics::getCompanyCode, companyCode)
+                .between(StringUtils.isNotBlank(startDate) & StringUtils.isNotBlank(endDate), DemFireStatistics::getFillTime, startDate, endDate)
+                .orderByDesc(DemFireStatistics::getId);
+        page = this.page(page, queryWrapper);
+        return new CommonPage<>(page.getRecords(), page.getTotal(), pageSize, pageNum);
+    }
+
+}

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

@@ -359,6 +359,13 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
 
     @Override
     public void addSite(PatrolInspectionSite patrolInspectionSite) {
+        LambdaQueryWrapper<PatrolInspectionSite> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(PatrolInspectionSite::getSiteNubmber,patrolInspectionSite.getSiteNubmber())
+                .eq(PatrolInspectionSite::getEnable,1);
+        int list = patrolInspectionSiteService.count(queryWrapper);
+        if (list>0){
+            throw new BusinessException("子计划不存在地点,请联系管理人员");
+        }
         patrolInspectionSite.setCreator(SecurityUtils.getUsername());
         patrolInspectionSite.setCollector(SecurityUtils.getUsername());
         patrolInspectionSite.setCollectTime(LocalDateTime.now());

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireStatisticsAttachMapper.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemFireStatisticsAttachMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireStatisticsAttach">
+        <id column="id" property="id" />
+        <result column="fire_number" property="fireNumber" />
+        <result column="fire_cause_type1" property="fireCauseType1" />
+        <result column="fire_cause_type2" property="fireCauseType2" />
+        <result column="fire_cause_type3" property="fireCauseType3" />
+        <result column="initial_fuel_type1" property="initialFuelType1" />
+        <result column="initial_fuel_type2" property="initialFuelType2" />
+        <result column="fire_site_type1" property="fireSiteType1" />
+        <result column="fire_site_type2" property="fireSiteType2" />
+        <result column="insurance_desc" property="insuranceDesc" />
+        <result column="alarm_system_network" property="alarmSystemNetwork" />
+        <result column="emergency_evacua_light" property="emergencyEvacuaLight" />
+        <result column="emergency_exit" property="emergencyExit" />
+        <result column="evacuation_route" property="evacuationRoute" />
+        <result column="indoor_hydrant_startup" property="indoorHydrantStartup" />
+        <result column="indoor_hydrant_install" property="indoorHydrantInstall" />
+        <result column="smoke_control_startup" property="smokeControlStartup" />
+        <result column="smoke_control_install" property="smokeControlInstall" />
+        <result column="auto_fire_extinguish_startup" property="autoFireExtinguishStartup" />
+        <result column="auto_fire_extinguish_install" property="autoFireExtinguishInstall" />
+        <result column="auto_alarm_startup" property="autoAlarmStartup" />
+        <result column="auto_alarm_install" property="autoAlarmInstall" />
+        <result column="build_name" property="buildName" />
+        <result column="fire_rating_name" property="fireRatingName" />
+        <result column="build_type_name" property="buildTypeName" />
+        <result column="use_character_name" property="useCharacterName" />
+        <result column="world_heritage" property="worldHeritage" />
+        <result column="economic_type_name" property="economicTypeName" />
+        <result column="industry_category_name" property="industryCategoryName" />
+        <result column="hierarchical_manage_type" property="hierarchicalManageType" />
+        <result column="area_type" property="areaType" />
+        <result column="fire_brigade_name" property="fireBrigadeName" />
+        <result column="mobilization_name" property="mobilizationName" />
+        <result column="bdp_audit" property="bdpAudit" />
+        <result column="union_key" property="unionKey" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemFireStatisticsMapper.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.fire.mapper.DemFireStatisticsMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemFireStatistics">
+        <id column="id" property="id" />
+        <result column="fire_number" property="fireNumber" />
+        <result column="fill_time" property="fillTime" />
+        <result column="user_name" property="userName" />
+        <result column="brief_report" property="briefReport" />
+        <result column="fire_case_url" property="fireCaseUrl" />
+        <result column="fire_rescue_form" property="fireRescueForm" />
+        <result column="mobilization_desc" property="mobilizationDesc" />
+        <result column="fire_time_text" property="fireTimeText" />
+        <result column="fire_time" property="fireTime" />
+        <result column="fire_address" property="fireAddress" />
+        <result column="company_code" property="companyCode" />
+        <result column="owner_name" property="ownerName" />
+        <result column="fire_build_spread" property="fireBuildSpread" />
+        <result column="flash_over" property="flashOver" />
+        <result column="door_window_open" property="doorWindowOpen" />
+        <result column="fire_process" property="fireProcess" />
+        <result column="direct_property_loss" property="directPropertyLoss" />
+        <result column="burned_area" property="burnedArea" />
+        <result column="affected_house" property="affectedHouse" />
+        <result column="victim_number" property="victimNumber" />
+        <result column="death_toll" property="deathToll" />
+        <result column="injured_number" property="injuredNumber" />
+        <result column="major_fire" property="majorFire" />
+        <result column="file_case" property="fileCase" />
+        <result column="investigate_number" property="investigateNumber" />
+        <result column="suggest_handle_number" property="suggestHandleNumber" />
+        <result column="review_status" property="reviewStatus" />
+        <result column="last_reviewer" property="lastReviewer" />
+        <result column="modify_reason" property="modifyReason" />
+        <result column="under_investiga" property="underInvestiga" />
+        <result column="returnee" property="returnee" />
+        <result column="fire_grade" property="fireGrade" />
+        <result column="minor_injurie_number" property="minorInjurieNumber" />
+        <result column="seriously_injure_number" property="seriouslyInjureNumber" />
+        <result column="site_disposal_expense" property="siteDisposalExpense" />
+        <result column="personal_injury_death" property="personalInjuryDeath" />
+        <result column="direct_economic_loss" property="directEconomicLoss" />
+        <result column="subordinate_fire_brigade" property="subordinateFireBrigade" />
+        <result column="subordinate_brigade" property="subordinateBrigade" />
+        <result column="subordinate_detachment" property="subordinateDetachment" />
+        <result column="subordinate_corps" property="subordinateCorps" />
+        <result column="subordinate_district" property="subordinateDistrict" />
+        <result column="administrative_division" property="administrativeDivision" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>