【数据资产】

1、加工单加工明细新增、修改参数

@@ -143,6 +143,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
                 mfEnterpriseMap = mfEnterprises.stream().collect(Collectors.toMap(MfEnterprise::getGuid, Function.identity()));
                 mfEnterpriseMap = mfEnterprises.stream().collect(Collectors.toMap(MfEnterprise::getGuid, Function.identity()));
             }
             }
 
 
+            // 根据业务guid查询认证变更表数据
+            List<MfEnterpriseChangeApprove> mfEnterpriseChangeApproves = mfEnterpriseChangeApproveService.listByIds(guids);
+            if (ObjectUtils.isNotEmpty(mfEnterpriseChangeApproves)) {
+                Map<String, MfEnterpriseChangeApprove> mfEnterpriseChangeApproveMap = mfEnterpriseChangeApproves.stream().collect(Collectors.toMap(MfEnterpriseChangeApprove::getGuid, Function.identity()));
+            }
+
             // 数据转换
             // 数据转换
             List<EnterpriseApproveRSVO> results = new ArrayList<>();
             List<EnterpriseApproveRSVO> results = new ArrayList<>();
             for (ApproveVO approveVO : approveVOList) {
             for (ApproveVO approveVO : approveVOList) {
@@ -542,7 +548,7 @@ 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())).findFirst();
+                ApprovalStateEnum.PASSED.getValue().equals(item.getBizApproveState()) || "B".equals(item.getBizApproveState()) || ApprovalStateEnum.CHECKING.getValue().equals(item.getBizApproveState())).findFirst();
         if (enterpriseOptional.isEmpty()) {
         if (enterpriseOptional.isEmpty()) {
             return null;
             return null;
         }
         }