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

guoshilong

2023-05-18 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c

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

@@ -1,6 +1,7 @@
package cn.gistack.sm.patrol.controller;

import java.util.Arrays;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@@ -42,11 +43,21 @@
   @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);
   }

    /**
     * 获取所有巡查类型
     */
    @ApiOperation(value="获取所有巡查类型", notes="获取所有巡查类型")
    @GetMapping(value = "/all")
   public R getAll(){
      List<PatrolType> list = patrolTypeService.list();
      return R.data(list);
   }

   /**
    * 添加
    *