From 61bc6934a39b7b3560603e32988759b5f3f1fcef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= <xyhuang29@outlook.com>
Date: Tue, 25 Jul 2023 17:02:01 +0800
Subject: [PATCH] bug fix

---
 src/military/task/agreementList/index.jsx      |  2 +-
 src/military/task/agreementManageNew/index.jsx | 13 +++++++------
 src/military/task/agreementSign/index.jsx      |  4 ++++
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/military/task/agreementList/index.jsx b/src/military/task/agreementList/index.jsx
index 8abd3c3d9..e4c0e8d12 100644
--- a/src/military/task/agreementList/index.jsx
+++ b/src/military/task/agreementList/index.jsx
@@ -114,7 +114,7 @@ export default Form.create()(({ form, history, showNotification }) => {
       },
       {
         title: '胜出者姓名',
-        dataIndex: 'winnerName',
+        dataIndex: 'winnerUserName',
       },
       {
         title: '协议',
diff --git a/src/military/task/agreementManageNew/index.jsx b/src/military/task/agreementManageNew/index.jsx
index a23f49bf4..fa6c6ce50 100644
--- a/src/military/task/agreementManageNew/index.jsx
+++ b/src/military/task/agreementManageNew/index.jsx
@@ -160,8 +160,8 @@ export default Form.create()(({ current_user, form, showNotification, match, his
           return record.signatureFormUnsignedFile ?  
             <div>
               <Icon type="file" /> { record.signatureFormUnsignedFile.fileName }
-              <a href={ record.signatureFormUnsignedFile.fileDownloadPath } target="_blank" download={ record.signatureFormUnsignedFile.fileName } className="ml10">下载</a>
-              <a href={`${ httpUrl }/busiAttachments/view/${ record.signatureFormUnsignedFile.id }`} target="_blank" className="ml10">预览</a>
+              <a href={`${ httpUrl }/busiAttachments/downloadAttachment/${ record.signatureFormUnsignedFile.uniqueFileName }`} target="_blank" download={ record.signatureFormUnsignedFile.fileName } className="ml10">下载</a>
+              <a href={`${ httpUrl }/busiAttachments/viewAttachment/${ record.signatureFormUnsignedFile.uniqueFileName }`} target="_blank" className="ml10">预览</a>
             </div>
             : '-'
         }
@@ -173,15 +173,15 @@ export default Form.create()(({ current_user, form, showNotification, match, his
           return record.agreementFile ?  
           <div>
             <Icon type="file" /> { record.agreementFile.fileName }
-            <a href={ record.agreementFile.fileDownloadPath } target="_blank" download={ record.agreementFile.fileName } className="ml10">下载</a>
-            <a href={`${ httpUrl }/busiAttachments/view/${ record.agreementFile.id }`} target="_blank" className="ml10">预览</a>
+            <a href={`${ httpUrl }/busiAttachments/downloadAttachment/${ record.agreementFile.uniqueFileName }`} target="_blank" download={ record.agreementFile.fileName } className="ml10">下载</a>
+            <a href={`${ httpUrl }/busiAttachments/viewAttachment/${ record.agreementFile.uniqueFileName }`} target="_blank" className="ml10">预览</a>
           </div>
             : '-'
         }
       },
       {
         title: '审核时间',
-        dataIndex: 'createdAt',
+        dataIndex: 'firstDraftCheckTime',
       },
       {
         title: '操作',
@@ -193,10 +193,11 @@ export default Form.create()(({ current_user, form, showNotification, match, his
               {record.firstDraftCheckStatus === 0 && <span className="spanTitle color-red fl ml20">未通过</span>}
 
               {
-                record.firstDraftCheckStatus === 2 && <React.Fragment>
+                ( record.firstDraftCheckStatus === 2 && record.signatureFormUnsignedFile && record.agreementFile ) ? <React.Fragment>
                   <Button type="primary" className="mr20" onClick={() => { agreeClick(record) }} >同意</Button>
                   <Button onClick={() => { refuseClick(record) }} >驳回</Button>
                 </React.Fragment>
+                : <span>暂未上传文件</span>
               }
             </span>
           </React.Fragment>
diff --git a/src/military/task/agreementSign/index.jsx b/src/military/task/agreementSign/index.jsx
index 24367efd2..4d6253517 100644
--- a/src/military/task/agreementSign/index.jsx
+++ b/src/military/task/agreementSign/index.jsx
@@ -109,6 +109,10 @@ export default Form.create()(({ current_user, form, showNotification, match, his
         title: '任务名称',
         dataIndex: 'taskName',
       },
+      {
+        title: '胜出者姓名',
+        dataIndex: 'winnerUserName',
+      },
       {
         title: '发布主体',
         dataIndex: 'publisher',