From 458d770757e1e34a1c2f6eeb51aef35442e1b8b6 Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Tue, 27 Apr 2021 10:18:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=96=87=E6=A1=A3=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=A4=87=E6=B3=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tall/src/main/java/com/ccsens/tall/service/InputDocService.java  | 1 +
 .../main/java/com/ccsens/tall/service/TaskDeliverService.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
index 23b17604..5007766e 100644
--- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java
@@ -347,6 +347,7 @@ public class InputDocService implements IInputDocService {
         }else {
             //没有文件 操作类型为添加备注
             historyRecord.setDoType((byte)5);
+            historyRecord.setHistoryRemark(param.getRemark());
         }
         historyRecord.setMemberId(proMember.getId());
         deliverHistoryRecordDao.insertSelective(historyRecord);
diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
index fd1b7ff2..13678dcd 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
@@ -282,6 +282,7 @@ public class TaskDeliverService implements ITaskDeliverService {
                 historyRecord.setDoType((byte)0);
             }else {
                 historyRecord.setDoType((byte)5);
+                historyRecord.setHistoryRemark(uploadDeliver.getDescription());
             }
 
             historyRecord.setMemberId(proMember.getId());

From 1b96b9f6d1742b99daf6639b973c2863912cb0cc Mon Sep 17 00:00:00 2001
From: ma <1062634917@qq.com>
Date: Tue, 27 Apr 2021 11:35:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ccsens/tall/service/ProTaskDetailService.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
index 266e61a9..ebd289e6 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
@@ -441,7 +441,13 @@ public class ProTaskDetailService implements IProTaskDetailService {
                 Long checkerRole = normalTask.getCheckerRole();
                 ProRole checker = proRoleDao.selectByPrimaryKey(checkerRole);
                 if(ObjectUtil.isNotNull(checker)) {
-                    normalTask.setExecutorRoleName(checker.getName());
+                    normalTask.setCheckerRoleName(checker.getName());
+                }else{
+                    //根据任务id查询项目下项目经理
+                    Long pmId = taskDetailDao.selectPmByTaskId(normalTask.getDetailId());
+                    ProRole proRole = proRoleDao.selectByPrimaryKey(pmId);
+                    normalTask.setCheckerRole(proRole.getId());
+                    normalTask.setCheckerRoleName(proRole.getName());
                 }
 
 

From be24cf9e9aab711bf776f949cdd41ef866a58abd Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 27 Apr 2021 11:42:40 +0800
Subject: [PATCH 3/3] 20210427v1.2

---
 tall/src/main/java/com/ccsens/tall/web/InputDocController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java
index 0ceb6cbc..c0722b98 100644
--- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java
+++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java
@@ -79,7 +79,7 @@ public class InputDocController {
     }
 
     @MustLoginTall
-    @ApiOperation(value = "添加输入文档", notes = "1007:添加输入文档")
+    @ApiOperation(value = "给任务添加输入文档", notes = "1007:添加输入文档")
     @RequestMapping(value = "/addDoc", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse addDoc(@ApiParam @Validated @RequestBody QueryDto<InputDocDto.AddDoc> params) {
         log.info("添加输入文档：{}",params);