筹建完善

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

@@ -34,7 +34,7 @@ public enum WorkplaceBacklogDetailTypeEnum {
     SB_CALLER_REPAIR(28, "设备部报修审核"),
     SB_APPLY_BIG_REPAIR(30, "报修转大修审核"),
     PREPARATION_REPAIR(41, "筹建申请"),
-    PREPARATION_REPAIR_DISPATCH(32, "筹建报修派工通知"),
+    PREPARATION_REPAIR_DISPATCH(32, "筹建工单通知"),
     OUT_STORE_NOTICE(33, "出库审批"),
     REPAIR_EXAMINE(24, "维修审核通知"),
     CHECK_RUN_EXPIRE(7, "润滑任务过期通知"),

platform-dao/src/main/java/com/platform/dao/util/MessageTemplateUtil.java

@@ -440,13 +440,14 @@ public class MessageTemplateUtil {
     }
 
     public static String getInfoByStatus(String no,int status) {
-        if(status == PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue()
+        if(status == PreparationStatusEnum.NOT_ALLOCATED.getValue() ||
+                status == PreparationStatusEnum.APPLY_MANAGER_VERIFY_SUCCESS.getValue()
                 || status == PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue()
                 || status == PreparationStatusEnum.PROCESSING.getValue()
         || status == PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue()
         || status == PreparationStatusEnum.SECOND_PROCESSING.getValue()
         || status == PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue()){
-            return String.format("有一条新的筹建工单【%s】待处理，请及时处理", no);
+            return String.format("筹建工单【%s】待处理，请及时处理", no);
         }else if(status == PreparationStatusEnum.CLOSE.getValue()) {
             return String.format("筹建工单【%s】被拒绝，请知悉", no);
         }else if(status == PreparationStatusEnum.APPLY_MANAGER_VERIFY_BACK.getValue()

platform-rest/src/main/java/com/platform/rest/controller/preparation/PreparationController.java

@@ -163,6 +163,19 @@ public class PreparationController {
     return new R<>();
   }
 
+  /**
+   * 费用填报
+   * @param preparationDTO 维修单DTO
+   * @return R
+   */
+  @SysLog("筹建工单费用填报")
+  @PutMapping("/finish/fee/{id}")
+  public R fillFee(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody PreparationDTO preparationDTO) {
+    preparationDTO.setId(id);
+    preparationService.fillFee(preparationDTO);
+    return new R<>();
+  }
+
   /**
    * 派单
    *

platform-service/src/main/java/com/platform/service/preparation/PreparationService.java

@@ -88,4 +88,11 @@ public interface PreparationService extends IBaseService<Preparation, Preparatio
      * @param model
      */
     void pushVerify(PreparationDTO model);
+
+    /**
+     * 费用填报
+     * @param model
+     */
+    void fillFee(PreparationDTO model);
+
 }

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -288,9 +288,6 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
                 statusList.add(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
                 statusList.add(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
             } else if (record.getSearchType() == 3) { // 我的工单
-                statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
-                statusList.add(PreparationStatusEnum.PROCESSING.getValue());
-                statusList.add(PreparationStatusEnum.FINISHED.getValue());
             }
             // 超级管理员可以看到各个状态下的所有数据 相关领导，可以在这里进行设置
             if (userInfo.getSuperAdmin() == 1 || record.getSearchType() == -1) {
@@ -429,10 +426,6 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         updPre.setRepairEndTime(LocalDateTime.now());
         updPre.setRepairMinutes(DateUtils.getDurationHours(preparation.getRepairStartTime(), updPre.getRepairEndTime()));
         updPre.setStatus(PreparationStatusEnum.SECOND_PROCESSING_VERIFYING.getValue());
-        updPre.setFee(model.getFee());
-        // 保存文件图片
-        sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_IMGS.getValue(), model.getImageList());
-        sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_FILES.getValue(), model.getFileList());
         mapper.updateByPrimaryKeySelective(updPre);
     }
 
@@ -715,6 +708,33 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         sendMessageToApplyLeader(sendUsers, updPre);
     }
 
+    @Override
+    public void fillFee(PreparationDTO model) {
+        Preparation preparation = mapper.selectByPrimaryKey(model.getId());
+        String currentUserId = SecurityUtils.getUserInfo().getUserId();
+        if (!currentUserId.equals(preparation.getRepairUserId())) {
+            throw new DeniedException("不是该工单执行人，不可以填报费用");
+        }
+        Preparation updPre = new Preparation();
+        updPre.setId(model.getId());
+        updPre.setStatus(PreparationStatusEnum.FIRST_PROCESSING_VERIFYING.getValue());
+        updPre.setFee(model.getFee());
+        // 保存文件图片
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_IMGS.getValue(), model.getImageList());
+        sysFileService.saveFile(model.getId(), SysFileTypeEnum.PREPARATION_APPLICATION_FILES.getValue(), model.getFileList());
+        mapper.updateByPrimaryKeySelective(updPre);
+        // 添加状态记录
+        addRecord(updPre,PreparationRecordTypeEnum.FLOW.getValue(), "");
+        // 添加审核记录
+        addRecord(updPre,PreparationRecordTypeEnum.VERIFY.getValue(), "同意");
+        // 给申请人发消息
+        SysUserDTO sendDTO = new SysUserDTO();
+        sendDTO.setUserId(preparation.getUserId());
+        List<SysUserVO> sendUsers = sysUserMapper.getSysUserVO(sendDTO);
+        updPre.setNo(preparation.getNo());
+        sendMessageToApplyLeader(sendUsers, updPre);
+    }
+
     private String getParentPositionId(String positionId) {
         SbPosition sbPosition = sbPositionMapper.selectByPrimaryKey(positionId);
         while (!StringUtils.isEmpty(sbPosition.getParentId())) {