diff --git a/src/main/java/com/nov/KgLowDurable/constant/OnePutApproverConstant.java b/src/main/java/com/nov/KgLowDurable/constant/OnePutApproverConstant.java index 35586fe..7c6c3cc 100644 --- a/src/main/java/com/nov/KgLowDurable/constant/OnePutApproverConstant.java +++ b/src/main/java/com/nov/KgLowDurable/constant/OnePutApproverConstant.java @@ -113,6 +113,9 @@ public class OnePutApproverConstant { public static final Integer CHOOSE_DEPARTMENT = 0; + /** + * 一级入库 审批模版ID + */ public static final String TEMPLATE_ID = "3WN6zH1mDGyoi5qWQcpBvgZMoevfG63f4ZTytiYt"; public static final Integer NOTIFY_TYPE = 2; diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java index b64ca66..e7e1cf1 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/LdTwoOutStorageServiceImpl.java @@ -181,7 +181,7 @@ public class LdTwoOutStorageServiceImpl extends ServiceImpl ldApproves = approveService.getByFromId(dto.getLdTwoOutStorage().getId(), "1"); + List ldApproves = approveService.getByFromId(dto.getLdTwoOutStorage().getId(), "3"); List approvers = new ArrayList<>(); for (LdApprove ldApprove : ldApproves) { Approver approver = new Approver(); diff --git a/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java b/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java index e3fec18..cc24789 100644 --- a/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java +++ b/src/main/java/com/nov/KgLowDurable/service/Impl/UserServiceImpl.java @@ -246,8 +246,7 @@ public class UserServiceImpl extends ServiceImpl implements IU ldApprove.setLevel(level); ldApprove.setStatus("0"); ldApprove.setOptTime(LocalDateTime.now()); - ldApprove.setType(type); - + ldApprove.setType("1".equals(type)?"3":type); return ldApprove; }