From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java | 61 ++++++++++--------------------
1 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
index 1f9a735..58d6fb3 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/TargetExamineController.java
@@ -1,39 +1,24 @@
package com.gkhy.safePlatform.targetDuty.controller;
-import java.util.*;
-import java.sql.Timestamp;
-
-import com.gkhy.safePlatform.targetDuty.utils.DateUtils;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
-import com.gkhy.safePlatform.targetDuty.entity.ExamineItem;
-import com.gkhy.safePlatform.targetDuty.entity.TargetDutyfileInfo;
-import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
-import com.gkhy.safePlatform.targetDuty.entity.TargetMng;
-import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineTemplateSaveOrUpdate;
-import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetDutyfileInfoQueryCriteria;
-import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineSaveOrUpdate;
-import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineTemplateDto;
-import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetExamineDivideDto;
-import com.gkhy.safePlatform.targetDuty.model.dto.resp.TargetExamineDto;
-import com.gkhy.safePlatform.targetDuty.service.CommonService;
-import com.gkhy.safePlatform.targetDuty.service.TargetExamineService;
-import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
-import com.google.common.collect.Lists;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
-import com.gkhy.safePlatform.commons.enums.ResultCodes;
+import com.gkhy.safePlatform.targetDuty.entity.TargetExamine;
import com.gkhy.safePlatform.targetDuty.model.dto.req.TargetExamineQueryCriteria;
+import com.gkhy.safePlatform.targetDuty.service.CommonService;
+import com.gkhy.safePlatform.targetDuty.service.TargetExamineService;
+import com.gkhy.safePlatform.targetDuty.service.TargetMngService;
+import org.springframework.web.bind.annotation.*;
-import java.util.stream.Collectors;
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;
/**
* (TargetExamine)表控制层
@@ -100,18 +85,6 @@
// }
- /**
- * 分页查询所有数据
- *
- * @param pageQuery 查询实体
- * @return 所有数据
- */
- @PostMapping(value = "/page/list")
- public ResultVO selectAll(@RequestBody PageQuery<TargetExamineQueryCriteria> pageQuery){
- PageUtils.checkCheck(pageQuery);
- return this.targetExamineService.queryAll(pageQuery);
- }
-
/**
* 通过主键查询单条数据
@@ -154,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);
}
@@ -176,4 +157,4 @@
// saveOrUpdate.setExamineList(examineList);
// System.out.println(JSONObject.toJSONString(saveOrUpdate));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.2