【数据资产】

1、元数据导入

@@ -179,8 +179,6 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
     @Override
     @Override
     public void saveDemand(FlowRQBaseVO flowBaseVO) {
     public void saveDemand(FlowRQBaseVO flowBaseVO) {
         DemandRQVO rqVO = (DemandRQVO) flowBaseVO;
         DemandRQVO rqVO = (DemandRQVO) flowBaseVO;
-        log.info("======rqVO, {}", JSON.toJSONString(rqVO));
-        System.out.println("======rqVO, " + JSON.toJSONString(rqVO));
         beforeSave(rqVO);
         beforeSave(rqVO);
         MfDemand entity = convertToEntity(rqVO);
         MfDemand entity = convertToEntity(rqVO);
         entity.setRequirementOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("demand-code").setRuleType("generate")).getData());
         entity.setRequirementOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("demand-code").setRuleType("generate")).getData());

@@ -580,7 +580,10 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
 
 
         // 判断业务数据是否有通过
         // 判断业务数据是否有通过
         Optional<MfEnterprise> enterpriseOptional = mfEnterprises.stream().filter(item ->
         Optional<MfEnterprise> enterpriseOptional = mfEnterprises.stream().filter(item ->
-                ApprovalStateEnum.PASSED.getValue().equals(item.getBizApproveState()) || "B".equals(item.getBizApproveState()) || ApprovalStateEnum.CHECKING.getValue().equals(item.getBizApproveState())).findFirst();
+                ApprovalStateEnum.PASSED.getValue().equals(item.getBizApproveState())
+                        || "B".equals(item.getBizApproveState())
+                        || ApprovalStateEnum.CHECKING.getValue().equals(item.getBizApproveState())
+                        || "E".equals(item.getBizApproveState())).findFirst();
         if (enterpriseOptional.isEmpty()) {
         if (enterpriseOptional.isEmpty()) {
             return null;
             return null;
         }
         }