Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
39c251cd by xiaojie
Options

【数据资产】 

1、元数据导入
1 parent 3ad816a9
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
src/main/java/com/csbr/qingcloud/portal/service/impl/DemandServiceImpl.java
......@@ -179,8 +179,6 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
@Override
public void saveDemand(FlowRQBaseVO flowBaseVO) {
DemandRQVO rqVO = (DemandRQVO) flowBaseVO;
log.info("======rqVO, {}", JSON.toJSONString(rqVO));
System.out.println("======rqVO, " + JSON.toJSONString(rqVO));
beforeSave(rqVO);
MfDemand entity = convertToEntity(rqVO);
entity.setRequirementOrderNo(configureFeign.newCode(new RuleDTO().setRuleName("demand-code").setRuleType("generate")).getData());
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
......@@ -580,7 +580,10 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
// 判断业务数据是否有通过
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()) {
return null;
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!