Commit bf00aab5 by jianshuqin

--story=1010443 --user=简曙勤 【费用系统】调整主体嗜嗜煲的审核流程 https://www.tapd.cn/55346466/s/1013186

parent 76f3549c
...@@ -254,6 +254,16 @@ public class DepartmentCheckState extends CostState { ...@@ -254,6 +254,16 @@ public class DepartmentCheckState extends CostState {
.eq(CostReviewer::getReferId, departmentReviewer.getId()) .eq(CostReviewer::getReferId, departmentReviewer.getId())
.eq(CostReviewer::getType, CostReviewer.departmentReviewer)); .eq(CostReviewer::getType, CostReviewer.departmentReviewer));
//嗜嗜煲的主体,遇到铭哥审批就换鹏哥 2023-06-01
if ("嗜嗜煲".equals(costDomain.getCompanyName())) {
for (CostReviewer costReviewer: costReviewerList) {
if (costReviewer.getReviewerUserId() == 681) {
costReviewer.setReviewerUserId(720);
costReviewer.setReviewerUserName("赵鹏");
}
}
}
String departmentReviewerNames = costReviewerList.stream().map(CostReviewer::getReviewerUserName).collect(Collectors.joining(",")); String departmentReviewerNames = costReviewerList.stream().map(CostReviewer::getReviewerUserName).collect(Collectors.joining(","));
log.info("更新当前审核人为部门审核人:{}", departmentReviewerNames); log.info("更新当前审核人为部门审核人:{}", departmentReviewerNames);
......
...@@ -82,8 +82,8 @@ public class GeneralManagerCheckState extends CostState { ...@@ -82,8 +82,8 @@ public class GeneralManagerCheckState extends CostState {
} }
if (currentUserId != null) { if (currentUserId != null) {
//目前限定铭哥能审核 //目前限定铭哥能审核或者主体是嗜嗜煲鹏哥能审核
if (currentUserId == 681 || currentUserId == 2346) { if (currentUserId == 681 || ("嗜嗜煲".equals(costDomain.getCompanyName()) && currentUserId == 720)) {
//大于等于5需要铭哥审批 //大于等于5需要铭哥审批
if (costDomain.getAmountRmb().compareTo(new BigDecimal("5000")) >= 0) { if (costDomain.getAmountRmb().compareTo(new BigDecimal("5000")) >= 0) {
costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK); costDomain.setCostStatus(CostDomain.STATUS_FINANCIAL_CHECK);
...@@ -121,7 +121,7 @@ public class GeneralManagerCheckState extends CostState { ...@@ -121,7 +121,7 @@ public class GeneralManagerCheckState extends CostState {
} }
//人工审核拒绝 //人工审核拒绝
if (currentUserId == 681 || currentUserId == 2346) { if (currentUserId == 681 || currentUserId == 4828 || ("嗜嗜煲".equals(costDomain.getCompanyName()) && currentUserId == 720)) {
ApprovalHistoryDomain approvalHistoryDomain = ApprovalHistoryDomain.builder() ApprovalHistoryDomain approvalHistoryDomain = ApprovalHistoryDomain.builder()
.approvalUserId(currentUserId) .approvalUserId(currentUserId)
.approvalTime(LocalDateTime.now()) .approvalTime(LocalDateTime.now())
...@@ -141,8 +141,8 @@ public class GeneralManagerCheckState extends CostState { ...@@ -141,8 +141,8 @@ public class GeneralManagerCheckState extends CostState {
public void updateCurrentReviewer() { public void updateCurrentReviewer() {
CostDomain costDomain = costContext.costDomain; CostDomain costDomain = costContext.costDomain;
//只查铭哥的ID //只查铭哥的ID,嗜嗜煲的主体,遇到铭哥审批就换鹏哥 2023-06-01
OaUser user = oaUserMapper.selectByOaUserId(681); OaUser user = oaUserMapper.selectByOaUserId(("嗜嗜煲".equals(costDomain.getCompanyName())) ? 720 : 681);
List<CostReviewer> costReviewerList = new ArrayList<>(); List<CostReviewer> costReviewerList = new ArrayList<>();
costReviewerList.add(CostReviewer.builder() costReviewerList.add(CostReviewer.builder()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment