完善

platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormStatusEnum.java

@@ -12,24 +12,20 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum RepairApplicationFormStatusEnum {
-    /**
-     * 待分配
-     */
-    NOT_ALLOCATED(1),
     /**
      * 待接收
      */
-    ALLOCATED(2),
+    NOT_ALLOCATED(1),
     /**
      * 维修中
      */
-    PROCESSING(3),
+    PROCESSING(2),
     /**
-     * 完成待提交
+     * 待审核
      */
-    WAIT_SUBMIT(31),
+    WAIT_SUBMIT(3),
     /**
-     * 待验收
+     * 审核中
      */
     NOT_ACCEPTANCE(4),
     /**

platform-rest/src/main/java/com/platform/rest/controller/index/IndexController.java

@@ -4,6 +4,7 @@ import com.platform.common.model.UserInfo;
 import com.platform.common.util.R;
 import com.platform.common.util.SecurityUtils;
 import com.platform.dao.entity.upms.SysUser;
+import com.platform.dao.enums.RepairApplicationFormStatusEnum;
 import com.platform.dao.vo.index.GatherTaskVO;
 import com.platform.service.check.CheckJobService;
 import com.platform.service.repair.RepairApplicationFormService;
@@ -16,6 +17,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @Description 生产商 控制器
  * @Author future
@@ -47,8 +51,12 @@ public class IndexController {
         int lubricationTask = checkJobService.countUserTask(userInfo.getUserId(), 2);
         // 加油任务
         int oilTask = sbOilService.countUserTask(userInfo.getUserId());
-        // 维修任务
-        int repairTask = repairApplicationFormService.countUserTask(userInfo.getUserId());
+
+        // 维修任务：所有的未完成的,登录用户需要完成的
+        List<Integer> repairStatusList = new ArrayList<Integer>();
+        repairStatusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
+        repairStatusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+        int repairTask = repairApplicationFormService.countUserTask(userInfo.getUserId(), repairStatusList);
 
         // 维修任务
         int repairCheckTask = repairApplicationFormService.countUserCheckTask(userInfo.getUserId());

platform-service/src/main/java/com/platform/service/repair/RepairApplicationFormService.java

@@ -88,7 +88,7 @@ public interface RepairApplicationFormService extends IBaseService<RepairApplica
      * @param userId ：
      * @return ：
      */
-    int countUserTask(String userId);
+    int countUserTask(String userId, List<Integer> statusList);
 
     /**
      * 统计设备维修单

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -384,7 +384,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     @Override
     public void receive(String id) {
         RepairApplicationForm applicationForm = mapper.selectById(id);
-        if (!RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue().equals(applicationForm.getStatus()) && !RepairApplicationFormStatusEnum.ALLOCATED.getValue().equals(applicationForm.getStatus()) && !RepairApplicationFormStatusEnum.REBACK.getValue().equals(applicationForm.getStatus())) {
+        if (!RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue().equals(applicationForm.getStatus()) && !RepairApplicationFormStatusEnum.REBACK.getValue().equals(applicationForm.getStatus())) {
             throw new BusinessException("该状态不允许接收任务");
         }
         UserInfo userInfo = SecurityUtils.getUser().getUserInfo();
@@ -419,7 +419,7 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     @Override
     public void dispatchModelByDTO(RepairApplicationFormDTO model) {
         RepairApplicationForm applicationForm = mapper.selectById(model.getId());
-        if (!RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue().equals(applicationForm.getStatus()) && !RepairApplicationFormStatusEnum.ALLOCATED.getValue().equals(applicationForm.getStatus()) && !RepairApplicationFormStatusEnum.REBACK.getValue().equals(applicationForm.getStatus())) {
+        if (!RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue().equals(applicationForm.getStatus()) && !RepairApplicationFormStatusEnum.REBACK.getValue().equals(applicationForm.getStatus())) {
             throw new BusinessException("该状态不允许派工任务, id, status:" + applicationForm.getId() + "," + applicationForm.getStatus());
         }
 
@@ -445,7 +445,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         applicationForm.setId(model.getId());
         applicationForm.setRepairUserId(model.getRepairUserId());
         applicationForm.setRepairDispatchRemark(model.getRepairDispatchRemark());
-        applicationForm.setStatus(RepairApplicationFormStatusEnum.ALLOCATED.getValue());
+        applicationForm.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
+        applicationForm.setRepairStartTime(LocalDateTime.now());
         applicationForm.setUpdateTime(LocalDateTime.now());
         super.modModelByPrimaryKey(applicationForm);
 
@@ -645,14 +646,13 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
      * @return
      */
     @Override
-    public int countUserTask(String userId) {
+    public int countUserTask(String userId, List<Integer> statusList) {
         Weekend<RepairApplicationForm> weekend = new Weekend<>(RepairApplicationForm.class);
         weekend.weekendCriteria().andEqualTo(RepairApplicationForm::getRepairUserId, userId);
-        List<Integer> repairStatusList = new ArrayList<Integer>();
-        repairStatusList.add(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
-        repairStatusList.add(RepairApplicationFormStatusEnum.ALLOCATED.getValue());
-        repairStatusList.add(RepairApplicationFormStatusEnum.PROCESSING.getValue());
-        weekend.weekendCriteria().andIn(RepairApplicationForm::getStatus, repairStatusList);
+        if(CollectionUtil.isNotEmpty(statusList) && statusList.size()>0){
+            weekend.weekendCriteria().andIn(RepairApplicationForm::getStatus, statusList);
+        }
+        weekend.weekendCriteria().andIn(RepairApplicationForm::getStatus, statusList);
         return mapper.selectCountByExample(weekend);
     }
 
@@ -660,9 +660,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     public int countUserCheckTask(String userId) {
         Weekend<RepairApplicationForm> weekend = new Weekend<>(RepairApplicationForm.class);
         weekend.weekendCriteria().andEqualTo(RepairApplicationForm::getCheckUserId, userId);
-        List<Integer> repairStatusList = new ArrayList<Integer>();
-        repairStatusList.add(RepairApplicationFormStatusEnum.NOT_ACCEPTANCE.getValue());
-        weekend.weekendCriteria().andIn(RepairApplicationForm::getStatus, repairStatusList);
         return mapper.selectCountByExample(weekend);
     }
 
@@ -693,7 +690,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 RepairApplicationForm update = new RepairApplicationForm();
                 update.setId(item.getId());
                 update.setRepairUserId(repairManager.getUserId());
-                update.setStatus(RepairApplicationFormStatusEnum.ALLOCATED.getValue());
+                update.setRepairStartTime(LocalDateTime.now());
+                update.setStatus(RepairApplicationFormStatusEnum.PROCESSING.getValue());
                 mapper.updateByPrimaryKeySelective(update);
 
                 SpringContextHolder.publishEvent(new WorkplaceBacklogEvent(WorkplaceBacklogTypeEnum.REPAIR.getValue(), WorkplaceBacklogDetailTypeEnum.REPAIR_APPLICATION.getValue(),

platform-service/src/main/java/com/platform/service/repair/impl/RepairFormServiceImpl.java

@@ -127,10 +127,10 @@ public class RepairFormServiceImpl extends BaseServiceImpl<RepairFormMapper, Rep
         int count = mapper.selectCountByExample(weekend);
         model.setNo(IdGeneratorUtils.getRepairFormNo(++count));
         RepairForm repairForm = super.saveModelByDTO(model);
-        // 修改报修单的状态为已分配
+        // 修改报修单的状态为未分配
         RepairApplicationForm applicationForm = new RepairApplicationForm();
         applicationForm.setId(model.getApplicationId());
-        applicationForm.setStatus(RepairApplicationFormStatusEnum.ALLOCATED.getValue());
+        applicationForm.setStatus(RepairApplicationFormStatusEnum.NOT_ALLOCATED.getValue());
         repairApplicationFormMapper.updateByPrimaryKeySelective(applicationForm);
         return repairForm;
     }