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 49495e46..b576eb98 100644 --- a/tall/src/main/java/com/ccsens/tall/service/InputDocService.java +++ b/tall/src/main/java/com/ccsens/tall/service/InputDocService.java @@ -344,6 +344,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/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()); } 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 9bde5c73..81845e89 100644 --- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java +++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java @@ -283,6 +283,7 @@ public class TaskDeliverService implements ITaskDeliverService { historyRecord.setDoType((byte)0); }else { historyRecord.setDoType((byte)5); + historyRecord.setHistoryRemark(uploadDeliver.getDescription()); } historyRecord.setMemberId(proMember.getId()); 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 76eeeecf..aabec813 100644 --- a/tall/src/main/java/com/ccsens/tall/web/InputDocController.java +++ b/tall/src/main/java/com/ccsens/tall/web/InputDocController.java @@ -83,7 +83,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 params) { log.info("添加输入文档:{}",params);