Commit 75d7b2cf by liyanlin

fix

parent 407204a7
...@@ -14,8 +14,10 @@ import com.blt.other.module.cost.model.CostCurrentReviewer; ...@@ -14,8 +14,10 @@ import com.blt.other.module.cost.model.CostCurrentReviewer;
import com.blt.other.module.cost.model.CostDomain; import com.blt.other.module.cost.model.CostDomain;
import com.blt.other.module.cost.model.CostTemplate; import com.blt.other.module.cost.model.CostTemplate;
import com.blt.other.module.cost.service.ApprovalHistoryService; import com.blt.other.module.cost.service.ApprovalHistoryService;
import com.blt.other.module.cost.service.impl.cost.CostSubscribe;
import com.blt.other.module.sys.model.CostReviewer; import com.blt.other.module.sys.model.CostReviewer;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -54,6 +56,8 @@ public class FinalCheckState extends CostState { ...@@ -54,6 +56,8 @@ public class FinalCheckState extends CostState {
CostCurrentReviewerMapper costCurrentReviewerMapper; CostCurrentReviewerMapper costCurrentReviewerMapper;
@Resource @Resource
ApprovalHistoryService approvalHistoryService; ApprovalHistoryService approvalHistoryService;
@Autowired
CostSubscribe costSubscribe;
private void autoPass() { private void autoPass() {
CostDomain costDomain = costContext.costDomain; CostDomain costDomain = costContext.costDomain;
...@@ -67,6 +71,8 @@ public class FinalCheckState extends CostState { ...@@ -67,6 +71,8 @@ public class FinalCheckState extends CostState {
.collect(Collectors.joining(",")), CostLogDomain.DEPARTMENT_AUTO_PASS); .collect(Collectors.joining(",")), CostLogDomain.DEPARTMENT_AUTO_PASS);
//流转状态 //流转状态
nextState(generalManagerCheckState); nextState(generalManagerCheckState);
//尝试自动下一个流程自动审核
costSubscribe.subscribe(costContext);
//通知财务系统 //通知财务系统
//costContext.costService.toFinancial(costDomain); //costContext.costService.toFinancial(costDomain);
} }
...@@ -158,7 +164,9 @@ public class FinalCheckState extends CostState { ...@@ -158,7 +164,9 @@ public class FinalCheckState extends CostState {
//流转状态 //流转状态
nextState(generalManagerCheckState); nextState(generalManagerCheckState);
//通知财务系统 //通知财务系统
costContext.costService.toFinancial(costDomain); //costContext.costService.toFinancial(costDomain);
//尝试自动下一个流程自动审核
costSubscribe.subscribe(costContext);
} }
//人工审核没权限 //人工审核没权限
......
...@@ -67,7 +67,7 @@ public class GeneralManagerCheckState extends CostState { ...@@ -67,7 +67,7 @@ public class GeneralManagerCheckState extends CostState {
//流转状态 //流转状态
nextState(unPayState); nextState(unPayState);
//发布到总线尝试下个环节的自动审核 //发布到总线尝试下个环节的自动审核
costSubscribe.subscribe(costContext); //costSubscribe.subscribe(costContext);
//通知财务系统 //通知财务系统
costContext.costService.toFinancial(costDomain); costContext.costService.toFinancial(costDomain);
...@@ -89,7 +89,7 @@ public class GeneralManagerCheckState extends CostState { ...@@ -89,7 +89,7 @@ public class GeneralManagerCheckState extends CostState {
//流转状态 //流转状态
nextState(unPayState); nextState(unPayState);
//发布到总线尝试下个环节的自动审核 //发布到总线尝试下个环节的自动审核
costSubscribe.subscribe(costContext); //costSubscribe.subscribe(costContext);
//通知财务系统 //通知财务系统
costContext.costService.toFinancial(costDomain); costContext.costService.toFinancial(costDomain);
......
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