Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2024-01-15 f6569368640f0c0adf9b7e5955b9e7af5ff3efba

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

@@ -4,7 +4,9 @@
import cn.gistack.sm.patrol.entity.PatrolReport;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.vo.BladeFlowTask;
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.TaskStatusCount;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseService;

@@ -55,11 +57,28 @@
    * @param patrolTask 任务实体
    * @return boolean
    */
   boolean startProcess(PatrolTask patrolTask);
   PatrolTask startProcess(PatrolTask patrolTask);

   boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId);
   boolean patrolCompleteTask(PatrolTaskVO patrolTaskVO,String currentUserId,String taskUser);

   boolean chargeCompletePerson(BladeFlowTask bladeFlowTask);

   PatrolTask customizeGetById(String businessId);
   PatrolTaskVO customizeGetById(String businessId);

    List<PatrolTask> getAll(PatrolTaskVO patrolTaskVO);

   /**
    * 获取巡查报表
    * @param patrolTaskReport
    * @return
    */
   IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport);

   IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport);

   List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport);

   List<TaskStatusCount> getTaskStatusCount(PatrolTaskVO patrolTaskVO);

   List<TaskStatusCount> getTaskTypeCount(PatrolTaskVO patrolTaskVO);
}