任务更新模型详情

src/model/datamodel.js

@@ -616,28 +616,24 @@ export function* getCompareJobResultModelPerfectMatchCatalog(payload) {
   return yield call(datamodelerService.getCompareJobResultModelPerfectMatchCatalog, payload)
 }
 
-export function* getDeployWaitingTotalCount(payload) {
-  return yield call(datamodelerService.getDeployWaitingTotalCount, payload)
-}
-
-export function* getDeployWaitingModelPage(payload) {
-  return yield call(datamodelerService.getDeployWaitingModelPage, payload)
-}
+export function* getCompareJobResultModelCount(payload) {
+  const deployWaitingCount = yield call(datamodelerService.getCompareJobResultDeployWaitingTotalCount, payload)
+  const deployedCount = yield call(datamodelerService.getCompareJobResultDeployedTotalCount, payload)
+  const offlineCount = yield call(datamodelerService.getCompareJobResultOfflineTotalCount, payload)
 
-export function* getDeployedTotalCount(payload) {
-  return yield call(datamodelerService.getDeployedTotalCount, payload)
+  return { totalCount: (deployWaitingCount+deployedCount+offlineCount), deployWaitingCount, deployedCount, offlineCount }
 }
 
-export function* getDeployedModelPage(payload) {
-  return yield call(datamodelerService.getDeployedModelPage, payload)
+export function* getCompareJobResultDeployWaitingModelPage(payload) {
+  return yield call(datamodelerService.getCompareJobResultDeployWaitingModelPage, payload)
 }
 
-export function* getOfflineTotalCount(payload) {
-  return yield call(datamodelerService.getOfflineTotalCount, payload)
+export function* getCompareJobResultDeployedModelPage(payload) {
+  return yield call(datamodelerService.getCompareJobResultDeployedModelPage, payload)
 }
 
-export function* getOfflineModelPage(payload) {
-  return yield call(datamodelerService.getOfflineModelPage, payload)
+export function* getCompareJobResultOfflineModelPage(payload) {
+  return yield call(datamodelerService.getCompareJobResultOfflineModelPage, payload)
 }
 
 export function* addDataTypeConfig(payload) {

src/service/datamodeler.js

@@ -561,28 +561,28 @@ export function getCompareJobResultModelPerfectMatchCatalog(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJobResult/getModelPerfectMatchCatalog", payload)
 }
 
-export function getDeployWaitingTotalCount(payload) {
+export function getCompareJobResultDeployWaitingTotalCount(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJobResult/getDeployWaitingTotalCount", payload)
 }
 
-export function getDeployWaitingModelPage(payload) {
+export function getCompareJobResultDeployWaitingModelPage(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJobResult/getDeployWaitingModelPage", payload)
 }
 
-export function getDeployedTotalCount(payload) {
+export function getCompareJobResultDeployedTotalCount(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJobResult/getDeployedTotalCount", payload)
 }
 
-export function getDeployedModelPage(payload) {
+export function getCompareJobResultDeployedModelPage(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJobResult/getDeployedModelPage", payload)
 }
 
 
-export function getOfflineTotalCount(payload) {
+export function getCompareJobResultOfflineTotalCount(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJobResult/getOfflineTotalCount", payload)
 }
 
-export function getOfflineModelPage(payload) {
+export function getCompareJobResultOfflineModelPage(payload) {
   return GetJSON("/datamodeler/easyDataModelModelCompareJobResult/getOfflineModelPage", payload)
 }
 

src/view/Manage/ModelCompare/result-detail.jsx

@@ -50,6 +50,7 @@ const FC = (props) => {
 export default FC
 
 const Basic = ({ item }) => {
+  const [totalCount, setTotalCount] = React.useState()
   const [deployWaitingCount, setDeployWaitingCount] = React.useState()
   const [deployedCount, setDeployedCount] = React.useState()
   const [offlineCount, setOfflineCount] = React.useState()
@@ -60,44 +61,21 @@ const Basic = ({ item }) => {
 
   React.useEffect(() => {
     if (item?.id) {
-      getDeployWaitingTotalCount()
-      getDeployedTotalCount()
-      getOfflineTotalCount()
+      getModelCount()
     }
   }, [item])
 
-  const getDeployWaitingTotalCount = () => {
+  const getModelCount = () => {
     dispatch({
-      type: 'datamodel.getDeployWaitingTotalCount',
+      type: 'datamodel.getCompareJobResultModelCount',
       payload: {
         resultId: item?.id,
       },
       callback: data => {
-        setDeployWaitingCount(data)
-      }
-    })
-  }
-
-  const getDeployedTotalCount = () => {
-    dispatch({
-      type: 'datamodel.getDeployedTotalCount',
-      payload: {
-        resultId: item?.id,
-      },
-      callback: data => {
-        setDeployedCount(data)
-      }
-    })
-  }
-
-  const getOfflineTotalCount = () => {
-    dispatch({
-      type: 'datamodel.getOfflineTotalCount',
-      payload: {
-        resultId: item?.id,
-      },
-      callback: data => {
-        setOfflineCount(data)
+        setTotalCount(data?.totalCount)
+        setDeployWaitingCount(data?.deployWaitingCount)
+        setDeployedCount(data?.deployedCount)
+        setOfflineCount(data?.offlineCount)
       }
     })
   }
@@ -121,28 +99,31 @@ const Basic = ({ item }) => {
         <Descriptions.Item label='差异元数据数'>{item?.metadataPartialMatchCount}</Descriptions.Item>
         <Descriptions.Item label='未匹配元数据数'>{item?.metadataNotMatchCount}</Descriptions.Item>
       </Descriptions>
-      <Descriptions column={3}>
-        <Descriptions.Item label='本次任务更新模型评审通过'>
+      <Descriptions column={4}>
+        <Descriptions.Item label='本次任务更新模型'>
+        {totalCount}
+        </Descriptions.Item>
+        <Descriptions.Item label='更新为已上线'>
         {
-          deployWaitingCount ? <a onClick={() => {
+          deployedCount ? <a onClick={() => {
             setModelListParams({
               visible: true,
-              type: 'deployWaiting',
+              type: 'deployed',
             })
-          }}>{deployWaitingCount}</a> : <span>{deployWaitingCount}</span>
+          }}>{deployedCount}</a> : <span>{deployedCount}</span>
         }
         </Descriptions.Item>
-        <Descriptions.Item label='本次任务更新模型上线'>
+        <Descriptions.Item label='更新为评审通过'>
         {
-          deployedCount ? <a onClick={() => {
+          deployWaitingCount ? <a onClick={() => {
             setModelListParams({
               visible: true,
-              type: 'deployed',
+              type: 'deployWaiting',
             })
-          }}>{deployedCount}</a> : <span>{deployedCount}</span>
+          }}>{deployWaitingCount}</a> : <span>{deployWaitingCount}</span>
         }
         </Descriptions.Item>
-        <Descriptions.Item label='本次任务更新模型下线'>
+        <Descriptions.Item label='更新为已下线'>
         {
           offlineCount ? <a onClick={() => {
             setModelListParams({
@@ -202,11 +183,11 @@ const ModelList = ({ visible, item, type, onCancel }) => {
   const title = React.useMemo(() => {
     if (type) {
       if (type === 'deployWaiting') {
-        return '任务更新模型评审通过详情'
+        return '更新为评审通过模型'
       } else if (type === 'deployed') {
-        return '任务更新模型上线详情'
+        return '更新为已上线模型'
       } else if (type === 'offline') {
-        return '任务更新模型下线详情'
+        return '更新为已下线模型'
       }
     }
 
@@ -248,11 +229,11 @@ const ModelList = ({ visible, item, type, onCancel }) => {
 
     let url = ''
     if (type === 'deployWaiting') {
-      url = 'datamodel.getDeployWaitingModelPage'
+      url = 'datamodel.getCompareJobResultDeployWaitingModelPage'
     } else if (type === 'deployed') {
-      url = 'datamodel.getDeployedModelPage'
+      url = 'datamodel.getCompareJobResultDeployedModelPage'
     } else if (type === 'offline') {
-      url = 'datamodel.getOfflineModelPage'
+      url = 'datamodel.getCompareJobResultOfflineModelPage'
     }
 
     dispatch({