假删除fix

songhuangfeng123

2022-09-01 b854d8d7604329dcf99584d15f83ff02076d9e07

 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetMngController.java

@@ -35,7 +35,6 @@
import java.net.URLEncoder;
import java.sql.Timestamp;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 目标指标(TargetMng)表控制层
@@ -122,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);
    }

@@ -137,7 +147,7 @@
        Map<String,String> map = new LinkedHashMap<>();
        map.put("1","安全目标指标");
        map.put("2","目标指标编号");
        map.put("3","指标类型 1:年指标 2:月指标");
        map.put("3","指标类型 1:年指标 2:月指标 3:半年 4:季度");
        map.put("4","年度");
        map.put("5","指标值");
        map.put("6","指标级别 1:公司级 2:部门分厂级 3:工段班组级");
@@ -225,6 +235,16 @@
        return this.targetMngService.queryAll(currentUser.getUid(),pageQuery);
    }

    /**
     * 统计
     *
     * @return 删除结果
     */
    @GetMapping(value = "/statistics")
    public ResultVO statistics(TargetMngQueryCriteria criteria) {
        return new ResultVO<>(ResultCodes.OK,this.targetMngService.statistics(criteria));
    }


    public static void main(String[] args) {
        TargetMng mng = new TargetMng();