From ab6d161940d4f1bc9afb69c521b3a13bf89eea17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Mon, 19 Aug 2024 17:45:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=B8=80=E7=BA=A7=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/enums/NodeNoEnum.java | 22 +---- .../request/SubmitPointAuditRequest.java | 5 - .../store/service/impl/PointServiceImpl.java | 91 +------------------ .../src/main/resources/application.properties | 2 +- 4 files changed, 8 insertions(+), 112 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/NodeNoEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/NodeNoEnum.java index 92aca8ffa..f6d34fa3f 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/NodeNoEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/NodeNoEnum.java @@ -7,11 +7,6 @@ import java.util.List; public enum NodeNoEnum { NODE_NO_0(0,"提交任务"), NODE_NO_1(1,"第一级审批"), - NODE_NO_2(2,"第二级审批"), - NODE_NO_3(3,"第三级审批"), - NODE_NO_4(4,"第四级审批"), - NODE_NO_5(5,"第五级审批"), - NODE_NO_100(100,"结束"), ; @@ -47,22 +42,9 @@ public enum NodeNoEnum { */ public static List getNextNodeNoList(Integer nodeNo){ if(NodeNoEnum.NODE_NO_0.getCode().equals(nodeNo)){ - return Lists.newArrayList(NodeNoEnum.NODE_NO_1, NodeNoEnum.NODE_NO_2, NodeNoEnum.NODE_NO_3, NodeNoEnum.NODE_NO_4, NodeNoEnum.NODE_NO_5); - } - if(NodeNoEnum.NODE_NO_1.getCode().equals(nodeNo)){ - return Lists.newArrayList(NodeNoEnum.NODE_NO_2, NodeNoEnum.NODE_NO_3, NodeNoEnum.NODE_NO_4, NodeNoEnum.NODE_NO_5); - } - if(NodeNoEnum.NODE_NO_2.getCode().equals(nodeNo)){ - return Lists.newArrayList(NodeNoEnum.NODE_NO_3, NodeNoEnum.NODE_NO_4, NodeNoEnum.NODE_NO_5); - } - if(NodeNoEnum.NODE_NO_3.getCode().equals(nodeNo)){ - return Lists.newArrayList(NodeNoEnum.NODE_NO_4, NodeNoEnum.NODE_NO_5); - } - if(NodeNoEnum.NODE_NO_4.getCode().equals(nodeNo)){ - return Lists.newArrayList(NodeNoEnum.NODE_NO_5); - }else { - return Lists.newArrayList(); + return Lists.newArrayList(NodeNoEnum.NODE_NO_1); } + return Lists.newArrayList(); } public static NodeNoEnum getByCode(Integer code){ diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitPointAuditRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitPointAuditRequest.java index e50acd3d1..7f3cb1153 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitPointAuditRequest.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/SubmitPointAuditRequest.java @@ -19,11 +19,6 @@ public class SubmitPointAuditRequest { @ApiModelProperty("点位id") private Long pointId; - @NotNull - @NotBlank - @ApiModelProperty("营运人员") - private String operateUserId; - @NotNull @NotBlank @ApiModelProperty("拓展专员签名") diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index 93cc65201..7f9cde7e0 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -255,7 +255,6 @@ public class PointServiceImpl implements PointService { updatePoint.setId(pointId); updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_3.getCode()); updatePoint.setSubmitAuditCount(submitAuditCount); - updatePoint.setOperateUserId(request.getOperateUserId()); PointDetailInfoDO updatePointDetail = new PointDetailInfoDO(); updatePointDetail.setId(pointDetailInfo.getId()); updatePointDetail.setDevelopmentManagerSign(request.getDevelopmentManagerSign()); @@ -266,7 +265,7 @@ public class PointServiceImpl implements PointService { if(Objects.isNull(auditSetting)){ throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING); } - List auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), request.getOperateUserId(), pointInfo.getDevelopmentManager()); + List auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager()); //获取审批节点上的数据 List recordList = AuditNodeDTO.convertDO(pointId, submitAuditCount, auditNode); pointAuditRecordDAO.addPointAuditRecord(recordList); @@ -299,53 +298,11 @@ public class PointServiceImpl implements PointService { } @Override - @Transactional(rollbackFor = Exception.class) public Integer operationUserAudit(String userId, OperationAuditRequest request) { - if(!request.check()){ - throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); - } - Long pointId = request.getPointId(); - PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); - PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(pointId); - if(Objects.isNull(pointInfo) || Objects.isNull(pointDetailInfo)){ - log.info("铺位基本信息不存在"); - throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); - } - if(!PointStatusEnum.POINT_STATUS_3.getCode().equals(pointInfo.getPointStatus())){ - log.info("铺位状态不允许该操作"); - throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); - } - if(!userId.equals(pointInfo.getOperateUserId())){ - log.info("运营人员不对"); - throw new ServiceException(ErrorCodeEnum.NO_PERMISSION); - } - PointTodoInfoDO pointTodo = pointTodoInfoDAO.getPointToDoByUserIdAndPointId(userId, pointId); - if(Objects.isNull(pointTodo)){ - log.info("该用户没有待办数据"); - throw new ServiceException(ErrorCodeEnum.USER_NOT_TODO_AUDIT); - } - if(!NodeNoEnum.NODE_NO_2.getCode().equals(pointTodo.getNodeNo())){ - log.info("获取铺位待办数据不对"); - throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NODE_ERROR); - } - Map pointAuditRecordMap = pointAuditRecordDAO.getPointAuditRecordMap(pointId, pointInfo.getSubmitAuditCount()); - PointAuditRecordDO pointAuditRecord = pointAuditRecordMap.get(NodeNoEnum.NODE_NO_2.getCode()); - if(Objects.isNull(pointAuditRecord) || !AuditStatusEnum.TODO.getCode().equals(pointAuditRecord.getAuditStatus())){ - log.info("铺位处理记录中的数据不对或者状态不对"); - throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NODE_ERROR); - } - AuditStatusEnum auditStatus = AuditStatusEnum.getByCode(request.getAuditStatus()); - PointDetailInfoDO updatePointDetailInfo = OperationAuditRequest.convertDO(pointDetailInfo.getId(), request); - pointDetailInfoDAO.updatePointDetailInfo(updatePointDetailInfo); - pointTodoInfoDAO.updatePointTodoInfo(pointId, NodeNoEnum.NODE_NO_2.getCode(), pointInfo.getSubmitAuditCount(), userId); - PointAuditRecordDO updateAuditRecord = PointAuditRecordDO.convert(pointAuditRecord.getId(), userId, auditStatus, request.getReason(), NodeNoEnum.NODE_NO_2, request.getSignTime(), request.getSignAddress(), request.getPictureUrl()); - pointAuditRecordDAO.updatePointAuditRecord(updateAuditRecord); - if(AuditStatusEnum.REJECT.equals(auditStatus)){ - return auditRejectDeal(pointInfo, request.getReason()); - } - return dealNextAuditRecord(pointInfo, pointAuditRecordMap, NodeNoEnum.NODE_NO_2.getCode()); + return null; } + /** * 初始化上传租赁合同阶段 * @param pointInfo @@ -377,13 +334,6 @@ public class PointServiceImpl implements PointService { pointAuditRecordDAO.updatePointAuditRecord(PointAuditRecordDO.convert(nextAuditRecord.getId(), new Date())); //审批通过的情况下 生成下一个节点的待办数据 pointTodoInfoDAO.addPointTodoInfo(PointAuditRecordDO.convertTODO(nextAuditRecord)); - if(NodeNoEnum.NODE_NO_2.getCode().equals(currentNo)){ - PointInfoDO updatePoint = new PointInfoDO(); - updatePoint.setId(pointInfo.getId()); - updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_4.getCode()); - updatePoint.setStorageStatus(StorageStatusEnum.IN_STORAGE.getCode()); - result = pointInfoDAO.updatePointInfo(updatePoint); - } List sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class); Map messageMap = new HashMap<>(); messageMap.put("pointId", String.valueOf(pointInfo.getId())); @@ -395,6 +345,7 @@ public class PointServiceImpl implements PointService { updatePoint.setId(pointInfo.getId()); //没有下一节点 审批通过 updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode()); + updatePoint.setStorageStatus(StorageStatusEnum.IN_STORAGE.getCode()); if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ initUploadRentContract(pointInfo); } @@ -443,10 +394,6 @@ public class PointServiceImpl implements PointService { log.info("该用户没有待办数据"); throw new ServiceException(ErrorCodeEnum.USER_NOT_TODO_AUDIT); } - if(NodeNoEnum.NODE_NO_2.getCode().equals(pointTodo.getNodeNo())){ - log.info("获取铺位待办数据不对"); - throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NODE_ERROR); - } PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); if(Objects.isNull(pointInfo)){ log.info("铺位不存在"); @@ -1055,47 +1002,19 @@ public class PointServiceImpl implements PointService { return resultPage; } - public List dealAuditNode(AuditSettingVO auditSetting, Long regionId, String operateUserId, String developmentManager) { + public List dealAuditNode(AuditSettingVO auditSetting, Long regionId, String developmentManager) { List roleIds = new ArrayList<>(); //审核人 Pair, List> firstApproval = getUserIdsAndPositionIds(auditSetting.getFirstApproval()); - Pair, List> thirdApproval = getUserIdsAndPositionIds(auditSetting.getThirdApproval()); - Pair, List> fourthApproval = getUserIdsAndPositionIds(auditSetting.getFourthApproval()); - Pair, List> fifthApproval = getUserIdsAndPositionIds(auditSetting.getFifthApproval()); if(CollectionUtils.isNotEmpty(firstApproval.getValue())){ roleIds.addAll(firstApproval.getValue()); } - if(CollectionUtils.isNotEmpty(thirdApproval.getValue())){ - roleIds.addAll(thirdApproval.getValue()); - } - if(CollectionUtils.isNotEmpty(fourthApproval.getValue())){ - roleIds.addAll(fourthApproval.getValue()); - } - if(CollectionUtils.isNotEmpty(fifthApproval.getValue())){ - roleIds.addAll(fifthApproval.getValue()); - } List resultList = new ArrayList<>(); Map> userIdsMap = userAuthMappingService.getUserIdByRoleIdAndRegionId(roleIds, regionId); List firstApprovalUserIds = getUserIdsByPositionIds(firstApproval, userIdsMap); - List thirdApprovalUserIds = getUserIdsByPositionIds(thirdApproval, userIdsMap); - List fourthApprovalUserIds = getUserIdsByPositionIds(fourthApproval, userIdsMap); - List fifthApprovalUserIds = getUserIdsByPositionIds(fifthApproval, userIdsMap); resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_0.getCode(), PointAuditRecordDO.SUBMIT_TASK, Boolean.FALSE, Arrays.asList(developmentManager))); if(CollectionUtils.isNotEmpty(firstApprovalUserIds)){ resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_1.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, firstApprovalUserIds)); - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_2.getCode(), Arrays.asList(operateUserId))); - }else{ - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_2.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, Arrays.asList(operateUserId))); - } - - if(CollectionUtils.isNotEmpty(thirdApprovalUserIds)){ - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_3.getCode(), thirdApprovalUserIds)); - } - if(CollectionUtils.isNotEmpty(fourthApprovalUserIds)){ - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_4.getCode(), fourthApprovalUserIds)); - } - if(CollectionUtils.isNotEmpty(fifthApprovalUserIds)){ - resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_5.getCode(), fifthApprovalUserIds)); } return resultList; } diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 3cd8d5bbf..e4998e81c 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=zxjp-web -spring.profiles.active=@profileActive@ +spring.profiles.active=test server.port=40300 server.servlet.context-path=/zxjp