songhuangfeng123
2022-09-19 ab2b3291cb9e21885ed878d60f5afd6640d830f3
Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
已修改51个文件
601 ■■■■■ 文件已修改
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java 85 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -70,9 +70,6 @@
    /**
     * 应急预案废止/还原
     */
    /**
     * 应急预案详情
     */
    @RequestMapping(value = "/updateAbolish",method = RequestMethod.GET)
    public ResultVO updateAbolish(Long id ,Boolean abolishStatus){
        return emergencyPlanService.updateAbolish(id,abolishStatus);
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanLogController.java
@@ -49,7 +49,7 @@
    }
    /**
     * 应急预案修改
     * 应急预案启动记录修改
     */
    @RequestMapping(value = "/update",method = RequestMethod.POST)
    public ResultVO updateEmergencyPlanLog(Authentication authentication, @RequestBody EmergencyPlanLogReqDTO emergencyPlanLogReqDTO) {
@@ -58,7 +58,7 @@
    }
    /**
     * 应急预案删除/批量删除
     * 应急预案启动记录删除/批量删除
     */
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencyPlanLog(@RequestBody  Long[] ids){
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesMaintainController.java
@@ -24,7 +24,7 @@
    private EmergencySuppliesMaintainService emergencySuppliesMaintainService;
    /**
     * 应急物资检查列表
     * 应急物资保养列表
     */
    @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
    private ResultVO<List<EmergencySuppliesMaintainPageRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesMaintainQuery> pageQuery){
@@ -33,7 +33,7 @@
    }
    /**
     * 应急物资检查新增
     * 应急物资保养新增
     */
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO addEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
@@ -42,7 +42,7 @@
    }
    /**
     * 应急物资检查详情
     * 应急物资保养详情
     */
    @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
    public ResultVO<EmergencySuppliesMaintainDetailRespDTO> getEmergencySuppliesMaintainById(@PathVariable("id")Long id){
@@ -50,7 +50,7 @@
    }
    /**
     * 应急物资检查修改
     * 应急物资保养修改
     */
    @RequestMapping(value = "/update",method = RequestMethod.POST)
    public ResultVO updateEmergencySuppliesMaintain(Authentication authentication, @RequestBody EmergencySuppliesMaintainReqDTO emergencySuppliesMaintainReqDTO) {
@@ -59,7 +59,7 @@
    }
    /**
     * 应急物资检查删除/批量删除
     * 应急物资保养删除/批量删除
     */
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteEmergencySuppliesMaintain(@RequestBody Long[] ids){
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillEvaluationReqDTO.java
@@ -11,43 +11,42 @@
    private Long id;
    // 应急演练实施的id  帮助数据进行筛选
    // 应急演练实施的id
    private Long drillExecuteId;
    //适宜性
    private Byte suitable;
    //充分性
    private Byte sufficient;
    //人员到位情况
    private Byte arrival;
    //物资到位情况-现场物资
    private Byte supplies;
    //物资到位情况-个人防护
    private Byte protection;
    //协调组织情况-整体组织
    private Byte whole;
    //协调组织情况-疏散组分工
    private Byte division;
    //实战效果评价
    private Byte effect;
    //支援部门和协作有效性-报告上级
    private Byte report;
    //支援部门和协作有效性-安全部门
    private Byte safety;
    //支援部门和协作有效性-救援后勤部门
    private Byte rescue;
    //支援部门和协作有效性-警戒撤离配合
    private Byte evacuate;
    //是否需要修改应急预案:0否1是
    private Boolean needModify;
    //存在问题和改进措施
    private String questionAndImprove;
    //修改内容
    private String modifyContent;
    //文件列表
    private List<EmergencyDrillEvaluationFileReqDTO> fileList;
    //人员列表
    private List<EmergencyDrillEvaluationUserReqDTO> userList;
    public Long getId() {
        return id;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillExecuteReqDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillExecuteReqDTO {
    //记录人名称
    private String recordUserName;
    public String getRecordUserName() {
@@ -19,18 +19,18 @@
    }
    private Long id;
    //状态 0:待评价 1 :已评价
    private Boolean status;
    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;
    //演练计划id
    private Long drillPlanId;
    //记录人uid
    private Long recordUserUid;
    //演练过程描述
    private String processDesc;
    //人员列表
    private List<EmergencyDrillExecuteUserReqDTO> userList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyDrillPlanReqDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillPlanReqDTO {
    //计划制定人名称
    private String makingUserName;
    public String getMakingUserName() {
@@ -20,41 +20,41 @@
    private Long id;
    //状态
    private Integer status;
    //计划制定日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date makingPlanDate;
    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
    //计划制定人uid
    private Long makingUserUid;
    //计划制定部门ID
    private Long makingDepartmentId;
    //应急预案ID
    private Long planId;
    //主办部门ID
    private Long departmentId;
    //演练经费
    private BigDecimal drillExpense;
    //演练级别(数据字典)
    private Byte drillLevel;
    //演练地点
    private String drillAddress;
    //演练名称
    private String drillName;
    //演练方式(数据字典)
    private Byte drillWay;
    //保险措施
    private String insuranceMeasures;
    //备注
    private String remark;
    //演练目的
    private String purpose;
    //文件列表
    private List<EmergencyDrillPlanFileReqDTO> fileList;
    //人员列表
    private List<EmergencyDrillPlanUserReqDTO> userList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanLogReqDTO.java
@@ -6,9 +6,9 @@
public class EmergencyPlanLogReqDTO {
    private Long id;
    //预案id
    private Long planId;
    //备注
    private String remark;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyPlanReqDTO.java
@@ -6,7 +6,7 @@
import java.util.List;
public class EmergencyPlanReqDTO {
    //编写人名称
    private String authorName;
    public String getAuthorName() {
@@ -18,30 +18,30 @@
    }
    private Long id;
    //状态
    private Integer status;
    //发布实施日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;
    //编写人uid
    private Long authorUid;
    //编写部门id
    private Long authorDeptId;
    //危险源关联:0否1是
    private Boolean associatedDanger;
    //预案类型(数据字典)
    private Byte type;
    //预案级别(数据字典)
    private Byte level;
    //预案名称
    private String name ;
    private List<EmergencyPlanAreaReqDTO> areaList;
    //部门列表
    private List<EmergencyPlanDepartmentReqDTO> deptList;
    //文件列表
    private List<EmergencyPlanFileReqDTO> fileList;
    //队伍列表
    private List<EmergencyPlanTeamReqDTO> teamList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectReqDTO.java
@@ -10,12 +10,14 @@
public class EmergencySuppliesInspectReqDTO {
    private Long id;
    //物资id
    private Long suppliesId;
    //检查结果
    private String inspectResult;
    //检查时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectTime;
    //检查人列表
    private List<EmergencySuppliesInspectUserReqDTO> userList;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesInspectUserReqDTO.java
@@ -2,7 +2,7 @@
public class EmergencySuppliesInspectUserReqDTO {
    //人员名称
    private String userName;
    public String getUserName() {
@@ -14,8 +14,9 @@
    }
    private Long id;
    //检查id
    private Long inspectId;
    //人员uid
    private Long userUid;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainReqDTO.java
@@ -8,12 +8,14 @@
public class EmergencySuppliesMaintainReqDTO {
    private Long id;
    //物资id
    private Long suppliesId;
    //保养结果
    private String maintainResult;
    //保养时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;
    //包养人列表
    private List<EmergencySuppliesMaintainUserReqDTO> userList;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesMaintainUserReqDTO.java
@@ -2,7 +2,7 @@
public class EmergencySuppliesMaintainUserReqDTO {
    //人员名称
    private String userName;
    public String getUserName() {
@@ -14,8 +14,9 @@
    }
    private Long id;
    //保养id
    private Long maintainId;
    //人员uid
    private Long userUid;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencySuppliesReqDTO.java
@@ -8,7 +8,7 @@
import java.util.Date;
public class EmergencySuppliesReqDTO {
    //负责人名称
    private String principalUserName;
    public String getPrincipalUserName() {
@@ -20,29 +20,49 @@
    }
    private Long id;
    //生产日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date productionDate;
    //投用日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date useDate;
    //检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectDate;
    //下次检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date nextInspectDate;
    //检查周期/月
    private Integer inspectPeriod;
    //存储数量
    private Integer count;
    //使用期限/天
    private Integer usePeriod;
    //负责部门id
    private Long departmentId;
    //负责人uid
    private Long principalUserUid;
    //状态(数据字典)
    private Byte status;
    //分类(数据字典)
    private Byte classification;
    //名称
    private String name;
    //编号
    private String number;
    //型号
    private String model;
    //经度
    private String longitude;
    //维度
    private String latitude;
    //用途
    private String use;
    //所属区域
    private Long areaId;
    //存放位置
    private String place;
    //使用说明
    private String useExplain;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamMemberReqDTO.java
@@ -4,19 +4,19 @@
public class EmergencyTeamMemberReqDTO {
    private Long id;
    //队伍id
    private Long teamId;
    //人员uid
    private Long userUid;
    //人员性别
    private Boolean gender;
    //人员工号
    private String jobNumber;
    //人员名称
    private String name;
    //手机号码
    private String phone;
    //职位
    private String position;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyTeamReqDTO.java
@@ -4,6 +4,7 @@
public class EmergencyTeamReqDTO {
    //负责人名称
    private String principalName;
    public String getPrincipalName() {
@@ -16,22 +17,31 @@
    private Long id;
    //负责人uid
    private Long principalUid;
    //负责人部门id
    private Long principalDepartmentId;
    //队伍级别(数据字典)
    private Byte teamLevel;
    //队伍名称
    private String teamName;
    //负责人手机
    private String principalPhone;
    //固定电话
    private String telephoneNumber;
    //队伍描述
    private String teamDesc;
    //文件列表
    private List<EmergencyTeamFileReqDTO> fileList;
    //人员列表
    private List<EmergencyTeamMemberReqDTO> memberList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/req/EmergencyWorkApproveReqDTO.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.req;
public class EmergencyWorkApproveReqDTO {
    //排序
    private Integer sort ;
    public Integer getSort() {
@@ -28,7 +28,7 @@
    private String approvePersonName;
    //审批状态 1:未审批 2:审批中 3:审批完成
    private Integer approveStatus;
    //审批意见
    //审批结果 0不通过 1通过
    private Boolean approveResult;
    //审批意见
    private String approveMemo;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationDetailRespDTO.java
@@ -8,9 +8,9 @@
public class EmergencyDrillEvaluationDetailRespDTO {
    // 应急演练计划
    // 应急预案名称
    private String emergencyPlanName;
    // 计划制定人名称
    private String makingUserName;
    public String getEmergencyPlanName() {
@@ -28,39 +28,39 @@
    public void setMakingUserName(String makingUserName) {
        this.makingUserName = makingUserName;
    }
    //计划制定日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date makingPlanDate;
    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date drillPlanDate;
    //计划制定人uid
    private Long makingUserUid;
    //计划制定部门ID
    private Long makingDepartmentId;
    //主办部门ID
    private Long departmentId;
    //演练经费
    private BigDecimal drillExpense;
    //演练级别(数据字典)
    private Byte drillLevel;
    //演练地点
    private String drillAddress;
    //演练名称
    private String drillName;
    //演练方式(数据字典)
    private Byte drillWay;
    //保险措施
    private String insuranceMeasures;
    //备注
    private String remark;
    //演练目的
    private String purpose;
    //演练计划文件列表
    private List<EmergencyDrillPlanFileRespDTO> planFileList;
    //演练计划人员列表
    private List<EmergencyDrillPlanUserRespDTO> planUserList;
    //演练计划负责人人员列表
    private List<EmergencyDrillPlanUserRespDTO> planChargeUserList;
    public List<EmergencyDrillPlanUserRespDTO> getPlanChargeUserList() {
@@ -73,6 +73,7 @@
    // 应急演练实施
    //记录人名称
    private String recordUserName;
    public String getRecordUserName() {
@@ -82,55 +83,55 @@
    public void setRecordUserName(String recordUserName) {
        this.recordUserName = recordUserName;
    }
    //演练计划id
    private Long drillPlanId;
    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date drillRecordDate;
    //记录人uid
    private Long recordUserUid;
    //演练过程描述
    private String processDesc;
    //演练计划实施人员列表
    private List<EmergencyDrillExecuteUserRespDTO> executeUserList;
    // 评价
    // 评价id
    private Long id;
    //演练实施ID
    private Long drillExecuteId;
    //适宜性
    private Byte suitable;
    //充分性
    private Byte sufficient;
    //人员到位情况
    private Byte arrival;
    //物资到位情况-现场物资
    private Byte supplies;
    //物资到位情况-个人防护
    private Byte protection;
    //协调组织情况-整体组织
    private Byte whole;
    //协调组织情况-疏散组分工
    private Byte division;
    //实战效果评价
    private Byte effect;
    //支援部门和协作有效性-报告上级
    private Byte report;
    //支援部门和协作有效性-安全部门
    private Byte safety;
    //支援部门和协作有效性-救援后勤部门
    private Byte rescue;
    //支援部门和协作有效性-警戒撤离配合
    private Byte evacuate;
    //是否需要修改应急预案:0否1是
    private Boolean needModify;
    //存在问题和改进措施
    private String questionAndImprove;
    //修改内容
    private String modifyContent;
    //评价文件列表
    private List<EmergencyDrillEvaluationFileRespDTO> evaluationFileList;
    //评价人员列表
    private List<EmergencyDrillEvaluationUserRespDTO> evaluationUserList;
    public Date getMakingPlanDate() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillEvaluationPageRespDTO.java
@@ -5,7 +5,7 @@
import java.util.Date;
public class EmergencyDrillEvaluationPageRespDTO {
    //应急预案名称
    private String emergencyPlanName;
    public String getEmergencyPlanName() {
@@ -15,18 +15,18 @@
    public void setEmergencyPlanName(String emergencyPlanName) {
        this.emergencyPlanName = emergencyPlanName;
    }
    //演练名称
    private String drillName;
    //演练地点
    private String drillAddress;
    //演练方式
    private Byte drillWay;
    //演练级别
    private Byte drillLevel;
    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;
@@ -79,7 +79,7 @@
    }
    private Long id;
    //演练实施id
    private Long drillExecuteId;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecuteDetailRespDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillExecuteDetailRespDTO {
    //记录人名称
    private String recordUserName;
    public String getRecordUserName() {
@@ -17,7 +17,7 @@
    public void setRecordUserName(String recordUserName) {
        this.recordUserName = recordUserName;
    }
    // 演练名称
    private String drillName;
    public String getDrillName() {
@@ -29,18 +29,18 @@
    }
    private Long id;
    //状态 0:待评价 1 :已评价
    private Boolean status;
    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;
    //演练计划id
    private Long drillPlanId;
    //记录人uid
    private Long recordUserUid;
    //演练过程描述
    private String processDesc;
    //人员列表
    private List<EmergencyDrillExecuteUserRespDTO> userList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillExecutePageRespDTO.java
@@ -5,18 +5,18 @@
import java.util.Date;
public class EmergencyDrillExecutePageRespDTO {
    //演练名称
    private String drillName;
    //演练地点
    private String drillAddress;
    //演练方式
    private Byte drillWay;
    //演练级别
    private Byte drillLevel;
    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
    //预案名称
    private String emergencyPlanName;
    public String getDrillName() {
@@ -68,12 +68,12 @@
    }
    private Long id;
    //状态 0:待评价 1 :已评价
    private Boolean status;
    //演练记录时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillRecordDate;
    //演练计划id
    private Long drillPlanId;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanDetailRespDTO.java
@@ -7,7 +7,7 @@
import java.util.List;
public class EmergencyDrillPlanDetailRespDTO {
    //预案名称
    private String planName;
    public String getPlanName() {
@@ -17,7 +17,7 @@
    public void setPlanName(String planName) {
        this.planName = planName;
    }
    //计划制定人名称
    private String makingUserName;
    public String getMakingUserName() {
@@ -29,46 +29,46 @@
    }
    private Long id;
    //更新日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtModitify;
    //状态
    private Integer status;
    //计划制定日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date makingPlanDate;
    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
    //计划制定人uid
    private Long makingUserUid;
    //计划制定部门ID
    private Long makingDepartmentId;
    //应急预案ID
    private Long planId;
    //主办部门ID
    private Long departmentId;
    //演练经费
    private BigDecimal drillExpense;
    //演练级别(数据字典)
    private Byte drillLevel;
    //演练地点
    private String drillAddress;
    //演练名称
    private String drillName;
    //演练方式(数据字典)
    private Byte drillWay;
    //保险措施
    private String insuranceMeasures;
    //备注
    private String remark;
    //演练目的
    private String purpose;
    //文件列表
    private List<EmergencyDrillPlanFileRespDTO> fileList;
    //人员列表
    private List<EmergencyDrillPlanUserRespDTO> userList;
    //负责人列表
    private List<EmergencyDrillPlanUserRespDTO> chargeUserList;
    public List<EmergencyDrillPlanUserRespDTO> getChargeUserList() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyDrillPlanPageRespDTO.java
@@ -7,18 +7,18 @@
public class EmergencyDrillPlanPageRespDTO {
    private Long id;
    //预案名称
    private String drillName;
    //演练地点
    private String drillAddress;
    //演练方式(数据字典)
    private Byte drillWay;
    //演练级别(数据字典)
    private Byte drillLevel;
    //计划演练日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date drillPlanDate;
    //更新日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtModitify;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanDetailRespDTO.java
@@ -6,7 +6,7 @@
import java.util.List;
public class EmergencyPlanDetailRespDTO {
    //编写人名称
    private String authorName;
    public String getAuthorName() {
@@ -18,30 +18,30 @@
    }
    private Long id;
    //状态
    private Integer status;
    //发布实施日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;
    //编写人uid
    private Long authorUid;
    //编写部门id
    private Long authorDeptId;
    //危险源关联:0否1是
    private Boolean associatedDanger;
    //预案类型(数据字典)
    private Byte type;
    //预案级别(数据字典)
    private Byte level;
    //预案名称
    private String name ;
    private List<EmergencyPlanAreaRespDTO> areaList;
    //部门列表
    private List<EmergencyPlanDepartmentRespDTO> deptList;
    //文件列表
    private List<EmergencyPlanFileRespDTO> fileList;
    //队伍列表
    private List<EmergencyPlanTeamRespDTO> teamList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanLogRespDTO.java
@@ -6,6 +6,7 @@
public class EmergencyPlanLogRespDTO {
    //预案名称
    private String planName;
    public String getPlanName() {
@@ -15,7 +16,7 @@
    public void setPlanName(String planName) {
        this.planName = planName;
    }
    //启动人名称
    private String  userName;
    public String getUserName() {
@@ -27,14 +28,14 @@
    }
    private Long id;
    //预案id
    private Long planId;
    //启动人id
    private Long userUid;
    //启动时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date startCreate;
    //备注
    private String remark;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyPlanPageRespDTO.java
@@ -50,6 +50,7 @@
        this.checkApprove = checkApprove;
    }
    //编写人名称
    private  String authorName;
    public String getAuthorName() {
@@ -61,15 +62,15 @@
    }
    private Long id;
    // 预案名称
    private String name ;
    //预案状态
    private Integer status ;
    //预案类型(数据字典)
    private Byte type;
    //预案级别(数据字典)
    private Byte level;
    //发布实施日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date releaseDate;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesDetailRespDTO.java
@@ -12,9 +12,9 @@
import java.util.List;
public class EmergencySuppliesDetailRespDTO {
    //保养列表
    private List<EmergencySuppliesMaintainDetailRespDTO> maintainList;
    //检查列表
    private List<EmergencySuppliesInspectDetailRespDTO> inspectList;
    public List<EmergencySuppliesMaintainDetailRespDTO> getMaintainList() {
@@ -32,7 +32,7 @@
    public void setInspectList(List<EmergencySuppliesInspectDetailRespDTO> inspectList) {
        this.inspectList = inspectList;
    }
    //负责人名称
    private String principalUserName;
    public String getPrincipalUserName() {
@@ -45,29 +45,49 @@
    @TableId(type = IdType.AUTO)
    private Long id;
    //生产日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date productionDate;
    //投用日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date useDate;
    //检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectDate;
    //下次检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date nextInspectDate;
    //检查周期/月
    private Integer inspectPeriod;
    //存储数量
    private Integer count;
    //使用期限/天
    private Integer usePeriod;
    //负责部门id
    private Long departmentId;
    //负责人uid
    private Long principalUserUid;
    //状态(数据字典)
    private Byte status;
    //分类(数据字典)
    private Byte classification;
    //名称
    private String name;
    //编号
    private String number;
    //型号
    private String model;
    //经度
    private String longitude;
    //维度
    private String latitude;
    //用途
    private String use;
    //所属区域
    private Long areaId;
    //存放位置
    private String place;
    //使用说明
    private String useExplain;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectDetailRespDTO.java
@@ -8,7 +8,7 @@
import java.util.List;
public class EmergencySuppliesInspectDetailRespDTO {
    //物资名称
    private String suppliesName;
    public String getSuppliesName() {
@@ -20,12 +20,14 @@
    }
    private Long id;
    //物资id
    private Long suppliesId;
    //检查结果
    private String inspectResult;
    //检查日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectTime;
    //检查人列表
    private List<EmergencySuppliesInspectUserRespDTO> userList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectPageRespDTO.java
@@ -7,7 +7,7 @@
import java.util.Date;
public class EmergencySuppliesInspectPageRespDTO {
    //物资名称
    private String suppliesName;
    public String getSuppliesName() {
@@ -19,9 +19,11 @@
    }
    private Long id;
    //物资id
    private Long suppliesId;
    //检查结果
    private String inspectResult;
    //检查时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date inspectTime;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesInspectUserRespDTO.java
@@ -3,7 +3,7 @@
import java.util.Date;
public class EmergencySuppliesInspectUserRespDTO {
    //物资名称
    private String userName;
    public String getUserName() {
@@ -15,8 +15,9 @@
    }
    private Long id;
    //物资id
    private Long inspectId;
    //人员uid
    private Long userUid;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainDetailRespDTO.java
@@ -8,7 +8,7 @@
import java.util.List;
public class EmergencySuppliesMaintainDetailRespDTO {
    //物资名称
    private String suppliesName;
    public String getSuppliesName() {
@@ -20,12 +20,14 @@
    }
    private Long id;
    //物资id
    private Long suppliesId;
    //保养id
    private String maintainResult;
    //保养时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;
    //保养人id
    private List<EmergencySuppliesMaintainUserRespDTO> userList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainPageRespDTO.java
@@ -7,7 +7,7 @@
import java.util.Date;
public class EmergencySuppliesMaintainPageRespDTO {
    //物资名称
    private String suppliesName;
    public String getSuppliesName() {
@@ -19,9 +19,11 @@
    }
    private Long id;
    //物资id
    private Long suppliesId;
    //保养结果
    private String maintainResult;
    //保养时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date maintainTime;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesMaintainUserRespDTO.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.model.dto.resp;
public class EmergencySuppliesMaintainUserRespDTO {
    //人呀名称
    private String userName;
    public String getUserName() {
@@ -13,8 +13,9 @@
    }
    private Long id;
    //保养id
    private Long maintainId;
    //保养人uid
    private Long userUid;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencySuppliesPageRespDTO.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
public class EmergencySuppliesPageRespDTO {
    //部门名称
    private String deptName;
    public String getDeptName() {
@@ -17,12 +17,17 @@
    }
    private Long id;
    //名称
    private String name;
    //编号
    private String number;
    //负责部门id
    private Long departmentId;
    //分类(数据字典)
    private String classification;
    //存放位置
    private String place;
    //存储数量
    private Integer count;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamDetailRespDTO.java
@@ -4,7 +4,7 @@
import java.util.List;
public class EmergencyTeamDetailRespDTO {
    //负责人名称
    private String principalName;
    public String getPrincipalName() {
@@ -16,23 +16,23 @@
    }
    private Long id;
    //负责人uid
    private Long principalUid;
    //负责人部门id
    private Long principalDepartmentId;
    //队伍级别(数据字典)
    private Byte teamLevel;
    //队伍名称
    private String teamName;
    //负责人手机
    private String principalPhone;
    //固定电话
    private String telephoneNumber;
    //队伍描述
    private String teamDesc;
    //文件列表
    private List<EmergencyTeamFileRespDTO> fileList;
    //人员列表
    private List<EmergencyTeamMemberRespDTO> memberList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamMemberRespDTO.java
@@ -4,19 +4,19 @@
public class EmergencyTeamMemberRespDTO {
    private Long id;
    //队伍id
    private Long teamId;
    //用户uid
    private Long userUid;
    //性别 0男1女
    private Boolean gender;
    //人员工号
    private String jobNumber;
    //人员名称
    private String name;
    //手机号码
    private String phone;
    //职位
    private String position;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyTeamPageRespDTO.java
@@ -6,15 +6,15 @@
public class EmergencyTeamPageRespDTO {
    private Long id;
    //队伍级别(数据字典)
    private Byte teamLevel;
    //队伍名称
    private String teamName;
    //负责人手机
    private String principalPhone;
    //队伍描述
    private String teamDesc;
    //文件列表
    private List<EmergencyTeamFileRespDTO> fileList;
    public Long getId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApproveDetailRespDTO.java
@@ -5,7 +5,7 @@
import java.util.Date;
public class EmergencyWorkApproveDetailRespDTO {
    //排序
    private Integer sort ;
    public Integer getSort() {
@@ -17,7 +17,7 @@
    }
    private Long id;
    //更新时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtCreate;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/model/dto/resp/EmergencyWorkApprovePageRespDTO.java
@@ -5,7 +5,7 @@
import java.util.Date;
public class EmergencyWorkApprovePageRespDTO {
    //排序
    private Integer sort ;
    public Integer getSort() {
@@ -17,6 +17,7 @@
    }
    private Long id;
    //更新时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date gmtCreate;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillExecuteQuery.java
@@ -2,6 +2,7 @@
public class EmergencyDrillExecuteQuery {
    //状态 0:待评价 1 :已评价
    private Boolean status;
    public Boolean getStatus() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyDrillPlanQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencyDrillPlanQuery {
    //演练名称
    private String drillName;
    public String getDrillName() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanLogQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencyPlanLogQuery {
    //预案id
    private Long planId ;
    public Long getPlanId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyPlanQuery.java
@@ -2,6 +2,7 @@
public class EmergencyPlanQuery {
    //废止状态 0:未废止 1:已废止
    private Boolean abolishStatus;
    public Boolean getAbolishStatus() {
@@ -12,8 +13,9 @@
        this.abolishStatus = abolishStatus;
    }
    //预案名称
    private String name ;
    //预案类型
    private Byte type ;
    public String getName() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesInspectQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencySuppliesInspectQuery {
    //物资id
    private Long suppliesId ;
    public Long getSuppliesId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesMaintainQuery.java
@@ -1,7 +1,7 @@
package com.gkhy.safePlatform.emergency.query;
public class EmergencySuppliesMaintainQuery {
    //物资id
    private Long suppliesId ;
    public Long getSuppliesId() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencySuppliesQuery.java
@@ -2,6 +2,7 @@
public class EmergencySuppliesQuery {
    //物资名称
    private String name ;
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyTeamQuery.java
@@ -2,8 +2,10 @@
public class EmergencyTeamQuery {
    //队伍名称
    private String teamName ;
    //队伍级别
    private Byte teamLevel ;
    public String getTeamName() {
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/query/EmergencyWorkApproveQuery.java
@@ -5,9 +5,9 @@
import java.util.Date;
public class EmergencyWorkApproveQuery {
    //关联业务类型 1:应急预案
    private Integer relateType;
    //业务id
    private Long relateId;
    public Integer getRelateType() {
@@ -25,10 +25,10 @@
    public void setRelateId(Long relateId) {
        this.relateId = relateId;
    }
    //开始时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date startTime;
    //结束时间
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date endTime;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
@@ -64,7 +64,7 @@
        return this.rewardPunishmentDetailService.queryAll(pageQuery);
    }
    /**
     * 通过主键查询单条数据
@@ -134,4 +134,4 @@
        rewardPunishmentDetailService.exportData(queryCriteria);
    }
}
}
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java
@@ -87,8 +87,8 @@
     * 事故快报伤亡人员删除
     */
    @RequestMapping(value = "/casualty/del/{accidentExpressId}",method = RequestMethod.GET)
    public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long accidentExpressId){
        return accidentExpressService.delAccidentExpressCasualty(accidentExpressId);
    public ResultVO delAccidentExpressCasualty(@PathVariable("accidentExpressId")Long id){
        return accidentExpressService.delAccidentExpressCasualty(id);
    }
}
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java
@@ -28,5 +28,5 @@
    ResultVO addAccidentExpressCasualty(Long uid, AccidentExpressCasualtyReqDTO accidentExpressCasualtyReqDTO);
    ResultVO delAccidentExpressCasualty(Long accidentExpressId);
    ResultVO delAccidentExpressCasualty(Long id);
}
incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java
@@ -273,8 +273,8 @@
    }
    @Override
    public ResultVO delAccidentExpressCasualty(Long accidentExpressId) {
        accidentExpressCasualtyInfoService.deleteAccidentExpressCasualtyById(accidentExpressId);
    public ResultVO delAccidentExpressCasualty(Long id) {
        accidentExpressCasualtyInfoService.deleteAccidentExpressCasualtyById(id);
        return new ResultVO(ResultCodes.OK);
    }