【数据资产】

1、根据证照类型删除

@@ -138,7 +138,17 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         if (entity == null) {
         if (entity == null) {
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME)));
             throw new CsbrSystemException(SystemError.DATA_NOT_EXISTS, messageSourceUtil.notExistsToSelectMessage(String.format("获取%s详情数据", FUNCTION_NAME)));
         }
         }
-        return convertToVO(entity, getStateMap(Collections.singletonList(StringUtils.isNotEmpty(entity.getDataProductGuid()) ? entity.getDataProductGuid() : guid)));
+        DemandRSVO demandRSVO = convertToVO(entity, getStateMap(Collections.singletonList(guid)));
+
+        // 补充业务产品名称
+        String bizGuid = StringUtils.isNotEmpty(entity.getDataProductGuid()) ? entity.getDataProductGuid() : guid;
+        Map<String, DemandUpdateStateVO> data = dataProcessBasicFeign.getOrderStateAndBizName(Collections.singletonList(bizGuid)).getData();
+        if (ObjectUtils.isNotEmpty(data)) {
+            DemandUpdateStateVO demandUpdateStateVO = data.get(bizGuid);
+            demandRSVO.setBizName(demandUpdateStateVO.getBizName());
+        }
+
+        return demandRSVO;
     }
     }
 
 
     private Map<String, DemandUpdateStateVO> getStateMap(List<String> guids){
     private Map<String, DemandUpdateStateVO> getStateMap(List<String> guids){
@@ -150,7 +160,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
             return null;
             return null;
         }
         }
         try{
         try{
-            Map<String, DemandUpdateStateVO> map = dataProcessBasicFeign.getOrderStateAndBizName(guids).getData();
+            Map<String, DemandUpdateStateVO> map = dataProcessBasicFeign.getOrderState(guids).getData();
             return map;
             return map;
         }catch (Exception e){
         }catch (Exception e){
             e.printStackTrace();
             e.printStackTrace();
@@ -690,7 +700,7 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
         //流程数据处理
         //流程数据处理
         vo.setApproveVO(approvalFlowUtil.getApprovalInfo(entity.getGuid()));
         vo.setApproveVO(approvalFlowUtil.getApprovalInfo(entity.getGuid()));
         if(map != null){
         if(map != null){
-            DemandUpdateStateVO voState = map.get(StringUtils.isNotEmpty(entity.getDataProductGuid()) ? entity.getDataProductGuid() : entity.getGuid());
+            DemandUpdateStateVO voState = map.get(entity.getGuid());
             if(voState != null){
             if(voState != null){
                 vo.setResourceAcquisitionState(voState.getResourceAcquisitionState());
                 vo.setResourceAcquisitionState(voState.getResourceAcquisitionState());
                 vo.setProductProcessingState(voState.getProductProcessingState());
                 vo.setProductProcessingState(voState.getProductProcessingState());