From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java | 64 +++++++++++++++++++++++++++----
1 files changed, 55 insertions(+), 9 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
index 5e9ae49..d01251e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolRecordController.java
@@ -1,8 +1,11 @@
package cn.gistack.sm.patrol.controller;
+import cn.gistack.sm.patrol.entity.PatrolGroupItem;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolType;
+import cn.gistack.sm.patrol.service.IPatrolGroupItemService;
import cn.gistack.sm.patrol.service.IPatrolRecordService;
+import cn.gistack.sm.patrol.vo.PatrolGroupItemVO;
import cn.gistack.sm.patrol.vo.PatrolRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
@@ -32,7 +35,7 @@
/**
* 分页列表查询
*/
- @ApiOperation(value="巡查类型-分页列表查询", notes="巡查类型-分页列表查询")
+ @ApiOperation(value="巡查记录-分页列表查询", notes="巡查记录-分页列表查询")
@GetMapping(value = "/list")
public R queryPageList(PatrolRecord patrolRecord, Query query) {
IPage<PatrolRecord> pageList = patrolRecordService.selectPatrolRecord(Condition.getPage(query),patrolRecord);
@@ -40,19 +43,19 @@
}
/**
- * 获取所有巡查类型
+ * 获取所有巡查记录
*/
@ApiOperation(value="获取所有巡查类型", notes="获取所有巡查类型")
@GetMapping(value = "/all")
- public R getAll(){
- List<PatrolRecord> list = patrolRecordService.list();
+ public R getAll(PatrolRecord patrolRecord){
+ List<PatrolRecord> list = patrolRecordService.list(Condition.getQueryWrapper(patrolRecord));
return R.data(list);
}
/**
* 添加
*/
- @ApiOperation(value="巡查类型-添加", notes="巡查类型-添加")
+ @ApiOperation(value="巡查记录-添加", notes="巡查记录-添加")
@PostMapping(value = "/add")
public R add(@RequestBody PatrolRecord patrolRecord) {
return R.data(patrolRecordService.save(patrolRecord));
@@ -61,7 +64,7 @@
/**
* 编辑
*/
- @ApiOperation(value="巡查类型-编辑", notes="巡查类型-编辑")
+ @ApiOperation(value="巡查记录-编辑", notes="巡查记录-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public R edit(@RequestBody PatrolRecord patrolRecord) {
return R.data(patrolRecordService.updateById(patrolRecord));
@@ -73,7 +76,7 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查类型-通过id删除", notes="巡查类型-通过id删除")
+ @ApiOperation(value="巡查记录-通过id删除", notes="巡查记录-通过id删除")
@DeleteMapping(value = "/delete")
public R delete(@RequestParam(name="id",required=true) String id) {
return R.data(patrolRecordService.removeById(id));
@@ -85,7 +88,7 @@
* @param ids
* @return
*/
- @ApiOperation(value="巡查类型-批量删除", notes="巡查类型-批量删除")
+ @ApiOperation(value="巡查记录-批量删除", notes="巡查记录-批量删除")
@DeleteMapping(value = "/deleteBatch")
public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
return R.data(patrolRecordService.removeByIds(Arrays.asList(ids.split(","))));
@@ -97,12 +100,55 @@
* @param id
* @return
*/
- @ApiOperation(value="巡查类型-通过id查询", notes="巡查类型-通过id查询")
+ @ApiOperation(value="巡查记录-通过id查询", notes="巡查记录-通过id查询")
@GetMapping(value = "/queryById")
public R queryById(@RequestParam(name="id",required=true) String id) {
PatrolRecordVO patrolRecordVO = patrolRecordService.getDetail(id);
return R.data(patrolRecordVO);
}
+ /**
+ * 通过taskId,itemsIds查询(用来判断是否完成任务)
+ * @return
+ */
+ @ApiOperation(value="巡查记录-通过taskId,itemsIds查询", notes="巡查记录-通过taskId,itemsIds查询")
+ @GetMapping(value = "/getPatrolRecordByTaskId")
+ public R getPatrolRecordByTaskId(String taskId,String itemIds) {
+ List<PatrolGroupItemVO> list = patrolRecordService.getPatrolRecordByTaskId(taskId,itemIds);
+ return R.data(list);
+ }
+ /**
+ * 通过taskId,itemsIds查询(用来查询巡查记录)
+ * @return
+ */
+ @ApiOperation(value="巡查记录-通过itemId查询", notes="巡查记录-通过itemId查询")
+ @GetMapping(value = "/getByTaskIdAndItemId")
+ public R getByTaskIdAndItemId(String taskId,String itemIds){
+ List<PatrolRecordVO> list = patrolRecordService.getByTaskIdAndItemId(taskId,itemIds);
+ return R.data(list);
+ }
+
+ /**
+ * 通过itemIds查询(用于巡查上报时的回显)
+ *
+ * @return
+ */
+ @ApiOperation(value="巡查指标项目-通过itemIds查询", notes="巡查指标项目-通过itemIds查询")
+ @GetMapping(value = "/getItemByItemIds")
+ public R getItemByItemIds(String itemIds,String groupId,String taskId){
+ List list = patrolRecordService.getItemByItemIds(itemIds,groupId,taskId);
+ return R.data(list);
+ }
+
+ /**
+ * 通过任务id和组id获取记录表中的数据,用于数据回显
+ *
+ * @return
+ */
+ @GetMapping(value = "/getByTaskIdAndGroupId")
+ public R getByTaskIdAndGroupId(String groupId,String taskId){
+ List<PatrolRecord> list = patrolRecordService.getByTaskIdAndGroupId(groupId,taskId);
+ return R.data(list);
+ }
}
--
Gitblit v1.9.3