筹建优化

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

@@ -190,6 +190,15 @@ public class PreparationDTO extends BaseDTO implements Serializable {
      */
     private Integer applySource;
 
+    /**
+     * 执行部门
+     */
+    private String executeDept;
+    /**
+     * 申请部分审核人
+     */
+    private String applyVerifyUserId;
+
 
 
 }

platform-dao/src/main/java/com/platform/dao/entity/longyanpurchaseorder/LongYanPurchaseDetail.java

@@ -29,7 +29,7 @@ public class LongYanPurchaseDetail implements Serializable{
     /**
      *
      */
-        @Id
+    @Id
     private String id;
     /**
      * 采购计划id

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

@@ -99,7 +99,7 @@ public class Preparation implements Serializable{
      */
     private Double repairMinutes;
     /**
-     * 维修人员id
+     * 执行人
      */
     private String repairUserId;
     /**
@@ -120,7 +120,7 @@ public class Preparation implements Serializable{
     private String feeFile;
 
     /**
-     * 派单人
+     * 派单人,执行主管
      */
     private String dispatchUserId;
 
@@ -136,5 +136,13 @@ public class Preparation implements Serializable{
     */
     @Transient
     private DataScope dataScope;
+    /**
+     * 执行部门
+     */
+    private String executeDept;
+    /**
+     * 申请部分审核人
+     */
+    private String applyVerifyUserId;
 
 }

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

@@ -13,21 +13,29 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum PreparationStatusEnum {
     /**
-     * 待分配
+     * 待审核
      */
     NOT_ALLOCATED(1),
     /**
-     * 维修中
+     * 审核通过-待接单
+     */
+    VERIFY_SUCCESS(2),
+    /**
+     * 审核被拒
+     */
+    VERIFY_FAIL(3),
+    /**
+     * 待分配
      */
-    PROCESSING(2),
+    WAIT_DISPATCH(4),
     /**
-     * 	已完成/生产审核通过
+     * 执行中
      */
-    FINISHED(3),
+    PROCESSING(5),
     /**
-     * 	报修取消
+     * 已完成
      */
-    CANCEL(4),
+    FINISHED(6),
     ;
     private final Integer value;
 }

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

@@ -172,7 +172,7 @@ public enum SysRoleCodeEnum {
     HIDDEN_DANGER_AREA_USER,
 
     /**
-     * 筹建主管
+     * 筹建主管(任务分配人)
      */
     PREPARATION_MANAGER,
     /**
@@ -191,6 +191,10 @@ public enum SysRoleCodeEnum {
      * 报修审核人
      */
     REPAIR_VERIFY_USER,
+    /**
+     * 部门主管
+     */
+    DEPT_MANAGER,
     ;
 
 }

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

@@ -146,4 +146,13 @@ public class PreparationVO extends BaseVO implements Serializable {
      */
     private Integer applySource;
 
+    /**
+     * 执行部门
+     */
+    private String executeDept;
+    /**
+     * 申请部分审核人
+     */
+    private String applyVerifyUserId;
+
 }

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

@@ -7,7 +7,6 @@ import com.platform.common.util.R;
 import com.platform.common.validation.group.AddGroup;
 import com.platform.common.validation.group.UpdateGroup;
 import com.platform.dao.dto.preparation.PreparationDTO;
-import com.platform.dao.dto.repair.RepairApplicationFormDTO;
 import com.platform.dao.entity.preparation.Preparation;
 import com.platform.dao.util.ExcelUtil;
 import com.platform.dao.vo.export.preparation.ExportPreparationVO;

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -619,4 +619,16 @@ public class SysUserController {
         });
         return roleCodes.toString();
     }
+
+    /**
+     * 根据角色名称获取用户集合
+     * @param roleName
+     * @return :
+     */
+    @GetMapping("/query/roleName/{roleName}")
+    public R selectRoleNameUsers(@PathVariable("roleName") String roleName) {
+        SysUserDTO dto = new SysUserDTO();
+        dto.setRoleCode(roleName);
+        return R.success(sysUserService.selectDeptRoleUser(dto));
+    }
 }

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

