songhuangfeng123
2022-09-01 b854d8d7604329dcf99584d15f83ff02076d9e07
假删除fix
已修改61个文件
1413 ■■■■ 文件已修改
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentCheckStandardDetail.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java 163 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareStardardDetail.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTypeMng.java 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentCheckStandardDetailQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTakecareDetailQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTakecareStardardDetailQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTestDetailQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTypeMngQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java 46 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineTemplateController.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentStandardController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutySummaryController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyfileInfoController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineItem.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentDetail.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentStandard.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutySummary.java 62 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetType.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/ExamineItemQueryCriteria.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/ExamineMngQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/ExamineTemplateQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/RewardPunishmentDetailQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/RewardPunishmentStandardQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetCheckAndSubmitQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDivideDetailQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDutySummaryQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDutyWorkApproveQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDutyfileInfoQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetMngQueryCriteria.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetTypeQueryCriteria.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java 86 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentInfoController.java
@@ -1,11 +1,13 @@
package com.gkhy.safePlatform.equipment.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
import com.gkhy.safePlatform.equipment.entity.*;
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentInfoImportExcel;
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentInfoSaveOrUpdate;
import com.gkhy.safePlatform.equipment.model.dto.resp.EquipmentInfoExcel;
import com.gkhy.safePlatform.equipment.utils.DateUtils;
import com.gkhy.safePlatform.equipment.utils.QueryHelpPlus;
import com.gkhy.safePlatform.equipment.utils.poihelper.ExcelLogs;
import com.gkhy.safePlatform.equipment.utils.poihelper.ExcelUtil;
import com.google.common.collect.Lists;
@@ -114,7 +116,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.equipmentInfoService.removeByIds(idList);
        List<EquipmentInfo> delList = new ArrayList<>();
        idList.forEach(f->{
            EquipmentInfo info = new EquipmentInfo();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.equipmentInfoService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
@@ -287,7 +297,7 @@
        response.setHeader("Content-Disposition", "attachment;filename=" + fileName + ".xlsx");
        response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
        queryCriteria.setDelFlag(0);
        List<EquipmentInfoExcel> respList = BeanCopyUtils.copyBeanList(equipmentInfoService.queryAll(queryCriteria), EquipmentInfoExcel.class);
        ExcelUtil.exportExcel(map,respList , response.getOutputStream(),DateUtils.PATTERN_STANDARD);
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
@@ -12,6 +12,7 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentTypeMngQueryCriteria;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -85,7 +86,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.equipmentTypeMngService.removeByIds(idList);
        List<EquipmentTypeMng> delList = new ArrayList<>();
        idList.forEach(f->{
            EquipmentTypeMng info = new EquipmentTypeMng();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.equipmentTypeMngService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/KeypointEquipmentInfoController.java
@@ -106,7 +106,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.keypointEquipmentInfoService.removeByIds(idList);
        List<KeypointEquipmentInfo> delList = new ArrayList<>();
        idList.forEach(f->{
            KeypointEquipmentInfo info = new KeypointEquipmentInfo();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.keypointEquipmentInfoService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentCheckStandardDetail.java
@@ -1,14 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 设备检查标准设置(EquipmentCheckStandardDetail)表实体类
 *
 * @author xurui
 * @since 2022-07-20 09:24:14
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("equipment_check_standard_detail")
@@ -26,7 +29,7 @@
    }
                //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
    private Integer infoTpe;
            private Integer infoTpe;
        
    public Integer getInfoTpe() {
        return infoTpe;
@@ -36,7 +39,7 @@
        this.infoTpe = infoTpe;
    }
                //设备ID/外键
    private Long equipmentId;
            private Long equipmentId;
        
    public Long getEquipmentId() {
        return equipmentId;
@@ -46,7 +49,7 @@
        this.equipmentId = equipmentId;
    }
                //序号
    private String indexNum;
            private String indexNum;
        
    public String getIndexNum() {
        return indexNum;
@@ -56,7 +59,7 @@
        this.indexNum = indexNum;
    }
                //检查内容
    private String checkContent;
            private String checkContent;
        
    public String getCheckContent() {
        return checkContent;
@@ -66,7 +69,7 @@
        this.checkContent = checkContent;
    }
                //检查指标
    private String checkTarget;
            private String checkTarget;
        
    public String getCheckTarget() {
        return checkTarget;
@@ -76,7 +79,7 @@
        this.checkTarget = checkTarget;
    }
                //单位
    private String unit;
            private String unit;
        
    public String getUnit() {
        return unit;
@@ -86,7 +89,7 @@
        this.unit = unit;
    }
                //巡检部位
    private String checkPart;
            private String checkPart;
        
    public String getCheckPart() {
        return checkPart;
@@ -96,7 +99,7 @@
        this.checkPart = checkPart;
    }
                //频次
    private String rate;
            private String rate;
        
    public String getRate() {
        return rate;
@@ -105,5 +108,15 @@
    public void setRate(String rate) {
        this.rate = rate;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentInfo.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 设备设施详细信息(EquipmentInfo)表实体类
 *
 * @author xurui
 * @since 2022-08-03 10:55:54
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("equipment_info")
@@ -30,7 +29,7 @@
    }
                //类型/类别外键
    private Long equipmentTypeId;
            private Long equipmentTypeId;
        
    public Long getEquipmentTypeId() {
        return equipmentTypeId;
@@ -40,7 +39,7 @@
        this.equipmentTypeId = equipmentTypeId;
    }
                //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施 
    private Integer infoType;
            private Integer infoType;
        
    public Integer getInfoType() {
        return infoType;
@@ -50,7 +49,7 @@
        this.infoType = infoType;
    }
                //名称
    private String qName;
            private String qName;
        
    public String getQName() {
        return qName;
@@ -60,7 +59,7 @@
        this.qName = qName;
    }
                //位号
    private String positionNum;
            private String positionNum;
        
    public String getPositionNum() {
        return positionNum;
@@ -70,7 +69,7 @@
        this.positionNum = positionNum;
    }
                //用途
    private String qUsage;
            private String qUsage;
        
    public String getQUsage() {
        return qUsage;
@@ -80,7 +79,7 @@
        this.qUsage = qUsage;
    }
                //型号
    private String model;
            private String model;
        
    public String getModel() {
        return model;
@@ -90,7 +89,7 @@
        this.model = model;
    }
                //单位部门外键
    private Long departmentId;
            private Long departmentId;
        
    public Long getDepartmentId() {
        return departmentId;
@@ -100,7 +99,7 @@
        this.departmentId = departmentId;
    }
                //设置部位
    private String setPart;
            private String setPart;
        
    public String getSetPart() {
        return setPart;
@@ -110,8 +109,8 @@
        this.setPart = setPart;
    }
                //生产日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp produceTime;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp produceTime;
        
    public Timestamp getProduceTime() {
        return produceTime;
@@ -121,7 +120,7 @@
        this.produceTime = produceTime;
    }
                //使用期限(天)
    private String useEndDay;
            private String useEndDay;
        
    public String getUseEndDay() {
        return useEndDay;
@@ -131,7 +130,7 @@
        this.useEndDay = useEndDay;
    }
                //生命周期 1:已使用 2:库存中 3:报废
    private Integer lifeCycle;
            private Integer lifeCycle;
        
    public Integer getLifeCycle() {
        return lifeCycle;
@@ -141,8 +140,8 @@
        this.lifeCycle = lifeCycle;
    }
                //投用日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp useDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp useDate;
        
    public Timestamp getUseDate() {
        return useDate;
@@ -152,7 +151,7 @@
        this.useDate = useDate;
    }
                //维修状态 1:维修中 2:已修好
    private Integer repairStatus;
            private Integer repairStatus;
        
    public Integer getRepairStatus() {
        return repairStatus;
@@ -162,7 +161,7 @@
        this.repairStatus = repairStatus;
    }
                //停用状态 1:停用 2.在用 3.维修 4.报废
    private Integer stopStatus;
            private Integer stopStatus;
        
    public Integer getStopStatus() {
        return stopStatus;
@@ -172,8 +171,8 @@
        this.stopStatus = stopStatus;
    }
                //上次检查日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp previousCheckDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp previousCheckDate;
        
    public Timestamp getPreviousCheckDate() {
        return previousCheckDate;
@@ -183,8 +182,8 @@
        this.previousCheckDate = previousCheckDate;
    }
                //上次检测日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp previousTestDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp previousTestDate;
        
    public Timestamp getPreviousTestDate() {
        return previousTestDate;
@@ -194,8 +193,8 @@
        this.previousTestDate = previousTestDate;
    }
                //上次保养日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp previousTakecareDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp previousTakecareDate;
        
    public Timestamp getPreviousTakecareDate() {
        return previousTakecareDate;
@@ -205,8 +204,8 @@
        this.previousTakecareDate = previousTakecareDate;
    }
                //下次检查日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp nextCheckDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp nextCheckDate;
        
    public Timestamp getNextCheckDate() {
        return nextCheckDate;
@@ -216,8 +215,8 @@
        this.nextCheckDate = nextCheckDate;
    }
                //下次检测日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp nextTestDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp nextTestDate;
        
    public Timestamp getNextTestDate() {
        return nextTestDate;
@@ -227,8 +226,8 @@
        this.nextTestDate = nextTestDate;
    }
                //下次保养日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp nextTakecareDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp nextTakecareDate;
        
    public Timestamp getNextTakecareDate() {
        return nextTakecareDate;
@@ -238,7 +237,7 @@
        this.nextTakecareDate = nextTakecareDate;
    }
                //负责人ID外键
    private Long leadingPersonId;
            private Long leadingPersonId;
        
    public Long getLeadingPersonId() {
        return leadingPersonId;
@@ -248,7 +247,7 @@
        this.leadingPersonId = leadingPersonId;
    }
                //负责人名称
    private String leadingPersonName;
            private String leadingPersonName;
        
    public String getLeadingPersonName() {
        return leadingPersonName;
@@ -258,7 +257,7 @@
        this.leadingPersonName = leadingPersonName;
    }
                //负责人部门外键
    private Long leadingPersonDepartmentId;
            private Long leadingPersonDepartmentId;
        
    public Long getLeadingPersonDepartmentId() {
        return leadingPersonDepartmentId;
@@ -268,7 +267,7 @@
        this.leadingPersonDepartmentId = leadingPersonDepartmentId;
    }
                //供应商
    private String supplyName;
            private String supplyName;
        
    public String getSupplyName() {
        return supplyName;
@@ -278,7 +277,7 @@
        this.supplyName = supplyName;
    }
                //使用说明
    private String useMemo;
            private String useMemo;
        
    public String getUseMemo() {
        return useMemo;
@@ -288,7 +287,7 @@
        this.useMemo = useMemo;
    }
                //是否检查 1:是 2:否
    private Integer isNeedCheck;
            private Integer isNeedCheck;
        
    public Integer getIsNeedCheck() {
        return isNeedCheck;
@@ -298,7 +297,7 @@
        this.isNeedCheck = isNeedCheck;
    }
                //检查周期
    private String checkCycle;
            private String checkCycle;
        
    public String getCheckCycle() {
        return checkCycle;
@@ -308,7 +307,7 @@
        this.checkCycle = checkCycle;
    }
                //检查提前提醒
    private String checkWarn;
            private String checkWarn;
        
    public String getCheckWarn() {
        return checkWarn;
@@ -318,7 +317,7 @@
        this.checkWarn = checkWarn;
    }
                //是否检测 1:是 2:否
    private Integer isNeedTest;
            private Integer isNeedTest;
        
    public Integer getIsNeedTest() {
        return isNeedTest;
@@ -328,7 +327,7 @@
        this.isNeedTest = isNeedTest;
    }
                //检测周期
    private String testCycle;
            private String testCycle;
        
    public String getTestCycle() {
        return testCycle;
@@ -338,7 +337,7 @@
        this.testCycle = testCycle;
    }
                //检测提前提醒
    private String testWarn;
            private String testWarn;
        
    public String getTestWarn() {
        return testWarn;
@@ -348,7 +347,7 @@
        this.testWarn = testWarn;
    }
                //是否保养 1:是 2:否
    private Integer isNeedTakecare;
            private Integer isNeedTakecare;
        
    public Integer getIsNeedTakecare() {
        return isNeedTakecare;
@@ -358,7 +357,7 @@
        this.isNeedTakecare = isNeedTakecare;
    }
                //检查内容
    private String checkContent;
            private String checkContent;
        
    public String getCheckContent() {
        return checkContent;
@@ -368,7 +367,7 @@
        this.checkContent = checkContent;
    }
                //负责部门/外键
    private Long leadingDepartmentId;
            private Long leadingDepartmentId;
        
    public Long getLeadingDepartmentId() {
        return leadingDepartmentId;
@@ -378,7 +377,7 @@
        this.leadingDepartmentId = leadingDepartmentId;
    }
                //检查指标
    private String checkPoint;
            private String checkPoint;
        
    public String getCheckPoint() {
        return checkPoint;
@@ -388,7 +387,7 @@
        this.checkPoint = checkPoint;
    }
                //预警值
    private String alertNum;
            private String alertNum;
        
    public String getAlertNum() {
        return alertNum;
@@ -398,7 +397,7 @@
        this.alertNum = alertNum;
    }
                //联锁值
    private String lockNum;
            private String lockNum;
        
    public String getLockNum() {
        return lockNum;
@@ -408,7 +407,7 @@
        this.lockNum = lockNum;
    }
                //停用理由
    private String stopReason;
            private String stopReason;
        
    public String getStopReason() {
        return stopReason;
@@ -418,7 +417,7 @@
        this.stopReason = stopReason;
    }
                //停用后措施
    private String afterStopStep;
            private String afterStopStep;
        
    public String getAfterStopStep() {
        return afterStopStep;
@@ -428,8 +427,8 @@
        this.afterStopStep = afterStopStep;
    }
                //实际停用日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp actualStopDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp actualStopDate;
        
    public Timestamp getActualStopDate() {
        return actualStopDate;
@@ -439,7 +438,7 @@
        this.actualStopDate = actualStopDate;
    }
                //停用提交人/外键
    private Long stopSubmitPersonId;
            private Long stopSubmitPersonId;
        
    public Long getStopSubmitPersonId() {
        return stopSubmitPersonId;
@@ -449,7 +448,7 @@
        this.stopSubmitPersonId = stopSubmitPersonId;
    }
                //停用提交人名称
    private String stopSubmitPersonName;
            private String stopSubmitPersonName;
        
    public String getStopSubmitPersonName() {
        return stopSubmitPersonName;
@@ -459,8 +458,8 @@
        this.stopSubmitPersonName = stopSubmitPersonName;
    }
                //停用提交日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp stopSubmitDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp stopSubmitDate;
        
    public Timestamp getStopSubmitDate() {
        return stopSubmitDate;
@@ -470,7 +469,7 @@
        this.stopSubmitDate = stopSubmitDate;
    }
                //恢复理由
    private String recoveryReason;
            private String recoveryReason;
        
    public String getRecoveryReason() {
        return recoveryReason;
@@ -480,8 +479,8 @@
        this.recoveryReason = recoveryReason;
    }
                //恢复填报日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp recoverySubmitDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp recoverySubmitDate;
        
    public Timestamp getRecoverySubmitDate() {
        return recoverySubmitDate;
@@ -491,8 +490,8 @@
        this.recoverySubmitDate = recoverySubmitDate;
    }
                //实际恢复日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp actualRecoveryDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp actualRecoveryDate;
        
    public Timestamp getActualRecoveryDate() {
        return actualRecoveryDate;
@@ -502,7 +501,7 @@
        this.actualRecoveryDate = actualRecoveryDate;
    }
                //报废理由
    private String destoryReason;
            private String destoryReason;
        
    public String getDestoryReason() {
        return destoryReason;
@@ -512,8 +511,8 @@
        this.destoryReason = destoryReason;
    }
                //报废填报日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp destorySubmitDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp destorySubmitDate;
        
    public Timestamp getDestorySubmitDate() {
        return destorySubmitDate;
@@ -523,8 +522,8 @@
        this.destorySubmitDate = destorySubmitDate;
    }
                //实际报废日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp actualDestoryDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp actualDestoryDate;
        
    public Timestamp getActualDestoryDate() {
        return actualDestoryDate;
@@ -533,13 +532,9 @@
    public void setActualDestoryDate(Timestamp actualDestoryDate) {
        this.actualDestoryDate = actualDestoryDate;
    }
    //区域ID/外键
    private Long areaId;
    //区域名称
    private String areaName;
                //区域ID
            private Long areaId;
    public Long getAreaId() {
        return areaId;
    }
@@ -547,7 +542,9 @@
    public void setAreaId(Long areaId) {
        this.areaId = areaId;
    }
                //区域名称
            private String areaName;
    public String getAreaName() {
        return areaName;
    }
@@ -555,10 +552,9 @@
    public void setAreaName(String areaName) {
        this.areaName = areaName;
    }
    //保养周期
    private String takecareCycle;
                //保养周期
            private String takecareCycle;
    public String getTakecareCycle() {
        return takecareCycle;
    }
@@ -566,4 +562,15 @@
    public void setTakecareCycle(String takecareCycle) {
        this.takecareCycle = takecareCycle;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentRepairDetail.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 设备维修明细(EquipmentRepairDetail)表实体类
 *
 * @author xurui
 * @since 2022-08-03 11:17:00
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("equipment_repair_detail")
@@ -30,7 +29,7 @@
    }
                //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
    private Integer infoTpe;
            private Integer infoTpe;
        
    public Integer getInfoTpe() {
        return infoTpe;
@@ -40,7 +39,7 @@
        this.infoTpe = infoTpe;
    }
                //设备ID/外键
    private Long equipmentId;
            private Long equipmentId;
        
    public Long getEquipmentId() {
        return equipmentId;
@@ -50,7 +49,7 @@
        this.equipmentId = equipmentId;
    }
                //维修负责人/外键
    private Long repairPersonId;
            private Long repairPersonId;
        
    public Long getRepairPersonId() {
        return repairPersonId;
@@ -60,7 +59,7 @@
        this.repairPersonId = repairPersonId;
    }
                //维修负责人名称
    private String repairPersonName;
            private String repairPersonName;
        
    public String getRepairPersonName() {
        return repairPersonName;
@@ -70,8 +69,8 @@
        this.repairPersonName = repairPersonName;
    }
                //维修开始日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp repairStartDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp repairStartDate;
        
    public Timestamp getRepairStartDate() {
        return repairStartDate;
@@ -81,8 +80,8 @@
        this.repairStartDate = repairStartDate;
    }
                //维修结束日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp repairEndDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp repairEndDate;
        
    public Timestamp getRepairEndDate() {
        return repairEndDate;
@@ -92,7 +91,7 @@
        this.repairEndDate = repairEndDate;
    }
                //维修负责人单位/外键
    private Long repairPersonDepartmentId;
            private Long repairPersonDepartmentId;
        
    public Long getRepairPersonDepartmentId() {
        return repairPersonDepartmentId;
@@ -102,7 +101,7 @@
        this.repairPersonDepartmentId = repairPersonDepartmentId;
    }
                //维修负责人单位名称
    private String repairPersonDepartmentName;
            private String repairPersonDepartmentName;
        
    public String getRepairPersonDepartmentName() {
        return repairPersonDepartmentName;
@@ -112,7 +111,7 @@
        this.repairPersonDepartmentName = repairPersonDepartmentName;
    }
                //维修情况
    private String repairMemo;
            private String repairMemo;
        
    public String getRepairMemo() {
        return repairMemo;
@@ -122,7 +121,7 @@
        this.repairMemo = repairMemo;
    }
                //维修状态  1:维修中 2:已修好
    private Integer repairStatus;
            private Integer repairStatus;
        
    public Integer getRepairStatus() {
        return repairStatus;
@@ -132,7 +131,7 @@
        this.repairStatus = repairStatus;
    }
                //设施异常项
    private String exceptionInfo;
            private String exceptionInfo;
        
    public String getExceptionInfo() {
        return exceptionInfo;
@@ -141,5 +140,15 @@
    public void setExceptionInfo(String exceptionInfo) {
        this.exceptionInfo = exceptionInfo;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareDetail.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 设备保养明细(EquipmentTakecareDetail)表实体类
 *
 * @author xurui
 * @since 2022-08-03 11:14:57
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("equipment_takecare_detail")
@@ -30,7 +29,7 @@
    }
                //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
    private Integer infoTpe;
            private Integer infoTpe;
        
    public Integer getInfoTpe() {
        return infoTpe;
@@ -40,7 +39,7 @@
        this.infoTpe = infoTpe;
    }
                //设备ID/外键
    private Long equipmentId;
            private Long equipmentId;
        
    public Long getEquipmentId() {
        return equipmentId;
@@ -50,7 +49,7 @@
        this.equipmentId = equipmentId;
    }
                //保养内容
    private String takecareMemo;
            private String takecareMemo;
        
    public String getTakecareMemo() {
        return takecareMemo;
@@ -60,7 +59,7 @@
        this.takecareMemo = takecareMemo;
    }
                //保养负责人/外键
    private Long leadingPersonId;
            private Long leadingPersonId;
        
    public Long getLeadingPersonId() {
        return leadingPersonId;
@@ -70,7 +69,7 @@
        this.leadingPersonId = leadingPersonId;
    }
                //保养负责人名称
    private String leadingPersonName;
            private String leadingPersonName;
        
    public String getLeadingPersonName() {
        return leadingPersonName;
@@ -80,8 +79,8 @@
        this.leadingPersonName = leadingPersonName;
    }
                //保养日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp takecareDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp takecareDate;
        
    public Timestamp getTakecareDate() {
        return takecareDate;
@@ -91,7 +90,7 @@
        this.takecareDate = takecareDate;
    }
                //保养负责人单位
    private Long leadingPersonDepartmentId;
            private Long leadingPersonDepartmentId;
        
    public Long getLeadingPersonDepartmentId() {
        return leadingPersonDepartmentId;
@@ -101,7 +100,7 @@
        this.leadingPersonDepartmentId = leadingPersonDepartmentId;
    }
                //保养负责人单位名称
    private String leadingPersonDepartmentName;
            private String leadingPersonDepartmentName;
        
    public String getLeadingPersonDepartmentName() {
        return leadingPersonDepartmentName;
@@ -110,5 +109,15 @@
    public void setLeadingPersonDepartmentName(String leadingPersonDepartmentName) {
        this.leadingPersonDepartmentName = leadingPersonDepartmentName;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTakecareStardardDetail.java
@@ -1,20 +1,23 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 设备保养明细(EquipmentTakecareStardardDetail)表实体类
 *
 * @author xurui
 * @since 2022-07-19 15:22:05
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("equipment_takecare_stardard_detail")
public class EquipmentTakecareStardardDetail extends BaseDomain {
    @TableId(type = IdType.AUTO)
    private Long id;
    public Long getId() {
@@ -25,9 +28,9 @@
        this.id = id;
    }
                //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
    //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
    private Integer infoTpe;
    public Integer getInfoTpe() {
        return infoTpe;
    }
@@ -35,9 +38,9 @@
    public void setInfoTpe(Integer infoTpe) {
        this.infoTpe = infoTpe;
    }
                //设备ID/外键
    //设备ID/外键
    private Long equipmentId;
    public Long getEquipmentId() {
        return equipmentId;
    }
@@ -45,9 +48,9 @@
    public void setEquipmentId(Long equipmentId) {
        this.equipmentId = equipmentId;
    }
                //文件路径
    //文件路径
    private String filePath;
    public String getFilePath() {
        return filePath;
    }
@@ -55,5 +58,15 @@
    public void setFilePath(String filePath) {
        this.filePath = filePath;
    }
    //是否删除 0:未删除 1:删除
    private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTestDetail.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 设备检测明细(EquipmentTestDetail)表实体类
 *
 * @author xurui
 * @since 2022-08-03 11:15:57
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("equipment_test_detail")
@@ -30,7 +29,7 @@
    }
                //具体类型(页面左侧的导航栏使用) 0:仪器仪表信息 1:生产设备设施 2:安全设备设施  3:重点监管装置/设备
    private Integer infoTpe;
            private Integer infoTpe;
        
    public Integer getInfoTpe() {
        return infoTpe;
@@ -40,7 +39,7 @@
        this.infoTpe = infoTpe;
    }
                //设备ID/外键
    private Long equipmentId;
            private Long equipmentId;
        
    public Long getEquipmentId() {
        return equipmentId;
@@ -50,7 +49,7 @@
        this.equipmentId = equipmentId;
    }
                //检测人/外键
    private Long testPersonId;
            private Long testPersonId;
        
    public Long getTestPersonId() {
        return testPersonId;
@@ -60,7 +59,7 @@
        this.testPersonId = testPersonId;
    }
                //检测人名称
    private String testPersonName;
            private String testPersonName;
        
    public String getTestPersonName() {
        return testPersonName;
@@ -70,8 +69,8 @@
        this.testPersonName = testPersonName;
    }
                //检测日期
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp testDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp testDate;
        
    public Timestamp getTestDate() {
        return testDate;
@@ -81,7 +80,7 @@
        this.testDate = testDate;
    }
                //检测人单位/外键
    private Long testPersonDepartmentId;
            private Long testPersonDepartmentId;
        
    public Long getTestPersonDepartmentId() {
        return testPersonDepartmentId;
@@ -91,7 +90,7 @@
        this.testPersonDepartmentId = testPersonDepartmentId;
    }
                //检测人单位名称
    private String testPersonDepartmentName;
            private String testPersonDepartmentName;
        
    public String getTestPersonDepartmentName() {
        return testPersonDepartmentName;
@@ -101,7 +100,7 @@
        this.testPersonDepartmentName = testPersonDepartmentName;
    }
                //检测内容
    private String testMemo;
            private String testMemo;
        
    public String getTestMemo() {
        return testMemo;
@@ -111,7 +110,7 @@
        this.testMemo = testMemo;
    }
                //检测结果  1:正常 2:异常
    private Integer testResult;
            private Integer testResult;
        
    public Integer getTestResult() {
        return testResult;
@@ -121,7 +120,7 @@
        this.testResult = testResult;
    }
                //检测状态
    private String testStatus;
            private String testStatus;
        
    public String getTestStatus() {
        return testStatus;
@@ -130,5 +129,15 @@
    public void setTestStatus(String testStatus) {
        this.testStatus = testStatus;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/EquipmentTypeMng.java
@@ -1,20 +1,23 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 设备设施类型管理(EquipmentTypeMng)表实体类
 *
 * @author xurui
 * @since 2022-07-19 08:35:02
 * @since 2022-08-29 08:39:44
 */
@SuppressWarnings("serial")
@TableName("equipment_type_mng")
public class EquipmentTypeMng extends BaseDomain {
    @TableId(type = IdType.AUTO)
    private Long id;
    public Long getId() {
@@ -25,9 +28,9 @@
        this.id = id;
    }
                //类别名称
    //类别名称
    private String typeName;
    public String getTypeName() {
        return typeName;
    }
@@ -35,9 +38,9 @@
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
                //是否为设备内容  1:是 2:否
    //是否为设备内容  1:是 2:否
    private Integer isContent;
    public Integer getIsContent() {
        return isContent;
    }
@@ -45,9 +48,9 @@
    public void setIsContent(Integer isContent) {
        this.isContent = isContent;
    }
                //父级ID,如果没有父级,为0
    //父级ID,如果没有父级,为0
    private Long parentId;
    public Long getParentId() {
        return parentId;
    }
@@ -55,9 +58,9 @@
    public void setParentId(Long parentId) {
        this.parentId = parentId;
    }
                //排序号
    //排序号
    private Integer sortNum;
    public Integer getSortNum() {
        return sortNum;
    }
@@ -65,9 +68,9 @@
    public void setSortNum(Integer sortNum) {
        this.sortNum = sortNum;
    }
                //是否巡检 1:是 2:否
    //是否巡检 1:是 2:否
    private Integer isVisit;
    public Integer getIsVisit() {
        return isVisit;
    }
@@ -75,9 +78,9 @@
    public void setIsVisit(Integer isVisit) {
        this.isVisit = isVisit;
    }
                //是否检测  1:是 2:否
    //是否检测  1:是 2:否
    private Integer isCheck;
    public Integer getIsCheck() {
        return isCheck;
    }
@@ -85,5 +88,15 @@
    public void setIsCheck(Integer isCheck) {
        this.isCheck = isCheck;
    }
    //是否删除 0:未删除 1:删除
    private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/entity/KeypointEquipmentInfo.java
@@ -1,14 +1,17 @@
package com.gkhy.safePlatform.equipment.entity;
import java.sql.Timestamp;
import com.gkhy.safePlatform.equipment.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 重点监管装置/设备 详细信息(KeypointEquipmentInfo)表实体类
 *
 * @author xurui
 * @since 2022-08-09 09:39:39
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("keypoint_equipment_info")
@@ -205,7 +208,6 @@
    public void setScenePic(String scenePic) {
        this.scenePic = scenePic;
    }
    //备注
    private String memo;
@@ -216,5 +218,15 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }
    //是否删除 0:未删除 1:删除
    private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentCheckStandardDetailQueryCriteria.java
@@ -42,6 +42,17 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
        return id;
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentInfoQueryCriteria.java
@@ -18,6 +18,18 @@
    @Query()
    private Integer equipmentTypeId;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    public Integer getEquipmentTypeId() {
        return equipmentTypeId;
    }
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentRepairDetailQueryCriteria.java
@@ -46,6 +46,16 @@
    @Query()
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTakecareDetailQueryCriteria.java
@@ -36,6 +36,16 @@
    @Query()
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTakecareStardardDetailQueryCriteria.java
@@ -27,6 +27,17 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
        return id;
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTestDetailQueryCriteria.java
@@ -43,6 +43,17 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
        return id;
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/EquipmentTypeMngQueryCriteria.java
@@ -13,4 +13,15 @@
    public void setParentId(Long parentId) {
        this.parentId = parentId;
    }
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/model/dto/req/KeypointEquipmentInfoQueryCriteria.java
@@ -27,4 +27,15 @@
    public void setEquipmentTypeId(Integer equipmentTypeId) {
        this.equipmentTypeId = equipmentTypeId;
    }
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/repository/EquipmentInfoRepository.java
@@ -15,7 +15,7 @@
public interface EquipmentInfoRepository extends BaseMapper<EquipmentInfo> {
    @Select("<script> select count(1) from equipment_info m INNER JOIN \n" +
            "(select a.id,max(b.takecare_date) mdate from equipment_info a INNER JOIN equipment_takecare_detail b on a.id = b.equipment_id GROUP BY b.equipment_id) n \n" +
            "on m.id = n.id where DATEDIFF(NOW(),n.mdate) >m.takecare_cycle</script> ")
            "(select a.id,max(b.takecare_date) mdate from equipment_info a INNER JOIN equipment_takecare_detail b on a.id = b.equipment_id WHERE a.del_flag = 0 AND b.del_flag = 0 GROUP BY b.equipment_id) n \n" +
            "on m.id = n.id where DATEDIFF(NOW(),n.mdate) >m.takecare_cycle AND m.del_flag = 0</script> ")
    Object countOverTime();
}
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/EquipmentInfoServiceImpl.java
@@ -233,7 +233,15 @@
        if(StringUtils.hasText(infoDto.getDelTakecareDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelTakecareDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentTakecareDetailService.removeByIds(idList);
            List<EquipmentTakecareDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentTakecareDetail info = new EquipmentTakecareDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentTakecareDetailService.updateBatchById(delList);
        }
@@ -248,7 +256,14 @@
        if(StringUtils.hasText(infoDto.getDelTestDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelTestDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentTestDetailService.removeByIds(idList);
            List<EquipmentTestDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentTestDetail info = new EquipmentTestDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentTestDetailService.updateBatchById(delList);
        }
        //设备检查 TODO
@@ -264,7 +279,14 @@
        if(StringUtils.hasText(infoDto.getDelRepaireDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelRepaireDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentRepairDetailService.removeByIds(idList);
            List<EquipmentRepairDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentRepairDetail info = new EquipmentRepairDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentRepairDetailService.updateBatchById(delList);
        }
        //保存检查标准
@@ -277,7 +299,14 @@
        if(StringUtils.hasText(infoDto.getDelCheckStandardeDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelCheckStandardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentCheckStandardDetailService.removeByIds(idList);
            List<EquipmentCheckStandardDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentCheckStandardDetail info = new EquipmentCheckStandardDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentCheckStandardDetailService.updateBatchById(delList);
        }
        //保存保养标准
@@ -290,7 +319,14 @@
        if(StringUtils.hasText(infoDto.getDelTakecareStardardeDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelTakecareStardardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentTakecareStardardDetailService.removeByIds(idList);
            List<EquipmentTakecareStardardDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentTakecareStardardDetail info = new EquipmentTakecareStardardDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentTakecareStardardDetailService.updateBatchById(delList);
        }
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/service/impl/KeypointEquipmentInfoServiceImpl.java
@@ -246,7 +246,15 @@
        if(StringUtils.hasText(infoDto.getDelTakecareDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelTakecareDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentTakecareDetailService.removeByIds(idList);
            List<EquipmentTakecareDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentTakecareDetail info = new EquipmentTakecareDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentTakecareDetailService.updateBatchById(delList);
        }
        //保存设备检测
@@ -259,7 +267,15 @@
        if(StringUtils.hasText(infoDto.getDelTestDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelTestDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentTestDetailService.removeByIds(idList);
            List<EquipmentTestDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentTestDetail info = new EquipmentTestDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentTestDetailService.updateBatchById(delList);
        }
        //设备检查 TODO
@@ -274,7 +290,15 @@
        if(StringUtils.hasText(infoDto.getDelRepaireDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelRepaireDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentRepairDetailService.removeByIds(idList);
            List<EquipmentRepairDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentRepairDetail info = new EquipmentRepairDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentRepairDetailService.updateBatchById(delList);
        }
        //保存检查标准
        List<EquipmentCheckStandardDetail> checkStandardeDetailList = infoDto.getCheckStandardeDetailList();
@@ -286,7 +310,15 @@
        if(StringUtils.hasText(infoDto.getDelCheckStandardeDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelCheckStandardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentCheckStandardDetailService.removeByIds(idList);
            List<EquipmentCheckStandardDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentCheckStandardDetail info = new EquipmentCheckStandardDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentCheckStandardDetailService.updateBatchById(delList);
        }
        //保存保养标准
        List<EquipmentTakecareStardardDetail> takecareStardardeDetailList = infoDto.getTakecareStardardeDetailList();
@@ -298,7 +330,15 @@
        if(StringUtils.hasText(infoDto.getDelTakecareStardardeDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelTakecareStardardeDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            equipmentTakecareStardardDetailService.removeByIds(idList);
            List<EquipmentTakecareStardardDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                EquipmentTakecareStardardDetail info = new EquipmentTakecareStardardDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            equipmentTakecareStardardDetailService.updateBatchById(delList);
        }
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
@@ -17,6 +17,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -93,7 +94,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.examineMngService.removeByIds(idList);
        List<ExamineMng> delList = new ArrayList<>();
        idList.forEach(f->{
            ExamineMng info = new ExamineMng();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.examineMngService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineTemplateController.java
@@ -7,6 +7,7 @@
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
import com.gkhy.safePlatform.targetDuty.entity.ExamineTemplate;
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateSaveOrUpdate;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
@@ -17,6 +18,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -92,7 +94,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.examineTemplateService.removeByIds(idList);
        List<ExamineTemplate> delList = new ArrayList<>();
        idList.forEach(f->{
            ExamineTemplate info = new ExamineTemplate();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.examineTemplateService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentDetailController.java
@@ -122,7 +122,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.rewardPunishmentDetailService.removeByIds(idList);
        List<RewardPunishmentDetail> delList = new ArrayList<>();
        idList.forEach(f->{
            RewardPunishmentDetail info = new RewardPunishmentDetail();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.rewardPunishmentDetailService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/RewardPunishmentStandardController.java
@@ -109,7 +109,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.rewardPunishmentStandardService.removeByIds(idList);
        List<RewardPunishmentStandard> delList = new ArrayList<>();
        idList.forEach(f->{
            RewardPunishmentStandard info = new RewardPunishmentStandard();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.rewardPunishmentStandardService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutySummaryController.java
@@ -103,7 +103,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.targetDutySummaryService.removeByIds(idList);
        List<TargetDutySummary> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetDutySummary info = new TargetDutySummary();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.targetDutySummaryService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyWorkApproveController.java
@@ -21,6 +21,7 @@
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyWorkApproveQueryCriteria;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.stream.Collectors;
@@ -108,7 +109,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.targetDutyWorkApproveService.removeByIds(idList);
        List<TargetDutyWorkApprove> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetDutyWorkApprove info = new TargetDutyWorkApprove();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.targetDutyWorkApproveService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetDutyfileInfoController.java
@@ -1,4 +1,5 @@
package com.gkhy.safePlatform.targetDuty.controller;
import java.util.ArrayList;
import java.util.Date;
@@ -93,7 +94,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.targetDutyfileInfoService.removeByIds(idList);
        List<TargetDutyfileInfo> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetDutyfileInfo info = new TargetDutyfileInfo();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.targetDutyfileInfoService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
@@ -15,6 +15,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -126,7 +127,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.targetExamineService.removeByIds(idList);
        List<TargetExamine> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetExamine info = new TargetExamine();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.targetExamineService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java
@@ -73,7 +73,7 @@
        PageUtils.checkCheck(pageQuery);
        return this.targetMngService.queryAll(pageQuery);
    }
    /**
     * 通过主键查询单条数据
@@ -121,9 +121,20 @@
        }
        List<Long> idList = Arrays.asList(ids);
        //删除关联表数据
        this.targetDivideDetailService.remove(new QueryWrapper<TargetDivideDetail>().in("target_id",idList));
        UpdateWrapper<TargetDivideDetail> updateWrapper = new UpdateWrapper<>();
        updateWrapper.in("target_id",idList);
        TargetDivideDetail detail = new TargetDivideDetail();
        detail.setDelFlag(1);
        this.targetDivideDetailService.update(detail,updateWrapper);
        this.targetMngService.removeByIds(idList);
        List<TargetMng> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetMng info = new TargetMng();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.targetMngService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
@@ -249,4 +260,4 @@
        System.out.println(JSONObject.toJSONString(mng));
    }
}
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetTypeController.java
@@ -14,6 +14,7 @@
import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetTypeQueryCriteria;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.stream.Collectors;
import javax.annotation.Resource;
@@ -99,7 +100,15 @@
            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
        }
        List<Long> idList = Arrays.asList(ids);
        this.targetTypeService.removeByIds(idList);
        List<TargetType> delList = new ArrayList<>();
        idList.forEach(f->{
            TargetType info = new TargetType();
            info.setDelFlag(1);
            info.setId(f);
            delList.add(info);
        });
        this.targetTypeService.updateBatchById(delList);
        return new ResultVO<>(ResultCodes.OK);
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineItem.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 绩效考核项目(ExamineItem)表实体类
 *
 * @author xurui
 * @since 2022-07-21 11:01:38
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("examine_item")
@@ -28,7 +29,7 @@
    }
                //绩效考核模板ID/外键
    private Long examineTemplateId;
            private Long examineTemplateId;
        
    public Long getExamineTemplateId() {
        return examineTemplateId;
@@ -38,7 +39,7 @@
        this.examineTemplateId = examineTemplateId;
    }
                //类型
    private String itemType;
            private String itemType;
        
    public String getItemType() {
        return itemType;
@@ -48,7 +49,7 @@
        this.itemType = itemType;
    }
                //考核项目
    private String itemDetail;
            private String itemDetail;
        
    public String getItemDetail() {
        return itemDetail;
@@ -58,7 +59,7 @@
        this.itemDetail = itemDetail;
    }
                //考核内容
    private String content;
            private String content;
        
    public String getContent() {
        return content;
@@ -68,7 +69,7 @@
        this.content = content;
    }
                //评定标准
    private String judgeStandard;
            private String judgeStandard;
        
    public String getJudgeStandard() {
        return judgeStandard;
@@ -78,7 +79,7 @@
        this.judgeStandard = judgeStandard;
    }
                //考核说明
    private String memo;
            private String memo;
        
    public String getMemo() {
        return memo;
@@ -87,5 +88,15 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineMng.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 绩效考核管理-安全考核管理(ExamineMng)表实体类
 *
 * @author xurui
 * @since 2022-08-03 10:05:37
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("examine_mng")
@@ -30,7 +29,7 @@
    }
                //绩效考核模板ID/外键
    private Long examineTemplateId;
            private Long examineTemplateId;
        
    public Long getExamineTemplateId() {
        return examineTemplateId;
@@ -40,7 +39,7 @@
        this.examineTemplateId = examineTemplateId;
    }
                //考核标题
    private String title;
            private String title;
        
    public String getTitle() {
        return title;
@@ -50,7 +49,7 @@
        this.title = title;
    }
                //考核项目
    private String itemDetail;
            private String itemDetail;
        
    public String getItemDetail() {
        return itemDetail;
@@ -60,8 +59,8 @@
        this.itemDetail = itemDetail;
    }
                //考核日期
                @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp examineDate;
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp examineDate;
        
    public Timestamp getExamineDate() {
        return examineDate;
@@ -71,7 +70,7 @@
        this.examineDate = examineDate;
    }
                //总分
    private String examineTotalNumber;
            private String examineTotalNumber;
        
    public String getExamineTotalNumber() {
        return examineTotalNumber;
@@ -81,7 +80,7 @@
        this.examineTotalNumber = examineTotalNumber;
    }
                //考核说明
    private String memo;
            private String memo;
        
    public String getMemo() {
        return memo;
@@ -91,7 +90,7 @@
        this.memo = memo;
    }
                //考核人ID/外键
    private Long examinePersonId;
            private Long examinePersonId;
        
    public Long getExaminePersonId() {
        return examinePersonId;
@@ -101,7 +100,7 @@
        this.examinePersonId = examinePersonId;
    }
                //考核人名称
    private String examinePersonName;
            private String examinePersonName;
        
    public String getExaminePersonName() {
        return examinePersonName;
@@ -111,7 +110,7 @@
        this.examinePersonName = examinePersonName;
    }
                //被考核人ID/外键(可能有多个,用逗号隔开)
    private String beExaminedPersonId;
            private String beExaminedPersonId;
        
    public String getBeExaminedPersonId() {
        return beExaminedPersonId;
@@ -120,8 +119,8 @@
    public void setBeExaminedPersonId(String beExaminedPersonId) {
        this.beExaminedPersonId = beExaminedPersonId;
    }
                //被考核人名称
    private String beExaminedPersonName;
                //被考核人名称(可能有多个,用逗号隔开)
            private String beExaminedPersonName;
        
    public String getBeExaminedPersonName() {
        return beExaminedPersonName;
@@ -131,7 +130,7 @@
        this.beExaminedPersonName = beExaminedPersonName;
    }
                //考核部门ID/外键(可能有多个,用逗号隔开)
    private Long examineDepartmentId;
            private Long examineDepartmentId;
        
    public Long getExamineDepartmentId() {
        return examineDepartmentId;
@@ -141,7 +140,7 @@
        this.examineDepartmentId = examineDepartmentId;
    }
                //被考核部门ID/外键
    private Long beExaminedDepartmentId;
            private Long beExaminedDepartmentId;
        
    public Long getBeExaminedDepartmentId() {
        return beExaminedDepartmentId;
@@ -151,7 +150,7 @@
        this.beExaminedDepartmentId = beExaminedDepartmentId;
    }
                //附件
    private String extraFile;
            private String extraFile;
        
    public String getExtraFile() {
        return extraFile;
@@ -161,7 +160,7 @@
        this.extraFile = extraFile;
    }
                //各个考核项目的具体得分,json格式。
    private String numberDetailJson;
            private String numberDetailJson;
        
    public String getNumberDetailJson() {
        return numberDetailJson;
@@ -170,5 +169,15 @@
    public void setNumberDetailJson(String numberDetailJson) {
        this.numberDetailJson = numberDetailJson;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/ExamineTemplate.java
@@ -1,18 +1,17 @@
package com.gkhy.safePlatform.targetDuty.entity;
import java.sql.Timestamp;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.gkhy.safePlatform.targetDuty.entity.BaseDomain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 绩效考核管理-绩效考核标准(ExamineTemplate)表实体类
 *
 * @author xurui
 * @since 2022-08-03 09:50:44
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("examine_template")
@@ -30,7 +29,7 @@
    }
                //标准标题
    private String title;
            private String title;
        
    public String getTitle() {
        return title;
@@ -40,7 +39,7 @@
        this.title = title;
    }
                //适用范围
    private String applyRange;
            private String applyRange;
        
    public String getApplyRange() {
        return applyRange;
@@ -50,7 +49,7 @@
        this.applyRange = applyRange;
    }
                //模板分类编码
    private String templateCode;
            private String templateCode;
        
    public String getTemplateCode() {
        return templateCode;
@@ -60,7 +59,7 @@
        this.templateCode = templateCode;
    }
                //合格分数
    private String acceptanceNumber;
            private String acceptanceNumber;
        
    public String getAcceptanceNumber() {
        return acceptanceNumber;
@@ -70,7 +69,7 @@
        this.acceptanceNumber = acceptanceNumber;
    }
                //备注信息
    private String memo;
            private String memo;
        
    public String getMemo() {
        return memo;
@@ -80,7 +79,7 @@
        this.memo = memo;
    }
                //设定人/外键
    private Long setPersonId;
            private Long setPersonId;
        
    public Long getSetPersonId() {
        return setPersonId;
@@ -90,7 +89,7 @@
        this.setPersonId = setPersonId;
    }
                //设定人名称
    private String setPersonName;
            private String setPersonName;
        
    public String getSetPersonName() {
        return setPersonName;
@@ -100,7 +99,7 @@
        this.setPersonName = setPersonName;
    }
                //设定人部门ID/外键
    private Long setPersonDepartmentId;
            private Long setPersonDepartmentId;
        
    public Long getSetPersonDepartmentId() {
        return setPersonDepartmentId;
@@ -109,8 +108,8 @@
    public void setSetPersonDepartmentId(Long setPersonDepartmentId) {
        this.setPersonDepartmentId = setPersonDepartmentId;
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp setTimem;
                    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp setTimem;
        
    public Timestamp getSetTimem() {
        return setTimem;
@@ -119,5 +118,15 @@
    public void setSetTimem(Timestamp setTimem) {
        this.setTimem = setTimem;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentDetail.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * 奖惩记录(RewardPunishmentDetail)表实体类
 *
 * @author xurui
 * @since 2022-08-03 10:37:54
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("reward_punishment_detail")
@@ -28,7 +29,7 @@
    }
                //奖惩标准/外键
    private Long rewardPunishmentStandardId;
            private Long rewardPunishmentStandardId;
        
    public Long getRewardPunishmentStandardId() {
        return rewardPunishmentStandardId;
@@ -38,7 +39,7 @@
        this.rewardPunishmentStandardId = rewardPunishmentStandardId;
    }
                //员工ID(多个用逗号隔开)
    private String personId;
            private String personId;
        
    public String getPersonId() {
        return personId;
@@ -48,7 +49,7 @@
        this.personId = personId;
    }
                //员工名(多个用逗号隔开)
    private String personName;
            private String personName;
        
    public String getPersonName() {
        return personName;
@@ -58,7 +59,7 @@
        this.personName = personName;
    }
                //备注信息
    private String memo;
            private String memo;
        
    public String getMemo() {
        return memo;
@@ -67,5 +68,15 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/RewardPunishmentStandard.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * (RewardPunishmentStandard)表实体类
 * 奖惩目标设定(RewardPunishmentStandard)表实体类
 *
 * @author xurui
 * @since 2022-07-21 10:20:10
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("reward_punishment_standard")
@@ -28,7 +29,7 @@
    }
                //奖惩类型 1:奖励 2:惩罚
    private Integer standardType;
            private Integer standardType;
        
    public Integer getStandardType() {
        return standardType;
@@ -38,7 +39,7 @@
        this.standardType = standardType;
    }
                //奖惩内容
    private String content;
            private String content;
        
    public String getContent() {
        return content;
@@ -48,7 +49,7 @@
        this.content = content;
    }
                //奖惩名称
    private String qName;
            private String qName;
    public String getqName() {
        return qName;
@@ -59,7 +60,7 @@
    }
    //依据
    private String reason;
            private String reason;
        
    public String getReason() {
        return reason;
@@ -69,7 +70,7 @@
        this.reason = reason;
    }
                //备注信息
    private String memo;
            private String memo;
        
    public String getMemo() {
        return memo;
@@ -78,5 +79,15 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDivideDetail.java
@@ -11,7 +11,7 @@
 * 目标指标分解详情(TargetDivideDetail)表实体类
 *
 * @author xurui
 * @since 2022-08-17 11:22:35
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("target_divide_detail")
@@ -139,5 +139,15 @@
    public void setPlanDesc(String planDesc) {
        this.planDesc = planDesc;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutySummary.java
@@ -5,12 +5,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.fasterxml.jackson.annotation.JsonFormat;
/**
 * (TargetDutySummary)表实体类
 * 目标汇总(TargetDutySummary)表实体类
 *
 * @author xurui
 * @since 2022-07-27 15:33:30
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("target_duty_summary")
@@ -28,7 +29,7 @@
    }
                //年度
    private String year;
            private String year;
        
    public String getYear() {
        return year;
@@ -38,7 +39,7 @@
        this.year = year;
    }
                //责任部门/外键
    private Long departmentId;
            private Long departmentId;
        
    public Long getDepartmentId() {
        return departmentId;
@@ -48,7 +49,7 @@
        this.departmentId = departmentId;
    }
                //安全目标指标
    private String targetValue;
            private String targetValue;
        
    public String getTargetValue() {
        return targetValue;
@@ -58,7 +59,7 @@
        this.targetValue = targetValue;
    }
                //考核指标
    private String examineValue;
            private String examineValue;
        
    public String getExamineValue() {
        return examineValue;
@@ -68,7 +69,7 @@
        this.examineValue = examineValue;
    }
                //考核指标 1:合格 2:不合格
    private Integer examineResult;
            private Integer examineResult;
        
    public Integer getExamineResult() {
        return examineResult;
@@ -78,7 +79,7 @@
        this.examineResult = examineResult;
    }
                //月份
    private String yiYue;
            private String yiYue;
        
    public String getYiYue() {
        return yiYue;
@@ -87,8 +88,7 @@
    public void setYiYue(String yiYue) {
        this.yiYue = yiYue;
    }
    private String erYue;
                    private String erYue;
        
    public String getErYue() {
        return erYue;
@@ -97,8 +97,7 @@
    public void setErYue(String erYue) {
        this.erYue = erYue;
    }
    private String sanYue;
                    private String sanYue;
        
    public String getSanYue() {
        return sanYue;
@@ -107,8 +106,7 @@
    public void setSanYue(String sanYue) {
        this.sanYue = sanYue;
    }
    private String siYue;
                    private String siYue;
        
    public String getSiYue() {
        return siYue;
@@ -117,8 +115,7 @@
    public void setSiYue(String siYue) {
        this.siYue = siYue;
    }
    private String wuYue;
                    private String wuYue;
        
    public String getWuYue() {
        return wuYue;
@@ -127,8 +124,7 @@
    public void setWuYue(String wuYue) {
        this.wuYue = wuYue;
    }
    private String liuYue;
                    private String liuYue;
        
    public String getLiuYue() {
        return liuYue;
@@ -137,8 +133,7 @@
    public void setLiuYue(String liuYue) {
        this.liuYue = liuYue;
    }
    private String qiYue;
                    private String qiYue;
        
    public String getQiYue() {
        return qiYue;
@@ -147,8 +142,7 @@
    public void setQiYue(String qiYue) {
        this.qiYue = qiYue;
    }
    private String baYue;
                    private String baYue;
        
    public String getBaYue() {
        return baYue;
@@ -157,8 +151,7 @@
    public void setBaYue(String baYue) {
        this.baYue = baYue;
    }
    private String jiuYue;
                    private String jiuYue;
        
    public String getJiuYue() {
        return jiuYue;
@@ -167,8 +160,7 @@
    public void setJiuYue(String jiuYue) {
        this.jiuYue = jiuYue;
    }
    private String shiYue;
                    private String shiYue;
        
    public String getShiYue() {
        return shiYue;
@@ -177,8 +169,7 @@
    public void setShiYue(String shiYue) {
        this.shiYue = shiYue;
    }
    private String shiyiYue;
                    private String shiyiYue;
        
    public String getShiyiYue() {
        return shiyiYue;
@@ -187,8 +178,7 @@
    public void setShiyiYue(String shiyiYue) {
        this.shiyiYue = shiyiYue;
    }
    private String shierYue;
                    private String shierYue;
        
    public String getShierYue() {
        return shierYue;
@@ -197,5 +187,15 @@
    public void setShierYue(String shierYue) {
        this.shierYue = shierYue;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetDutyfileInfo.java
@@ -11,7 +11,7 @@
 * 目标责任书(TargetDutyfileInfo)表实体类
 *
 * @author xurui
 * @since 2022-08-09 11:07:00
 * @since 2022-08-29 08:44:25
 */
@SuppressWarnings("serial")
@TableName("target_dutyfile_info")
@@ -79,5 +79,15 @@
    public void setExtraFile(String extraFile) {
        this.extraFile = extraFile;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetExamine.java
@@ -11,7 +11,7 @@
 * 安全目标考核(TargetExamine)表实体类
 *
 * @author xurui
 * @since 2022-08-18 16:27:12
 * @since 2022-08-29 08:44:10
 */
@SuppressWarnings("serial")
@TableName("target_examine")
@@ -100,5 +100,15 @@
    public void setExamineDate(Timestamp examineDate) {
        this.examineDate = examineDate;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetMng.java
@@ -11,13 +11,13 @@
 * 目标指标(TargetMng)表实体类
 *
 * @author xurui
 * @since 2022-08-22 11:00:59
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("target_mng")
public class TargetMng extends BaseDomain {
    @TableId(type = IdType.AUTO)
    private Long id;
    public Long getId() {
@@ -28,8 +28,8 @@
        this.id = id;
    }
    //安全目标指标
    private String qName;
                //安全目标指标
            private String qName;
    public String getqName() {
        return qName;
@@ -38,9 +38,10 @@
    public void setqName(String qName) {
        this.qName = qName;
    }
    //目标指标编号
    private String indexNum;
    //目标指标编号
            private String indexNum;
    public String getIndexNum() {
        return indexNum;
    }
@@ -48,9 +49,9 @@
    public void setIndexNum(String indexNum) {
        this.indexNum = indexNum;
    }
    //年度
    private String year;
                //年度
            private String year;
    public String getYear() {
        return year;
    }
@@ -58,9 +59,9 @@
    public void setYear(String year) {
        this.year = year;
    }
    //指标值
    private String value;
                //指标值
            private String value;
    public String getValue() {
        return value;
    }
@@ -68,9 +69,9 @@
    public void setValue(String value) {
        this.value = value;
    }
    //1:大于 2:等于 3:小于
    private Integer valueSign;
                //1:大于 2:等于 3:小于
            private Integer valueSign;
    public Integer getValueSign() {
        return valueSign;
    }
@@ -78,9 +79,9 @@
    public void setValueSign(Integer valueSign) {
        this.valueSign = valueSign;
    }
    //指标级别 1:公司级 2:部门分厂级 3:工段班组级
    private Integer level;
                //指标级别 1:公司级 2:部门分厂级 3:工段班组级
            private Integer level;
    public Integer getLevel() {
        return level;
    }
@@ -88,10 +89,10 @@
    public void setLevel(Integer level) {
        this.level = level;
    }
    //完成期限
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp completeDate;
                //完成期限
            @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
        private Timestamp completeDate;
    public Timestamp getCompleteDate() {
        return completeDate;
    }
@@ -99,9 +100,9 @@
    public void setCompleteDate(Timestamp completeDate) {
        this.completeDate = completeDate;
    }
    //备注信息
    private String memo;
                //备注信息
            private String memo;
    public String getMemo() {
        return memo;
    }
@@ -109,9 +110,9 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }
    //指标类型 1:年指标 2:月指标 3:半年 4:季度
    private Integer targetType;
                //指标类型 1:年指标 2:月指标 3:半年 4:季度
            private Integer targetType;
    public Integer getTargetType() {
        return targetType;
    }
@@ -119,9 +120,9 @@
    public void setTargetType(Integer targetType) {
        this.targetType = targetType;
    }
    //分解状态 1:已分解 2:未分解
    private Integer divideStatus;
                //分解状态 1:已分解 2:未分解
            private Integer divideStatus;
    public Integer getDivideStatus() {
        return divideStatus;
    }
@@ -129,9 +130,9 @@
    public void setDivideStatus(Integer divideStatus) {
        this.divideStatus = divideStatus;
    }
    //目标制定部门
    private Long makerDepartmentId;
                        //目标制定部门
            private Long makerDepartmentId;
    public Long getMakerDepartmentId() {
        return makerDepartmentId;
    }
@@ -139,5 +140,15 @@
    public void setMakerDepartmentId(Long makerDepartmentId) {
        this.makerDepartmentId = makerDepartmentId;
    }
                //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
}
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/entity/TargetType.java
@@ -11,7 +11,7 @@
 * 目标分类(TargetType)表实体类
 *
 * @author xurui
 * @since 2022-08-17 10:26:39
 * @since 2022-08-29 08:43:13
 */
@SuppressWarnings("serial")
@TableName("target_type")
@@ -48,5 +48,15 @@
    public void setMemo(String memo) {
        this.memo = memo;
    }
                        //是否删除 0:未删除 1:删除
            private Integer delFlag;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/ExamineItemQueryCriteria.java
@@ -35,7 +35,16 @@
    @Query()
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
        return id;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/ExamineMngQueryCriteria.java
@@ -8,6 +8,16 @@
    //考核部门ID/外键
    @Query()
    private Long examineDepartmentId;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    //考核部门ID/外键
    public Long getExamineDepartmentId() {
        return examineDepartmentId;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/ExamineTemplateQueryCriteria.java
@@ -8,6 +8,16 @@
    //标准标题
    @Query(type = Query.Type.INNER_LIKE)
    private String title;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    //标准标题
    public String getTitle() {
        return title;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/RewardPunishmentDetailQueryCriteria.java
@@ -8,6 +8,16 @@
    //员工
    @Query()
    private String personId;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    //员工
    public String getPersonId() {
        return personId;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/RewardPunishmentStandardQueryCriteria.java
@@ -8,6 +8,16 @@
    //奖惩类型 1:奖励 2:惩罚
    @Query()
    private Integer standardType;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    //奖惩类型 1:奖励 2:惩罚
    public Integer getStandardType() {
        return standardType;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetCheckAndSubmitQueryCriteria.java
@@ -17,6 +17,16 @@
    private Integer divideStatus;
    //关联业务类型 1:目标检查 2:目标上报
    private Integer relateType;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    public Integer getRelateType() {
        return relateType;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDivideDetailQueryCriteria.java
@@ -37,6 +37,16 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
        return id;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDutySummaryQueryCriteria.java
@@ -10,6 +10,17 @@
    //责任部门/外键    
    @Query()
    private Long departmentId;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    //年度
    public String getYear() {
        return year;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDutyWorkApproveQueryCriteria.java
@@ -17,6 +17,17 @@
    @Query(type = Query.Type.BETWEEN)
    private List<Timestamp> gmtCreate;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    public Integer getRelateType() {
        return relateType;
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetDutyfileInfoQueryCriteria.java
@@ -8,6 +8,17 @@
    @Query()
    private Long jobId;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    //岗位号/外键
    public Long getJobId() {
        return jobId;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetExamineQueryCriteria.java
@@ -17,6 +17,17 @@
    @Query()
    private Integer divideStatus;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    public Integer getDivideStatus() {
        return divideStatus;
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetMngQueryCriteria.java
@@ -17,6 +17,17 @@
    @Query()
    private Integer divideStatus;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
    public Integer getDivideStatus() {
        return divideStatus;
    }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/model/dto/req/TargetTypeQueryCriteria.java
@@ -20,6 +20,16 @@
    @Query()
    private Timestamp updateTime;
    //是否删除 0:未删除 1:删除
    @Query()
    private Integer delFlag = 0;
    public Integer getDelFlag() {
        return delFlag;
    }
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }
            
    public Long getId() {
        return id;
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
@@ -57,7 +57,7 @@
    private CommonService commonService;
    @Override
    @Override
    public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
        Long pageIndex = pageQuery.getPageIndex();
        Long pageSize = pageQuery.getPageSize();
@@ -70,32 +70,32 @@
        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f -> {
        respList.forEach(f->{
            collectDepIdSet.add(f.getExamineDepartmentId());
            collectDepIdSet.add(f.getBeExaminedDepartmentId());
        });
        //获取部门名集合
        Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
        respList.forEach(f -> {
        respList.forEach(f->{
            f.setExamineDepartmentName(depNameMap.get(f.getExamineDepartmentId()));
            f.setBeExaminedDepartmentName(depNameMap.get(f.getBeExaminedDepartmentId()));
        });
        //获取打分明细
        respList.forEach(dto -> {
            List<CurrentExamineDto> list = JSONObject.parseArray(dto.getNumberDetailJson(), CurrentExamineDto.class);
        respList.forEach(dto->{
            List<CurrentExamineDto> list = JSONObject.parseArray( dto.getNumberDetailJson(), CurrentExamineDto.class);
            List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());
            if (!idList.isEmpty()) {
            if(!idList.isEmpty()){
                List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList);
                Map<Long, ExamineItem> itemMap = itemList.stream().collect(
                        Collectors.toMap(ExamineItem::getId, Function.identity(), (k1, k2) -> k1));
                Map<Long,ExamineItem> itemMap = itemList.stream().collect(
                        Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
                if (itemMap != null) {
                    list.forEach(f -> {
                if(itemMap != null){
                    list.forEach(f->{
                        ExamineItem item = itemMap.get(f.getId());
                        if (item != null) {
                        if(item != null){
                            f.setItemDetail(item.getItemDetail());
                            f.setContent(item.getContent());
                            f.setJudgeStandard(item.getJudgeStandard());
@@ -109,7 +109,7 @@
        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize, page.getPages(),
                pageSize,page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
@@ -125,29 +125,27 @@
    @Override
    public ExamineMngDto selectOne(Serializable id) {
        ExamineMng examineMng = this.getById(id);
        if (examineMng == null) {
        if(examineMng == null){
            return null;
        }
        ExamineMngDto dto = BeanCopyUtils.copyBean(examineMng, ExamineMngDto.class);
        if (!StringUtils.hasText(examineMng.getNumberDetailJson())) {
        if(!StringUtils.hasText(examineMng.getNumberDetailJson())){
            return dto;
        }
        //获取打分明细
        List<CurrentExamineDto> list = JSONObject.parseArray(examineMng.getNumberDetailJson(), CurrentExamineDto.class);
        List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.getNumberDetailJson(), CurrentExamineDto.class);
        List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());
        if (!idList.isEmpty()) {
        if (idList.isEmpty()){
            List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList);
            Map<Long, ExamineItem> itemMap = itemList.stream().collect(
                    Collectors.toMap(ExamineItem::getId, Function.identity(), (k1, k2) -> k1));
            Map<Long,ExamineItem> itemMap = itemList.stream().collect(
                    Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
            if (itemMap != null) {
                list.forEach(f -> {
            if(itemMap != null){
                list.forEach(f->{
                    ExamineItem item = itemMap.get(f.getId());
                    if (item != null) {
                    if(item != null){
                        f.setItemDetail(item.getItemDetail());
                        f.setContent(item.getContent());
                        f.setJudgeStandard(item.getJudgeStandard());
@@ -158,8 +156,8 @@
        dto.setCurrentExamineDtoList(list);
        //获取合格分数
        ExamineTemplate examineTemplate = examineTemplateRepository.selectOne(new QueryWrapper<ExamineTemplate>().eq("id", examineMng.getExamineTemplateId()));
        if (examineTemplate != null) {
        ExamineTemplate examineTemplate = examineTemplateRepository.selectOne(new QueryWrapper<ExamineTemplate>().eq("id",examineMng.getExamineTemplateId()));
        if(examineTemplate != null){
            dto.setAcceptanceNumber(examineTemplate.getAcceptanceNumber());
            dto.setExamineTemplateName(examineTemplate.getTitle());
        }
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java
@@ -122,7 +122,14 @@
        if(StringUtils.hasText(infoDto.getDelExamineItems())){
            List<Long> idList = Arrays.stream(infoDto.getDelExamineItems().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            examineItemService.removeByIds(idList);
            List<ExamineItem> delList = new ArrayList<>();
            idList.forEach(f->{
                ExamineItem info = new ExamineItem();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            examineItemService.updateBatchById(delList);
        }
        ExamineTemplate examineTemplate = BeanCopyUtils.copyBean(infoDto, ExamineTemplate.class);
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetDivideDetailServiceImpl.java
@@ -27,6 +27,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -84,7 +85,14 @@
        if(StringUtils.hasText(infoDto.getDelTargetDivideDetails())){
            List<Long> idList = Arrays.stream(infoDto.getDelTargetDivideDetails().split(",")).map(s-> Long.parseLong(s.trim()))
                    .collect(Collectors.toList());
            this.removeByIds(idList);
            List<TargetDivideDetail> delList = new ArrayList<>();
            idList.forEach(f->{
                TargetDivideDetail info = new TargetDivideDetail();
                info.setDelFlag(1);
                info.setId(f);
                delList.add(info);
            });
            this.updateBatchById(delList);
        }
        //保存主数据
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetExamineServiceImpl.java
@@ -62,19 +62,4 @@
        return baseMapper.selectList(QueryHelpPlus.getPredicate(TargetExamine.class, criteria));
    }
//    @Override
//    public void addOrUpdate(TargetExamineSaveOrUpdate infoDto) {
//
//
//        if(StringUtils.hasText(infoDto.getDelIds())) {
//            List<Long> idList = Arrays.stream(infoDto.getDelIds().split(",")).map(s-> Long.parseLong(s.trim()))
//                    .collect(Collectors.toList());
//            this.removeByIds(idList);
//        }
//
//        infoDto.getExamineList().forEach(f->{
//            f.setTargetId(infoDto.getId());
//        });
//        this.saveOrUpdateBatch(infoDto.getExamineList());
//    }
}
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/TargetMngServiceImpl.java
@@ -70,7 +70,7 @@
        page = baseMapper.selectPage(page,
                QueryHelpPlus.getPredicate(TargetMng.class, pageQuery.getSearchParams()));
        List<TargetMngDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetMngDto.class);
        respList.forEach(dto->{
        respList.forEach(dto -> {
            // --------------------------- 获取部门信息-----------------------
            dto.setMakerDepartmentName(commonService.getDepName(dto.getMakerDepartmentId()));
@@ -82,14 +82,14 @@
            // --------------------------- 获取部门信息-----------------------
            //收集所用到的部门ID
            Set<Long> collectDepIdSet = new HashSet();
            respList1.forEach(f->{
            respList1.forEach(f -> {
                collectDepIdSet.add(f.getDutyDepartmentId());
                collectDepIdSet.add(f.getMakerDepartmentId());
            });
            //获取部门名集合
            Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
            respList1.forEach(f->{
            respList1.forEach(f -> {
                f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
                f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
            });
@@ -98,16 +98,16 @@
            // --------------------------- 获取目标分类名称-----------------------
            //收集所用到的目标分类ID
            Set<Long> collectTypeSet = new HashSet();
            respList1.forEach(f->{
            respList1.forEach(f -> {
                collectTypeSet.add(f.getTargetTypeId());
            });
            //获取目标分类名集合
            if(!collectTypeSet.isEmpty()){
            if (!collectTypeSet.isEmpty()) {
                List<TargetType> typeList = targetTypeRepository.selectBatchIds(collectTypeSet); // TODO
                Map<Long, String> typeNameMap = typeList.stream()
                        .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName,(k1, k2)->k1));
                        .collect(Collectors.toMap(TargetType::getId, TargetType::getTypeName, (k1, k2) -> k1));
                respList1.forEach(f->{
                respList1.forEach(f -> {
                    f.setTargetTypeName(typeNameMap.get(f.getDutyDepartmentId()));
                });
            }
@@ -118,7 +118,7 @@
        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                pageSize, page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
@@ -134,7 +134,7 @@
    @Override
    public Object selectOne(Serializable id) {
        TargetMng targetMng = baseMapper.selectById(id);
        if(targetMng == null){
        if (targetMng == null) {
            return null;
        }
        TargetMngDto targetMngDto = BeanCopyUtils.copyBean(targetMng, TargetMngDto.class);
@@ -149,36 +149,34 @@
        // --------------------------- 获取部门信息-----------------------
        //收集所用到的部门ID
        Set<Long> collectDepIdSet = new HashSet();
        respList.forEach(f->{
        respList.forEach(f -> {
            collectDepIdSet.add(f.getDutyDepartmentId());
            collectDepIdSet.add(f.getMakerDepartmentId());
        });
        //获取部门名集合
        Map<Long, String> depNameMap = commonService.getDepName(collectDepIdSet);
        respList.forEach(f->{
        respList.forEach(f -> {
            f.setDutyDepartmentName(depNameMap.get(f.getDutyDepartmentId()));
            f.setMakerDepartmentName(depNameMap.get(f.getMakerDepartmentId()));
        });
        // --------------------------- 获取考核结果-----------------------
        //收集所用到的分解详情ID
        Set<Long> collectExamResultSet = new HashSet();
        respList.forEach(f->{
        respList.forEach(f -> {
            collectExamResultSet.add(f.getId());
        });
        //获取核结果集合
        if(!collectExamResultSet.isEmpty()){
            List<TargetExamine> typeList = targetExamineRepository.selectList(new QueryWrapper<TargetExamine>().in("target_divide_detail_id",collectExamResultSet));
        if (!collectExamResultSet.isEmpty()) {
            List<TargetExamine> typeList = targetExamineRepository.selectList(new QueryWrapper<TargetExamine>().in("target_divide_detail_id", collectExamResultSet));
            Map<Long, TargetExamine> examResultMap = typeList.stream()
                    .collect(Collectors.toMap(TargetExamine::getTargetDivideDetailId, Function.identity(),(k1, k2)->k1));
                    .collect(Collectors.toMap(TargetExamine::getTargetDivideDetailId, Function.identity(), (k1, k2) -> k1));
            respList.forEach(f->{
            respList.forEach(f -> {
                TargetExamine targetExamine = examResultMap.get(f.getId());
                if(targetExamine != null){
                if (targetExamine != null) {
                    f.setExamineResult(targetExamine.getExamineResult());
                    f.setExamineDate(targetExamine.getExamineDate());
                    f.setExaminePersonId(targetExamine.getExaminePersonId());
@@ -203,11 +201,11 @@
        List<TargetCheckAndSubmitDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), TargetCheckAndSubmitDto.class);
        // 判断审批人
        respList.forEach(dto->{
        respList.forEach(dto -> {
            List<TargetDutyWorkApprove> list = targetDutyWorkApproveRepository.selectList(
                    new QueryWrapper<TargetDutyWorkApprove>().eq("del_flag",0)
                            .eq("relate_type",pageQuery.getSearchParams().getRelateType())
                            .eq("relate_id",dto.getId())
                    new QueryWrapper<TargetDutyWorkApprove>().eq("del_flag", 0)
                            .eq("relate_type", pageQuery.getSearchParams().getRelateType())
                            .eq("relate_id", dto.getId())
                            .orderByDesc("sort"));
            if (!CollectionUtils.isEmpty(list)) {
@@ -215,7 +213,7 @@
                dto.setApproveStatus(list.get(0).getApproveStatus());
                dto.setApprovePersonId(list.get(0).getApprovePersonId());
                // 审批中  判断审批人是否人与当前登录人
                if (dto.getApproveStatus()!=null && dto.getApproveStatus()==2){
                if (dto.getApproveStatus() != null && dto.getApproveStatus() == 2) {
                    dto.setCheckApprove(dto.getApprovePersonId().equals(uid));
                }
            }
@@ -224,7 +222,7 @@
        return new SearchResultVO<>(
                true,
                pageIndex,
                pageSize,page.getPages(),
                pageSize, page.getPages(),
                page.getTotal(),
                respList,
                ResultCodes.OK
@@ -237,50 +235,52 @@
        // 查询总数
        Integer total = 0;
        // 完成数量
        Integer complete=0;
        Integer complete = 0;
        // 查询目标已分解且事件类型对一个的目标
        List<TargetMng> targetMngList = targetMngRepository.selectList(
                new QueryWrapper<TargetMng>()
                .eq("target_type",criteria.getTargetType())
                .eq("divide_status",1)
                        .eq("del_flag", 0)
                        .eq("target_type", criteria.getTargetType())
                        .eq("divide_status", 1)
        );
        if (!targetMngList.isEmpty()){
        if (!targetMngList.isEmpty()) {
            total = targetMngList.size();
            // 查询目标下的所有分解项
            for (TargetMng targetMng : targetMngList){
            for (TargetMng targetMng : targetMngList) {
                Boolean completeFlag = true;
                List<TargetDivideDetail> targetDivideDetailList = targetDivideDetailRepository.selectList(
                        new QueryWrapper<TargetDivideDetail>()
                        .eq("target_id",targetMng.getId())
                                .eq("del_flag", 0)
                                .eq("target_id", targetMng.getId())
                );
                if (!targetDivideDetailList.isEmpty()){
                if (!targetDivideDetailList.isEmpty()) {
                    // 查询分解项 是否已经审核通过
                    for (TargetDivideDetail targetDivideDetail :targetDivideDetailList){
                    for (TargetDivideDetail targetDivideDetail : targetDivideDetailList) {
                        List<TargetExamine> targetExamineList = targetExamineRepository.selectList(
                                new QueryWrapper<TargetExamine>()
                                        .eq("target_divide_detail_id",targetDivideDetail.getId())
                                        .eq("examine_result",1)
                                        .eq("del_flag", 0)
                                        .eq("target_divide_detail_id", targetDivideDetail.getId())
                                        .eq("examine_result", 1)
                        );
                        if (targetExamineList.isEmpty()){
                            completeFlag=false;
                        if (targetExamineList.isEmpty()) {
                            completeFlag = false;
                        }
                    }
                }
                // 该目标中有未评价的或者不合格的
                if (completeFlag){
                if (completeFlag) {
                    complete++;
                }
            }
        }
        //未完成数
        int noComplete = total-complete;
        map.put("total",total+"");
        map.put("noComplete",noComplete+"");
        map.put("complete",complete+"");
        int noComplete = total - complete;
        map.put("total", total + "");
        map.put("noComplete", noComplete + "");
        map.put("complete", complete + "");
        return map;
    }
}