【数据资产】

1、判断是否审核自动上架

@@ -223,7 +223,7 @@ public class DemandRQVO extends FlowRQBaseVO {
     private String processCompanyName;
     private String processCompanyName;
 
 
     @Schema(title = "上架状态(Y 上架 N 下架)")
     @Schema(title = "上架状态(Y 上架 N 下架)")
-    private String listingStatus = "N";
+    private String listingStatus;
     
     
     /******** 子对象 *****/
     /******** 子对象 *****/
     
     

@@ -67,6 +67,9 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
      */
      */
     private static final String FLOW_TYPE = WorkFlowBizEnum.DATA_DEMAND.getValue();
     private static final String FLOW_TYPE = WorkFlowBizEnum.DATA_DEMAND.getValue();
 
 
+    @Value("${isTenantAndHospital:false}")
+    private Boolean isTenantAndHospital;
+
     @Autowired
     @Autowired
     private ZQConfig zqConfig;
     private ZQConfig zqConfig;
 
 
@@ -344,8 +347,10 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
             }
             }
 
 
             // 判断是否审核自动上架
             // 判断是否审核自动上架
+            if (!isTenantAndHospital) {
                 updateWrapper.set(MfDemand::getListingStatus, "Y");
                 updateWrapper.set(MfDemand::getListingStatus, "Y");
             }
             }
+        }
         // 同步更新审批状态
         // 同步更新审批状态
         updateWrapper.set(MfDemand::getBizApproveState, dto.getApprovalState());
         updateWrapper.set(MfDemand::getBizApproveState, dto.getApprovalState());
         updateWrapper.set(StringUtils.isNotBlank(orderNo),MfDemand::getProcessOrderNo, orderNo);
         updateWrapper.set(StringUtils.isNotBlank(orderNo),MfDemand::getProcessOrderNo, orderNo);
@@ -369,8 +374,10 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
             //生成加工单
             //生成加工单
             orderNo = addOrder(mfDemandService.getById(dto.getBizGuid()),dto);
             orderNo = addOrder(mfDemandService.getById(dto.getBizGuid()),dto);
             // 判断是否审核自动上架
             // 判断是否审核自动上架
+            if (!isTenantAndHospital) {
                 updateWrapper.set(MfDemand::getListingStatus, "Y");
                 updateWrapper.set(MfDemand::getListingStatus, "Y");
             }
             }
+        }
         // 同步更新审批状态
         // 同步更新审批状态
         updateWrapper.set(MfDemand::getBizApproveState, dto.getApprovalState());
         updateWrapper.set(MfDemand::getBizApproveState, dto.getApprovalState());
         updateWrapper.set(MfDemand::getCrossPlatformApproveState, dto.getApprovalState());
         updateWrapper.set(MfDemand::getCrossPlatformApproveState, dto.getApprovalState());
@@ -518,6 +525,9 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
             checkProductGuid(rqVO.getDataProductGuid());
             checkProductGuid(rqVO.getDataProductGuid());
         }
         }
         //endregion 2.2.业务数据验证
         //endregion 2.2.业务数据验证
+        if (!isTenantAndHospital) {
+            rqVO.setListingStatus("N");
+        }
 
 
         //endregion 2.数据验证特殊处理
         //endregion 2.数据验证特殊处理
 
 
@@ -602,6 +612,10 @@ public class DemandServiceImpl extends FlowAbstractImpl implements DemandService
             mfDemandService.update(updateWrapper);
             mfDemandService.update(updateWrapper);
         }
         }
 
 
+        if (!isTenantAndHospital) {
+            rqVO.setListingStatus("N");
+        }
+
         //region 3.数据转换处理
         //region 3.数据转换处理
 
 
         //region 3.1.数据过程转换
         //region 3.1.数据过程转换