修改:工厂的收款单不走工厂审核流程

cost-service/src/main/java/com/blt/other/module/cost/service/impl/costcheck/FinancialCheckState.java

@@ -97,7 +97,7 @@ public class FinancialCheckState extends CostState {
         if (costTemplate.shouldFinancialAutoCheck(costDomain)) {
             //自动审核通过
             if (this.autoCheck(costDomain)) {
-                costDomain.setCostStatus(super.isFactory(costDomain.getCompanyNo()) ? CostDomain.STATUS_FACTORY_CHECK : CostDomain.STATUS_FINAL_CHECK);
+                costDomain.setCostStatus(super.isFactory(costDomain.getCompanyNo()) && !costDomain.getCostForm().equals(2) ? CostDomain.STATUS_FACTORY_CHECK : CostDomain.STATUS_FINAL_CHECK);
                 costDomain.setLastModifyDate(LocalDateTime.now());
                 costDao.updateById(costDomain);
 
@@ -105,7 +105,7 @@ public class FinancialCheckState extends CostState {
                 costLogService.saveByManage(costDomain.getCostNo(), "财务自动审核通过,当前审核人:" + costCurrentReviewerList.stream().map(CostCurrentReviewer::getUsername)
                         .collect(Collectors.joining(",")), CostLogDomain.DEPARTMENT_AUTO_PASS);
                 //流转状态
-                nextState(super.isFactory(costDomain.getCompanyNo()) ? factoryCheckState : finalCheckState);
+                nextState(super.isFactory(costDomain.getCompanyNo()) && !costDomain.getCostForm().equals(2) ? factoryCheckState : finalCheckState);
                 //发布到总线尝试下个环节的自动审核
                 costSubscribe.subscribe(costContext);
                 return;
@@ -123,7 +123,7 @@ public class FinancialCheckState extends CostState {
                         .costNo(costDomain.getCostNo())
                         .isPassed(true)
                         .build();
-                costDomain.setCostStatus(super.isFactory(costDomain.getCompanyNo()) ? CostDomain.STATUS_FACTORY_CHECK : CostDomain.STATUS_FINAL_CHECK);
+                costDomain.setCostStatus(super.isFactory(costDomain.getCompanyNo()) && !costDomain.getCostForm().equals(2) ? CostDomain.STATUS_FACTORY_CHECK : CostDomain.STATUS_FINAL_CHECK);
                 costDomain.setLastModifyDate(LocalDateTime.now());
                 costDao.updateById(costDomain);
 
@@ -131,7 +131,7 @@ public class FinancialCheckState extends CostState {
                 sendWxMsg(costDomain, currentUserId);
                 approvalHistoryService.save(approvalHistoryDomain);
                 //流转状态
-                nextState(super.isFactory(costDomain.getCompanyNo()) ? factoryCheckState : finalCheckState);
+                nextState(super.isFactory(costDomain.getCompanyNo()) && !costDomain.getCostForm().equals(2) ? factoryCheckState : finalCheckState);
                 //发布到总线尝试下个环节的自动审核
                 costSubscribe.subscribe(costContext);
             }