假删除fix

songhuangfeng123

2022-09-01 b854d8d7604329dcf99584d15f83ff02076d9e07

假删除fix

 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")
@@ -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")
@@ -533,12 +532,8 @@
    public void setActualDestoryDate(Timestamp actualDestoryDate) {
        this.actualDestoryDate = actualDestoryDate;
    }

    //区域ID/外键
                //区域ID
    private Long areaId;

    //区域名称
    private String areaName;

    public Long getAreaId() {
        return areaId;
@@ -547,6 +542,8 @@
    public void setAreaId(Long areaId) {
        this.areaId = areaId;
    }
                //区域名称
            private String areaName;

    public String getAreaName() {
        return areaName;
@@ -555,7 +552,6 @@
    public void setAreaName(String areaName) {
        this.areaName = areaName;
    }

    //保养周期
    private String 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")
@@ -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")
@@ -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,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;

/**
 * 设备保养明细(EquipmentTakecareStardardDetail)表实体类
 *
 * @author xurui
 * @since 2022-07-19 15:22:05
 * @since 2022-08-29 08:37:54
 */
@SuppressWarnings("serial")
@TableName("equipment_takecare_stardard_detail")
@@ -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")
@@ -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,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;

/**
 * 设备设施类型管理(EquipmentTypeMng)表实体类
 *
 * @author xurui
 * @since 2022-07-19 08:35:02
 * @since 2022-08-29 08:39:44
 */
@SuppressWarnings("serial")
@TableName("equipment_type_mng")
@@ -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

@@ -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);
    }


 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")
@@ -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")
@@ -120,7 +119,7 @@
    public void setBeExaminedPersonId(String beExaminedPersonId) {
        this.beExaminedPersonId = beExaminedPersonId;
    }
                //被考核人名称
                //被考核人名称（可能有多个，用逗号隔开）
    private String beExaminedPersonName;
        
    public String getBeExaminedPersonName() {
@@ -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")
@@ -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")
@@ -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")
@@ -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")
@@ -87,7 +88,6 @@
    public void setYiYue(String yiYue) {
        this.yiYue = yiYue;
    }
                
    private String erYue;
        
    public String getErYue() {
@@ -97,7 +97,6 @@
    public void setErYue(String erYue) {
        this.erYue = erYue;
    }
                
    private String sanYue;
        
    public String getSanYue() {
@@ -107,7 +106,6 @@
    public void setSanYue(String sanYue) {
        this.sanYue = sanYue;
    }
                
    private String siYue;
        
    public String getSiYue() {
@@ -117,7 +115,6 @@
    public void setSiYue(String siYue) {
        this.siYue = siYue;
    }
                
    private String wuYue;
        
    public String getWuYue() {
@@ -127,7 +124,6 @@
    public void setWuYue(String wuYue) {
        this.wuYue = wuYue;
    }
                
    private String liuYue;
        
    public String getLiuYue() {
@@ -137,7 +133,6 @@
    public void setLiuYue(String liuYue) {
        this.liuYue = liuYue;
    }
                
    private String qiYue;
        
    public String getQiYue() {
@@ -147,7 +142,6 @@
    public void setQiYue(String qiYue) {
        this.qiYue = qiYue;
    }
                
    private String baYue;
        
    public String getBaYue() {
@@ -157,7 +151,6 @@
    public void setBaYue(String baYue) {
        this.baYue = baYue;
    }
                
    private String jiuYue;
        
    public String getJiuYue() {
@@ -167,7 +160,6 @@
    public void setJiuYue(String jiuYue) {
        this.jiuYue = jiuYue;
    }
                
    private String shiYue;
        
    public String getShiYue() {
@@ -177,7 +169,6 @@
    public void setShiYue(String shiYue) {
        this.shiYue = shiYue;
    }
                
    private String shiyiYue;
        
    public String getShiyiYue() {
@@ -187,7 +178,6 @@
    public void setShiyiYue(String shiyiYue) {
        this.shiyiYue = shiyiYue;
    }
                
    private String shierYue;
        
    public String getShierYue() {
@@ -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,7 +11,7 @@
 * 目标指标(TargetMng)表实体类
 *
 * @author xurui
 * @since 2022-08-22 11:00:59
 * @since 2022-08-29 08:41:36
 */
@SuppressWarnings("serial")
@TableName("target_mng")
@@ -38,6 +38,7 @@
    public void setqName(String qName) {
        this.qName = qName;
    }

    //目标指标编号
    private String indexNum;

@@ -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

@@ -137,9 +137,7 @@
        //获取打分明细
        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));

 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

@@ -162,8 +162,6 @@
        });




        // --------------------------- 获取考核结果-----------------------
        //收集所用到的分解详情ID
        Set<Long> collectExamResultSet = new HashSet();
@@ -242,6 +240,7 @@
        // 查询目标已分解且事件类型对一个的目标
        List<TargetMng> targetMngList = targetMngRepository.selectList(
                new QueryWrapper<TargetMng>()
                        .eq("del_flag", 0)
                .eq("target_type",criteria.getTargetType())
                .eq("divide_status",1)
        );
@@ -252,6 +251,7 @@
                Boolean completeFlag = true;
                List<TargetDivideDetail> targetDivideDetailList = targetDivideDetailRepository.selectList(
                        new QueryWrapper<TargetDivideDetail>()
                                .eq("del_flag", 0)
                        .eq("target_id",targetMng.getId())
                );
                if (!targetDivideDetailList.isEmpty()){
@@ -259,6 +259,7 @@
                    for (TargetDivideDetail targetDivideDetail :targetDivideDetailList){
                        List<TargetExamine> targetExamineList = targetExamineRepository.selectList(
                                new QueryWrapper<TargetExamine>()
                                        .eq("del_flag", 0)
                                        .eq("target_divide_detail_id",targetDivideDetail.getId())
                                        .eq("examine_result",1)
                        );
@@ -280,7 +281,6 @@
        map.put("complete",complete+"");
        return map;
    }



}