巡查任务巡查责任人完成任务逻辑修改

guoshilong

2023-05-18 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java

@@ -37,8 +37,8 @@
   @ApiOperation(value="巡查设置-分页列表查询", notes="巡查设置-分页列表查询")
   @GetMapping(value = "/list")
   public R<IPage<PatrolConfig>> queryPageList(PatrolConfig patrolConfig,Query query) {
//      IPage<PatrolConfig> pageList =  patrolConfigService.selectPatrolConfig(Condition.getPage(query),patrolConfig);
      IPage<PatrolConfig> pageList = patrolConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolConfig));
      IPage<PatrolConfig> pageList =  patrolConfigService.selectPatrolConfig(Condition.getPage(query),patrolConfig);
//      IPage<PatrolConfig> pageList = patrolConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolConfig));
      return R.data(pageList);
   }

@@ -75,7 +75,6 @@
   @ApiOperation(value="巡查设置-通过id删除", notes="巡查设置-通过id删除")
   @DeleteMapping(value = "/delete")
   public R delete(@RequestParam(name="id",required=true) String id) {
      patrolConfigService.removeById(id);
      return R.data(patrolConfigService.removeById(id));
   }