zhongrj
2023-06-03 b112d242575fe96123b1e8dad434f46e6d2bb3d1
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTypeController.java
@@ -43,8 +43,8 @@
   @ApiOperation(value="巡查类型-分页列表查询", notes="巡查类型-分页列表查询")
   @GetMapping(value = "/list")
   public R queryPageList(PatrolType patrolType,Query query) {
//      IPage<PatrolType> pageList = patrolTypeService.selectPatrolType(Condition.getPage(query),patrolType);
      IPage<PatrolType> pageList = patrolTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolType));
      IPage<PatrolType> pageList = patrolTypeService.selectPatrolType(Condition.getPage(query),patrolType);
//      IPage<PatrolType> pageList = patrolTypeService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolType));
      return R.data(pageList);
   }
@@ -89,7 +89,7 @@
    * @return
    */
   @ApiOperation(value="巡查类型-通过id删除", notes="巡查类型-通过id删除")
   @DeleteMapping(value = "/delete")
   @PostMapping(value = "/delete")
   public R delete(@RequestParam(name="id",required=true) String id) {
      return R.data(patrolTypeService.removeById(id));
   }
@@ -101,7 +101,7 @@
    * @return
    */
   @ApiOperation(value="巡查类型-批量删除", notes="巡查类型-批量删除")
   @DeleteMapping(value = "/deleteBatch")
   @PostMapping(value = "/deleteBatch")
   public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
      return R.data(patrolTypeService.removeByIds(Arrays.asList(ids.split(","))));
   }