添加APP待办任务统计

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IPowerTransferCompanyResourcesService.java

@@ -3,24 +3,29 @@ package com.yeejoin.amos.boot.module.jcs.api.service;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
 import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 
-import java.util.List;
-
 /**
-* 调派单位资源 服务类
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 调派单位资源 服务类
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 public interface IPowerTransferCompanyResourcesService {
 
 
-    AlertCalled getByPowerTransferCompanyResourId(Long id );
+    AlertCalled getByPowerTransferCompanyResourId(Long id);
 
 
-    PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId,Long carId);
+    PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId, Long carId);
 
     void updateByAlertCalledId(Long alertCalledId);
 
-    void updatePowerTransferCompanyResourcesService(Long alertCalledId,Long carId,String code,int type,String remarks);
+    void updatePowerTransferCompanyResourcesService(Long alertCalledId, Long carId, String code, int type, String remarks);
 
+    /**
+     * 根据ID获取资源信息
+     *
+     * @param resourceId 资源id
+     * @return 车辆状态
+     */
+    PowerTransferCompanyResources getResourceById(String resourceId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-jcs-api/src/main/java/com/yeejoin/amos/boot/module/jcs/api/service/IUserCarService.java

 package com.yeejoin.amos.boot.module.jcs.api.service;
 
 
-import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
 import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
 
-import java.util.List;
-import java.util.Map;
-
 /**
-*
-*/
+ *
+ */
 public interface IUserCarService {
 
 
     UserCar selectByAmosUserId(Long id);
 
-    void add (UserCar userCar);
-    void delete (UserCar userCar);
+    void add(UserCar userCar);
+
+    void delete(UserCar userCar);
+
+    /**
+     * 获取用户绑定的车辆的状态为执行中的数量
+     *
+     * @return 执行中车辆的数量
+     */
+    int countUserCarExecuting(Long userId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/PowerTransferCompanyResourcesServiceImpl.java

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
-import com.yeejoin.amos.boot.module.common.api.mapper.FireTeamMapper;
 import com.yeejoin.amos.boot.module.jcs.api.dto.CarStatusInfoDto;
 import com.yeejoin.amos.boot.module.jcs.api.dto.PowerTransferCompanyResourcesDto;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
@@ -10,7 +9,6 @@ import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources
 import com.yeejoin.amos.boot.module.jcs.api.enums.FireCarStatusEnum;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.PowerTransferCompanyResourcesMapper;
 import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -21,26 +19,27 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-* 调派单位资源 服务实现类
-*
-* @author tb
-* @date 2021-06-17
-*/
+ * 调派单位资源 服务实现类
+ *
+ * @author tb
+ * @date 2021-06-17
+ */
 @Service
-public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerTransferCompanyResourcesDto,PowerTransferCompanyResources,PowerTransferCompanyResourcesMapper> implements IPowerTransferCompanyResourcesService {
+public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerTransferCompanyResourcesDto, PowerTransferCompanyResources, PowerTransferCompanyResourcesMapper> implements IPowerTransferCompanyResourcesService {
     @Resource
     PowerTransferCompanyResourcesMapper powerTransferCompanyResourcesMapper;
     @Autowired
     EquipFeignClient equipFeignClient;
+
     @Override
     public AlertCalled getByPowerTransferCompanyResourId(Long id) {
 
 
         QueryWrapper<PowerTransferCompanyResources> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode() );
-        queryWrapper.eq("resources_id", id.toString() );
+        queryWrapper.eq("status", FireCarStatusEnum.执行中.getCode());
+        queryWrapper.eq("resources_id", id.toString());
         PowerTransferCompanyResources alertFormValue = this.getOne(queryWrapper);
-        if(alertFormValue!=null){
+        if (alertFormValue != null) {
             return powerTransferCompanyResourcesMapper.getByPowerTransferCompanyResourId(alertFormValue.getPowerTransferCompanyId());
         }
         return null;
@@ -48,7 +47,7 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
 
     @Override
     public PowerTransferCompanyResources getByAlertCalledIdCarId(Long alertCalledId, Long carId) {
-        return powerTransferCompanyResourcesMapper.getByAlertCalledIdCarId(alertCalledId,carId);
+        return powerTransferCompanyResourcesMapper.getByAlertCalledIdCarId(alertCalledId, carId);
     }
 
     @Override
@@ -59,24 +58,24 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
 
     @Override
     @Transactional
-    public void updatePowerTransferCompanyResourcesService(Long alertCalledId, Long carId, String code,int type , String remarks) {
+    public void updatePowerTransferCompanyResourcesService(Long alertCalledId, Long carId, String code, int type, String remarks) {
 
-    PowerTransferCompanyResources powerTransferCompanyResources= powerTransferCompanyResourcesMapper.getByAlertCalledIdCarId(alertCalledId,carId);
+        PowerTransferCompanyResources powerTransferCompanyResources = powerTransferCompanyResourcesMapper.getByAlertCalledIdCarId(alertCalledId, carId);
         try {
 
-            if(type==2){
+            if (type == 2) {
                 powerTransferCompanyResources.setStatus(code);
                 powerTransferCompanyResources.setRemarks(remarks);
                 powerTransferCompanyResourcesMapper.updateById(powerTransferCompanyResources);
                 List<Object> carStatusInfoDtoList = new ArrayList();
                 //修改装备信息
                 CarStatusInfoDto carStatusInfo = new CarStatusInfoDto();
-                carStatusInfo.setSequenceNbr(carId+"");
+                carStatusInfo.setSequenceNbr(carId + "");
                 carStatusInfo.setStatus(FireCarStatusEnum.执勤.getCode());
                 carStatusInfoDtoList.add(carStatusInfo);
                 // 更新所有车辆状态为执勤
                 equipFeignClient.updateCarStatus(carStatusInfoDtoList);
-            }else{
+            } else {
                 powerTransferCompanyResources.setCarStatus(code);
                 powerTransferCompanyResources.setRemarks(remarks);
                 powerTransferCompanyResourcesMapper.updateById(powerTransferCompanyResources);
@@ -87,4 +86,11 @@ public class PowerTransferCompanyResourcesServiceImpl extends BaseService<PowerT
 
 
     }
+
+    @Override
+    public PowerTransferCompanyResources getResourceById(String resourceId) {
+        QueryWrapper<PowerTransferCompanyResources> powerTransferCompanyResourcesQueryWrapper = new QueryWrapper<>();
+        powerTransferCompanyResourcesQueryWrapper.eq("resources_id", resourceId);
+        return powerTransferCompanyResourcesMapper.selectOne(powerTransferCompanyResourcesQueryWrapper);
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/UserCarServiceImpl.java

 package com.yeejoin.amos.boot.module.jcs.biz.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.AircraftListTreeDto;
-import com.yeejoin.amos.boot.module.jcs.api.dto.KeyValueLabel;
-import com.yeejoin.amos.boot.module.jcs.api.entity.Aircraft;
-import com.yeejoin.amos.boot.module.jcs.api.entity.AlertFormValue;
+import com.yeejoin.amos.boot.module.jcs.api.entity.PowerTransferCompanyResources;
 import com.yeejoin.amos.boot.module.jcs.api.entity.UserCar;
-import com.yeejoin.amos.boot.module.jcs.api.enums.AircraftFileTypeEnum;
-import com.yeejoin.amos.boot.module.jcs.api.mapper.AircraftMapper;
 import com.yeejoin.amos.boot.module.jcs.api.mapper.UserCarMapper;
-import com.yeejoin.amos.boot.module.jcs.api.service.IAircraftService;
+import com.yeejoin.amos.boot.module.jcs.api.service.IPowerTransferCompanyResourcesService;
 import com.yeejoin.amos.boot.module.jcs.api.service.IUserCarService;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
-import com.yeejoin.amos.feign.systemctl.Systemctl;
-import com.yeejoin.amos.feign.systemctl.model.FileInfoModel;
-import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.typroject.tyboot.core.foundation.exception.BaseException;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.StringUtil;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.annotation.Condition;
-import org.typroject.tyboot.core.rdbms.annotation.Operator;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.DataNotFound;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 
 /**
@@ -49,6 +23,11 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa
 
     @Autowired
     UserCarMapper UserCarMapper;
+
+    @Autowired
+    IPowerTransferCompanyResourcesService companyResourcesService;
+
+
     @Override
     public UserCar selectByAmosUserId(Long id) {
         QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
@@ -61,11 +40,11 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa
 
         QueryWrapper<UserCar> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("amos_user_id", userCar.getAmosUserId());
-        UserCar uer= UserCarMapper.selectOne(queryWrapper);
-        if(uer!=null){
+        UserCar uer = UserCarMapper.selectOne(queryWrapper);
+        if (uer != null) {
             userCar.setSequenceNbr(uer.getSequenceNbr());
             UserCarMapper.updateById(userCar);
-        }else{
+        } else {
             UserCarMapper.insert(userCar);
         }
     }
@@ -76,4 +55,22 @@ public class UserCarServiceImpl extends BaseService<AircraftDto, UserCar, UserCa
         queryWrapper.eq("amos_user_id", userCar.getAmosUserId());
         UserCarMapper.delete(queryWrapper);
     }
+
+    @Override
+    public int countUserCarExecuting(Long userId) {
+        UserCar userCar = this.selectByAmosUserId(userId);
+        if (userCar == null) {
+            return 0;
+        }
+        PowerTransferCompanyResources resource = companyResourcesService.getResourceById(userCar.getCarId().toString());
+        if (resource == null) {
+            return 0;
+        }
+        if ("executing".equals(resource.getCarStatus())) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -242,7 +242,7 @@ public class PlanTaskController extends AbstractBaseController {
      * 根据点查询用户权限所有巡检执行计划
      *
      * @param dataType   数据类型
-     * @param serial     巡检点编号
+     * @param pointNo     巡检点编号
      * @param planTaskId 巡检任务Id
      * @return
      */

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanTaskController.java

@@ -22,12 +22,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
@@ -515,6 +510,27 @@ public class PlanTaskController extends AbstractBaseController {
         return ResponseHelper.buildResponse(planTaskService.getPlanTasks(params, pageable));
     }
 
+    /**
+     * 根据用户统计待办任务数量
+     *
+     * @param userId 用户id
+     * @return 统计数量
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "消防监督待办任务查询-mobile", notes = "根据用户查询执行中的任务")
+    @GetMapping("/countWaitingTaskByUser")
+    public CommonResponse countWaitingTaskByUser(
+            @ApiParam(value = "用户ID") @RequestParam("userId") String userId
+    ) {
+        try {
+            return CommonResponseUtil.success(planTaskService.countWaitingTaskByUser(userId));
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error(e.getMessage(), e);
+            return CommonResponseUtil.failure(e.getMessage());
+        }
+    }
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "根据检查任务ID查询计划任务详情和任务点(<font color='blue'>手机app</font>)", notes = "根据检查任务ID查询计划任务详情和任务点(<font color='blue'>手机app</font>)")
     @RequestMapping(value = "/detail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/mapper/PlanTaskMapper.java

 package com.yeejoin.amos.supervision.business.dao.mapper;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.supervision.business.entity.mybatis.CheckChkExListBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.PlanTaskPointInputItemBo;
 import com.yeejoin.amos.supervision.business.entity.mybatis.PointCheckDetailBo;
@@ -12,39 +8,48 @@ import com.yeejoin.amos.supervision.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
 import com.yeejoin.amos.supervision.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
-import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
-import org.apache.ibatis.annotations.Param;
-
 import com.yeejoin.amos.supervision.dao.entity.PlanTask;
 import com.yeejoin.amos.supervision.dao.entity.PointInputItem;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface PlanTaskMapper extends BaseMapper {
     /**
      * 统计-计划执行
+     *
      * @param params
      * @return
      */
     long countPlanTask(PlanTaskPageParam params);
+
     /**
      * 计划执行查询
+     *
      * @param params
      * @return
      */
     List<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params);
+
     /**
      * 批量删除
+     *
      * @param strArry
      */
     void planTaskDet(String[] strArry);
 
     /**
      * 更新任务表
+     *
      * @param param
      */
     void updatePlanTaskPtInfo(HashMap<String, Object> param);
 
     /**
      * 查询需删除的任务信息列表
+     *
      * @param param
      * @return
      */
@@ -57,6 +62,7 @@ public interface PlanTaskMapper extends BaseMapper {
      * @return
      */
     List<PlanTask> getPlanTaskByRouteId(@Param(value = "routeId") Long routeId);
+
     /**
      * 根据巡检点id获取关联的计划任务
      *
@@ -64,48 +70,68 @@ public interface PlanTaskMapper extends BaseMapper {
      * @return
      */
     List<HashMap<String, Object>> getPlanTaskByPointId(HashMap<String, Object> param);
+
     /**
      * 根据条件查询计划任务列表
+     *
      * @param params
      * @return
      */
     List<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params);
+
+    /**
+     * 根据用户统计待办任务数量
+     *
+     * @param userId 用户id
+     * @return 统计数量
+     */
+    int countWaitingTaskByUser(@Param(value = "userId") String userId);
+
     /**
      * 通过计划任务Id获得计划任务信息
+     *
      * @param planTaskId
      * @return
      */
-	Map queryPlanTaskById(@Param(value="planTaskId") Long planTaskId);
+    Map queryPlanTaskById(@Param(value = "planTaskId") Long planTaskId);
+
     /**
      * 通过计划任务Id获取任务所有点信息
+     *
      * @param params
      * @return
      */
     List<Map<String, Object>> getPlanTaskPoints(HashMap<String, Object> params);
 
     long getPlanTaskPointsCount(HashMap<String, Object> params);
+
     /**
      * 获取用户当前所有可以做的任务个数
+     *
      * @param userId
      * @return
      */
-	int getCurrentPlanTaskCount(@Param(value="userId") String userId);
+    int getCurrentPlanTaskCount(@Param(value = "userId") String userId);
 
     /**
      * 根据计划任务id获取所有巡检项信息
+     *
      * @param planTaskId
      * @return
      */
-	List<PlanTaskPointInputItemBo> getPlanTaskPointInputItemByPlanTaskId(@Param(value="planTaskId") Long planTaskId, @Param(value="planTaskDetailStatus") String planTaskDetailStatus);
+    List<PlanTaskPointInputItemBo> getPlanTaskPointInputItemByPlanTaskId(@Param(value = "planTaskId") Long planTaskId, @Param(value = "planTaskDetailStatus") String planTaskDetailStatus);
 
     /**
      * 条件查询数据
+     *
      * @param param
      * @return
      */
     List<PlanTaskVo> getPlanTaskInfoList(PlanTaskPageParam param);
+
     /**
      * 根据ids获取执行计划
+     *
      * @param ids
      * @return
      */
@@ -113,16 +139,20 @@ public interface PlanTaskMapper extends BaseMapper {
 
     /**
      * 分页统计
+     *
      * @param param
      * @return
      */
     long countChkExListData(CheckPtListPageParam param);
+
     /**
      * 今日执行情况，业务信息查询
+     *
      * @param param
      * @return
      */
     List<CheckChkExListBo> getChkExList(CheckPtListPageParam param);
+
     long getPlanTasksCount(HashMap<String, Object> params);
 
     Map<String, Object> getPlanTaskStatisticsForApp(HashMap<String, Object> params);
@@ -130,6 +160,7 @@ public interface PlanTaskMapper extends BaseMapper {
 
     /**
      * 根据计划id和点id获取点详情
+     *
      * @param planTaskId
      * @param pointId
      * @return
@@ -138,19 +169,24 @@ public interface PlanTaskMapper extends BaseMapper {
 
     /**
      * 根据路线id和点id获取该点的检查项
+     *
      * @param routeId
      * @param pointId
      * @return
      */
-	List<PointCheckDetailBo> getPointInputByRouteIdAndPointId(@Param("routeId") Long routeId,@Param("pointId") Long pointId);
+    List<PointCheckDetailBo> getPointInputByRouteIdAndPointId(@Param("routeId") Long routeId, @Param("pointId") Long pointId);
+
     /**
      * 统计当日任务累计完成情况
+     *
      * @param loginOrgCode
      * @return
      */
     String getCumulativePlanCountByOrgCode(@Param("orgCode") String loginOrgCode);
+
     /**
      * 获取用户离线巡检计划任务信息
+     *
      * @param params
      * @return
      */
@@ -163,17 +199,19 @@ public interface PlanTaskMapper extends BaseMapper {
      * @param pointId
      * @return
      */
-	List<PointInputItem> getRoutePointInputItem(@Param(value="routeId") long routeId, @Param(value="pointId") long pointId);
+    List<PointInputItem> getRoutePointInputItem(@Param(value = "routeId") long routeId, @Param(value = "pointId") long pointId);
 
 
     List<CodeOrderVo> queryCodeOrderVo(HashMap<String, Object> params);
+
     /**
      * 重新统计用户重做日期段内计划任务
+     *
      * @param userId
      * @param refDate
      * @param orgCode
      */
-	void reformStatistics(@Param(value="userId") String userId, @Param(value="refDate") String refDate, @Param(value="orgCode")String orgCode);
+    void reformStatistics(@Param(value = "userId") String userId, @Param(value = "refDate") String refDate, @Param(value = "orgCode") String orgCode);
 
     List<Map<String, Object>> countFinishByPlanIds(List<Long> planIds);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java

@@ -43,6 +43,7 @@ import com.yeejoin.amos.supervision.exception.YeeException;
 import com.yeejoin.amos.supervision.feign.RemoteSecurityService;
 import com.yeejoin.amos.supervision.quartz.IJobService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.ibatis.annotations.Param;
 import org.assertj.core.util.Lists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -608,6 +609,11 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
     }
 
     @Override
+    public int countWaitingTaskByUser(String userId) {
+        return planTaskMapper.countWaitingTaskByUser(userId);
+    }
+
+    @Override
     public Map queryPlanTaskById(Long planTaskId) {
         Map map = new HashMap();
         map = planTaskMapper.queryPlanTaskById(planTaskId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanTaskService.java

@@ -10,6 +10,7 @@ import com.yeejoin.amos.supervision.business.vo.CodeOrderVo;
 import com.yeejoin.amos.supervision.business.vo.LeavePlanTaskVo;
 import com.yeejoin.amos.supervision.business.vo.PlanTaskVo;
 import com.yeejoin.amos.supervision.core.common.request.CommonPageable;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Page;
 
 import com.yeejoin.amos.supervision.business.param.CheckPtListPageParam;
@@ -39,8 +40,10 @@ public interface IPlanTaskService {
      * 执行计划导出
      */
     List<PlanTaskVo> planTaskReport(String toke, String product, String appKey, PlanTaskPageParam params);
+
     /**
      * 自动任务执行
+     *
      * @param runDate
      */
     void taskExecution(String runDate);
@@ -62,6 +65,7 @@ public interface IPlanTaskService {
 
     /**
      * app 根据条件查询用户权限内所有当前巡检计划任务
+     *
      * @param params
      * @return
      */
@@ -69,6 +73,7 @@ public interface IPlanTaskService {
 
     /**
      * 根据计划任务ID查询任务想起
+     *
      * @param id
      * @return
      */
@@ -76,6 +81,7 @@ public interface IPlanTaskService {
 
     /**
      * 天剑查询假话任务信息
+     *
      * @param params
      * @param page
      * @return
@@ -83,7 +89,16 @@ public interface IPlanTaskService {
     Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable page);
 
     /**
+     * 根据用户统计待办任务数量
+     *
+     * @param userId 用户id
+     * @return 统计数量
+     */
+    int countWaitingTaskByUser(String userId);
+
+    /**
      * 根据计划任务Id获取计划任务信息
+     *
      * @param planTaskId
      * @return
      */
@@ -91,6 +106,7 @@ public interface IPlanTaskService {
 
     /**
      * 根据计划ID获取所有的 任务计划巡检点
+     *
      * @param params
      * @return
      */
@@ -98,12 +114,15 @@ public interface IPlanTaskService {
 
     /**
      * 获取用户当前所有有的计划任务
+     *
      * @param userId
      * @return
      */
     int getCurrentPlanTaskCount(String userId);
+
     /**
      * 今日执行情况
+     *
      * @param params
      * @return
      */
@@ -111,25 +130,28 @@ public interface IPlanTaskService {
 
     /**
      * 根据id获取执行计划
+     *
      * @param ids
      * @return
      */
-	List<PlanTaskVo> getPlanTaskListByIds(String toke,String product,String appKey,Long[] ids);
+    List<PlanTaskVo> getPlanTaskListByIds(String toke, String product, String appKey, Long[] ids);
 
     /**
      * 根据任务id点id 获取点详情
+     *
      * @param planTaskId
      * @param pointId
      * @return
      */
-	AppPointCheckRespone queryPointPlanTaskDetail(String toke,String product,String appKey,Long planTaskId,Long pointId);
+    AppPointCheckRespone queryPointPlanTaskDetail(String toke, String product, String appKey, Long planTaskId, Long pointId);
 
-	AppPointCheckRespone queryPointPlanTaskDetailInVersion2(String toke,String product,String appKey,Long planTaskId,Long pointId);
+    AppPointCheckRespone queryPointPlanTaskDetailInVersion2(String toke, String product, String appKey, Long planTaskId, Long pointId);
 
     Map<String, Object> getPlanTaskStatisticsForApp(HashMap<String, Object> params);
 
     /**
      * 获取公司计划累计情况
+     *
      * @param loginOrgCode
      * @return
      */
@@ -146,7 +168,7 @@ public interface IPlanTaskService {
 
     void initPlanStatusOrGenDate();
 
-	List<Map<String,Object>> queryPlanTaskTimeAxis(Long userId,Integer createDate);
+    List<Map<String, Object>> queryPlanTaskTimeAxis(Long userId, Integer createDate);
 
-	List<Map<String,Object>> queryTimeAxis(Long userId,Integer createDate);
+    List<Map<String, Object>> queryTimeAxis(Long userId, Integer createDate);
 }