From ff7234ac1fefe573ae3f03667a748e3351ee6b1b Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 11 May 2023 20:44:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
index 91b88b3..fe7936f 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolReportController.java
@@ -17,10 +17,10 @@
import java.util.Arrays;
/**
-* @Description: 巡查设置
+* @Description: 巡查上报
*/
@Slf4j
-@Api(tags="巡查设置")
+@Api(tags="巡查上报")
@RestController
@RequestMapping("/patrol/patrolReport")
@AllArgsConstructor
@@ -31,7 +31,7 @@
/**
* 分页列表查询
*/
- @ApiOperation(value="巡查设置-分页列表查询", notes="巡查设置-分页列表查询")
+ @ApiOperation(value="巡查上报-分页列表查询", notes="巡查上报-分页列表查询")
@GetMapping(value = "/list")
public R<IPage<PatrolConfig>> queryPageList(PatrolConfig patrolConfig,Query query) {
IPage<PatrolConfig> pageList = patrolReportService.selectPatrolReport(Condition.getPage(query),patrolConfig);
@@ -41,7 +41,7 @@
/**
* 添加
*/
- @ApiOperation(value="巡查设置-添加", notes="巡查设置-添加")
+ @ApiOperation(value="巡查上报-添加", notes="巡查上报-添加")
@PostMapping(value = "/add")
public R add(@RequestBody PatrolReport patrolReport) {
return R.data(patrolReportService.save(patrolReport));
@@ -50,7 +50,7 @@
/**
* 编辑
*/
- @ApiOperation(value="巡查设置-编辑", notes="巡查设置-编辑")
+ @ApiOperation(value="巡查上报-编辑", notes="巡查上报-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public R edit(@RequestBody PatrolReport patrolReport) {
return R.data(patrolReportService.updateById(patrolReport));
@@ -62,7 +62,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) {
patrolReportService.removeById(id);
@@ -75,7 +75,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(this.patrolReportService.removeByIds(Arrays.asList(ids.split(","))));
@@ -87,11 +87,24 @@
* @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) {
PatrolReport byId = patrolReportService.getById(id);
return R.data(byId);
}
+ /**
+ * 自定义查询
+ *
+ * @param patrolReport
+ * @return
+ */
+ @ApiOperation(value="巡查上报-自定义查询", notes="巡查上报-自定义查询")
+ @PostMapping(value = "/customizeGetDetail")
+ public R customizeGetDetail(PatrolReport patrolReport) {
+ PatrolReport detail = patrolReportService.getOne(Condition.getQueryWrapper(patrolReport));
+ return R.data(detail);
+ }
+
}
--
Gitblit v1.9.3