@@ -274,8 +274,6 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
 
     @Override
     public Preparation saveByDTO(PreparationDTO model) {
-        // 获取公司ID
-        //model.setParentPositionId(getParentPositionId(model.getPositionId()));
         // 获取筹建主管角色，当一人时，直接赋值，多人时，接单派单
         SysUserDTO queryUserDTO = new SysUserDTO();
         queryUserDTO.setRoleCode(SysRoleCodeEnum.PREPARATION_MANAGER.name());
@@ -295,7 +293,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         weekend.weekendCriteria().andIsNotNull(Preparation::getId);
         Integer count = mapper.selectCountByExample(weekend);
         model.setNo(IdGeneratorUtils.getPreparationNo(++count));
-        model.setStatus(PreparationStatusEnum.NOT_ALLOCATED.getValue()); // 待分配
+        model.setStatus(PreparationStatusEnum.NOT_ALLOCATED.getValue()); // 待审核
         Preparation preparation = this.saveModelByDTO(model);
         // 给主管发送消息
         sendMessageToManger(userVOS,preparation);

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

@@ -330,28 +330,22 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
     private void addPrepationNums(NoticeNumberVO noticeNumberVO,PreparationDTO preparationDTO){
         List<PreparationVO> preparationVOS = preparationMapper.getCountByUserId(preparationDTO);
         for (PreparationVO vo : preparationVOS){
-            if (vo.getStatus() == 1){
-                // 待修
+            if (vo.getStatus() == PreparationStatusEnum.NOT_ALLOCATED.getValue()){
+                // 待审核
                 noticeNumberVO.setNotDealNum(vo.getCounts()==null?initNum:vo.getCounts());
-            }else if (vo.getStatus() == 2){
-                // 维修中
+            }else if (vo.getStatus() == PreparationStatusEnum.VERIFY_SUCCESS.getValue()){
+                // 待接单
                 noticeNumberVO.setYesDealNum(vo.getCounts()==null?initNum:vo.getCounts());
             }
-            else if (vo.getStatus() == 3){
-                // 已完成
+            else if (vo.getStatus() == PreparationStatusEnum.WAIT_DISPATCH.getValue()){
+                // 待分配
                 noticeNumberVO.setFinishNum(vo.getCounts() == null ? initNum : vo.getCounts());
-                //noticeNumberVO.setNotAcceptancedNum(vo.getCounts()==null?initNum:vo.getCounts());
             }
-            /*else if (vo.getStatus()==4){
-                //驳回
+            else if (vo.getStatus() == PreparationStatusEnum.PROCESSING.getValue()){
+                // 执行中
                 noticeNumberVO.setReturnNum(vo.getCounts()==null?initNum:vo.getCounts());
             }
-            else if (vo.getStatus()==5){
-                //已完成
-                noticeNumberVO.setFinishNum(vo.getCounts()==null?initNum:vo.getCounts());
-            }*/
         }
-        noticeNumberVO.setReturnNum(noticeNumberVO.getNotDealNum().add(noticeNumberVO.getYesDealNum()).add(noticeNumberVO.getFinishNum()));
     }
     @Override
     public NoticeNumberVO getNoticeNumberVO() {
@@ -481,20 +475,6 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 noticeNumberVO.setRoleFlag(4);
                 noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
             }
-            /*else if (sb.toString().contains(SysRoleCodeEnum.PREPARATION_MANAGER.name())){
-                //筹建主管-- dispatchUserId
-                noticeNumberVO.setRoleFlag(8);
-                PreparationDTO preparationDTO = new PreparationDTO();
-                preparationDTO.setDispatchUserId(userInfo.getUserId());
-                addPrepationNums(noticeNumberVO,preparationDTO);
-            }
-            else if (sb.toString().contains(SysRoleCodeEnum.PREPARATION_USER.name())){
-                //筹建执行人-- repairUserId
-                noticeNumberVO.setRoleFlag(9);
-                PreparationDTO preparationDTO = new PreparationDTO();
-                preparationDTO.setRepairUserId(userInfo.getUserId());
-                addPrepationNums(noticeNumberVO,preparationDTO);
-            }*/
         }
         // 筹建统计数据，不区分角色
         PreparationDTO preparationDTO = new PreparationDTO();