筹建操作记录表

platform-dao/src/main/java/com/platform/dao/dto/preparation/PreparationDTO.java

@@ -199,12 +199,4 @@ public class PreparationDTO extends BaseDTO implements Serializable {
      */
     private String applyVerifyUserId;
 
-
-    /**
-     * 审核意见
-     */
-    private String verifyRemark;
-
-
-
 }

platform-dao/src/main/java/com/platform/dao/dto/preparation/PreparationRecordDTO.java

@@ -37,4 +37,9 @@ public class PreparationRecordDTO extends BaseDTO implements Serializable {
      */
     private String remark;
 
+    /**
+     * 记录类型 1 状态流程日志  2 审批记录
+     */
+    private Integer type;
+
 }

platform-dao/src/main/java/com/platform/dao/entity/preparation/Preparation.java

@@ -141,13 +141,29 @@ public class Preparation implements Serializable{
      */
     private String executeDept;
     /**
-     * 申请部分审核人
+     * 申请部门主管
      */
     private String applyVerifyUserId;
 
     /**
-     * 审核意见
+     * 申请原因
      */
-    private String verifyRemark;
+    private String applyReason;
+
+    /**
+     * 收件部门
+     */
+    private String receiveDept;
+
+    private String name; // 任务名称
+
+    /**
+     * 申请部门负责人
+     */
+    private String applyVerifyLeader;
+    /**
+     * 收件部门负责人
+     */
+    private String receiveVerifyLeader;
 
 }

platform-dao/src/main/java/com/platform/dao/entity/preparation/PreparationRecord.java

