From bfb4c1e1d4e3f99f74a51ef5b67531f9d91d0dde Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: Thu, 08 Sep 2022 09:13:38 +0800
Subject: [PATCH] 目标fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
index 21aa12c..17e5f19 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
@@ -11,12 +11,14 @@
import com.gkhy.safePlatform.targetDuty.model.dto.req.ExamineMngQueryCriteria;
import com.gkhy.safePlatform.targetDuty.model.dto.resp.ExamineMngDto;
import com.gkhy.safePlatform.targetDuty.service.ExamineMngService;
+import com.gkhy.safePlatform.targetDuty.service.baseService.ExamineMngBaseService;
import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.sql.Timestamp;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -36,6 +38,10 @@
@Resource
private ExamineMngService examineMngService;
+ @Resource
+ private ExamineMngBaseService examineMngBaseService;
+
+
/**
* 分页查询所有数据
*
@@ -44,7 +50,7 @@
*/
@PostMapping(value = "/page/list")
public ResultVO selectAll(@RequestBody PageQuery<ExamineMngQueryCriteria> pageQuery){
- PageUtils.checkCheck(pageQuery);
+
return this.examineMngService.queryAll(pageQuery);
}
@@ -74,9 +80,9 @@
examineMng.setExamineDepartmentId(currentUser.getDepId());
examineMng.setExaminePersonId(currentUser.getUid());
if (examineMng.getId() == null) {
- return new ResultVO<>(ResultCodes.OK,examineMngService.save(examineMng));
+ return new ResultVO<>(ResultCodes.OK,examineMngBaseService.save(examineMng));
} else {
- examineMngService.update(examineMng,new UpdateWrapper<ExamineMng>().eq("id",examineMng.getId()));
+ examineMngBaseService.update(examineMng,new UpdateWrapper<ExamineMng>().eq("id",examineMng.getId()));
return new ResultVO<>(ResultCodes.OK);
}
}
@@ -89,11 +95,7 @@
*/
@RequestMapping(value = "/delete",method = RequestMethod.POST)
public ResultVO delete(@RequestBody Long[] ids) {
- if(ids == null){
- return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
- }
- List<Long> idList = Arrays.asList(ids);
- this.examineMngService.removeByIds(idList);
+ this.examineMngService.delete(ids);
return new ResultVO<>(ResultCodes.OK);
}
--
Gitblit v1.9.2