@@ -28,7 +28,7 @@ public class PreparationRecord implements Serializable{
      */
     private String preparationId;
     /**
-     * 操作人
+     * 操作人-审核人
      */
     private String realName;
 
@@ -37,7 +37,7 @@ public class PreparationRecord implements Serializable{
      */
     private Integer status;
     /**
-     * 备注
+     * 备注-审核备注
      */
     private String remark;
     /**
@@ -64,5 +64,9 @@ public class PreparationRecord implements Serializable{
      * 更新人名称
      */
     private String updateUserName;
+    /**
+     * 记录类型 1 状态流程日志  2 审批记录
+     */
+    private Integer type;
 
 }

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

@@ -13,29 +13,73 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PreparationStatusEnum {
     /**
-     * 待审核
+     * 待主管审核
      */
     NOT_ALLOCATED(1),
     /**
-     * 审核通过-待接单
+     * 申请部门主管审核通过-待申请部门负责人审核
      */
-    VERIFY_SUCCESS(2),
+    APPLY_MANAGER_VERIFY_SUCCESS(2),
     /**
-     * 审核被拒
+     * 申请部门主管审核拒绝
      */
-    VERIFY_FAIL(3),
+    APPLY_MANAGER_VERIFY_FAIL(3),
     /**
-     * 待分配
+     * 申请部门主管审核退回
      */
-    WAIT_DISPATCH(4),
+    APPLY_MANAGER_VERIFY_BACK(4),
+    /**
+     * 申请部门负责人审核通过-收件部处理中
+     */
+    APPLY_LEADER_VERIFY_SUCCESS(5),
+    /**
+     * 申请部门负责人审核拒绝
+     */
+    APPLY_LEADER_VERIFY_FAIL(6),
+    /**
+     * 申请部门负责人审核回退
+     */
+    APPLY_LEADER_VERIFY_BACK(7),
+    /**
+     * 收件负责人派单--材料费用执行中
+     */
+    PROCESSING(8),
+    /**
+     * 收件负责人拒绝
+     */
+    RECEIVE_VERIFY_FAIL(9),
+    /**
+     * 收件负责人回退
+     */
+    RECEIVE_VERIFY_BACK(10),
+    /**
+     * 材料费用审核中
+     */
+    FIRST_PROCESSING_VERIFYING(11),
+    /**
+     * 材料费用审核-拒绝
+     */
+    FIRST_PROCESSING_VERIFY_FAIL(12),
+    /**
+     * 材料费用审核-回退
+     */
+    FIRST_PROCESSING_VERIFY_BACK(13),
     /**
      * 执行中
      */
-    PROCESSING(5),
+    SECOND_PROCESSING(14),
+    /**
+     * 验收中
+     */
+    SECOND_PROCESSING_VERIFYING(15),
     /**
      * 已完成
      */
-    FINISHED(6),
+    FINISHED(16),
+    /**
+     * 验收回退
+     */
+    SECOND_PROCESSING_BACK(17),
     ;
     private final Integer value;
 }

platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationRecordVO.java

@@ -36,4 +36,9 @@ public class PreparationRecordVO extends BaseVO implements Serializable {
      */
     private String remark;
 
+    /**
+     * 记录类型 1 状态流程日志  2 审批记录
+     */
+    private Integer type;
+
 }

platform-dao/src/main/java/com/platform/dao/vo/query/preparation/PreparationVO.java

@@ -161,10 +161,4 @@ public class PreparationVO extends BaseVO implements Serializable {
 
     private String executeMangers;
 
-
-    /**
-     * 审核意见
-     */
-    private String verifyRemark;
-
 }

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

@@ -1,14 +1,12 @@
 package com.platform.service.preparation;
 
-import com.platform.dao.dto.repair.RepairApplicationFormDTO;
-import com.platform.dao.vo.export.preparation.ExportPreparationNumVO;
-import com.platform.dao.vo.query.preparation.PreparationVO;
+import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.dao.dto.preparation.PreparationDTO;
 import com.platform.dao.entity.preparation.Preparation;
-import com.platform.common.bean.AbstractPageResultBean;
+import com.platform.dao.vo.export.preparation.ExportPreparationNumVO;
+import com.platform.dao.vo.query.preparation.PreparationVO;
 import com.platform.dao.vo.report.AllPreparationReportVO;
 import com.platform.dao.vo.report.PreparationReportByStatusVO;
-import com.platform.dao.vo.report.RepairReport24VO;
 import com.platform.service.base.IBaseService;
 
 import java.time.LocalDate;

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

@@ -274,8 +274,8 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         record.setTempUserId(userInfo.getUserId());
         if(record.getSearchType() != null && record.getStatus() == null){
             List<Integer> statusList = new ArrayList<>();
-            if(record.getSearchType() == 1){ // 待接工单
-                statusList.add(PreparationStatusEnum.VERIFY_SUCCESS.getValue());
+            if(record.getSearchType() == 1){ // 待派工单
+                statusList.add(PreparationStatusEnum.APPLY_LEADER_VERIFY_SUCCESS.getValue());
                 record.setTempUserId(null);
             }else if(record.getSearchType() == 2){ // 待审核工单
                 statusList.add(PreparationStatusEnum.NOT_ALLOCATED.getValue());
@@ -372,16 +372,6 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         sendMessageToRepairer(userVOS,model);
     }
 
-    @Override
-    public void verifyPreparation(PreparationDTO model) {
-
-    }
-
-    @Override
-    public void receivePreparation(PreparationDTO model) {
-
-    }
-
     /**
      * 获取当前用户的角色集合
      * @return
@@ -445,8 +435,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         if(!StringUtils.isEmpty(vo.getExecuteDept())){
             vo.setExecuteDeptName(sysDeptMapper.selectByPrimaryKey(vo.getExecuteDept()).getName());
             if(vo.getStatus() == PreparationStatusEnum.PROCESSING.getValue()
-                    || vo.getStatus() == PreparationStatusEnum.FINISHED.getValue()
-                    || vo.getStatus() == PreparationStatusEnum.WAIT_DISPATCH.getValue()){
+                    || vo.getStatus() == PreparationStatusEnum.FINISHED.getValue()){
                 vo.setDispatchUserName(sysUserMapper.selectUserNameById(vo.getDispatchUserId()));
             }else{
                 // 获取筹建主管角色

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

@@ -333,11 +333,11 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){
                 // 待审核
                 noticeNumberVO.setNotDealNum(vo.getCounts()==null?initNum:vo.getCounts());
-            }else if (vo.getStatus() == PreparationStatusEnum.VERIFY_SUCCESS.getValue()){
+            }else if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){
                 // 待接单
                 noticeNumberVO.setYesDealNum(vo.getCounts()==null?initNum:vo.getCounts());
             }
-            else if (vo.getStatus() == PreparationStatusEnum.WAIT_DISPATCH.getValue()){
+            else if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){
                 // 待分配
                 noticeNumberVO.setFinishNum(vo.getCounts() == null ? initNum : vo.getCounts());
             }