修改审批和提交记录的审批记录

src/main/java/com/keymobile/indicators/api/hytobacco/TaskCtrl.java

@@ -102,13 +102,13 @@ public class TaskCtrl  {
     @ApiOperation("提交任务去审核")
     @GetMapping("toSubmit")
     public Result toSubmit(@ApiParam("任务id") @RequestParam("taskId") String id) {
-        return taskService.submitTask(id, SystemUserUtil.getCurrentUserId());
+        return taskService.submitTask(id, SystemUserUtil.getCurrentUser());
     }
 
     @ApiOperation("审核任务")
     @PostMapping("audit")
     public Result audit(@ApiParam("审核信息") @RequestBody TaskAuditResult param) {
-        taskService.auditTask(param, SystemUserUtil.getCurrentUserId());
+        taskService.auditTask(param, SystemUserUtil.getCurrentUser());
         return Result.genOkResult();
     }
 

src/main/java/com/keymobile/indicators/service/dataenter/impl/TaskServiceImpl.java

@@ -260,7 +260,7 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result submitTask(String taskId, String userId) {
+    public Result submitTask(String taskId, String user) {
         Result result = null;
         Date now = new Date();
         Task task = taskMapper.getById(taskId);
@@ -283,7 +283,6 @@ public class TaskServiceImpl implements TaskService {
         if (configInfo != null) {
             String indDept = task.getRefIndDept();
             List<RoleRefUserModel> users = getUserByRoleIdStr(configInfo.getCfValue());
-            String user = SystemUserUtil.getCurrentUser();
             if (CollectionUtils.isNotEmpty(users)) {
                 StringBuilder userIds = new StringBuilder(Constants.SEP_COMMA);
                 StringBuilder userNames = new StringBuilder(Constants.SEP_COMMA);
@@ -314,7 +313,7 @@ public class TaskServiceImpl implements TaskService {
                 if (found) {
                     task.setAuditUsers(userIds.toString());
                     task.setAuditUserNames(userNames.toString());
-                    task.setUpdater(userId);
+                    task.setUpdater(user);
                     task.setUpdateTime(now);
                     task.setStatus(Constants.APPLY_STATE_AUDITING);
                     taskMapper.updateByPrimaryKey(task);
@@ -324,15 +323,15 @@ public class TaskServiceImpl implements TaskService {
                     auditRecord.setId(IdWorker.getStrId());
                     auditRecord.setPTaskId(task.getPId());
                     auditRecord.setState(Constants.DATA_STATE_A);
-                    auditRecord.setCreator(userId);
-                    auditRecord.setUpdater(userId);
+                    auditRecord.setCreator(user);
+                    auditRecord.setUpdater(user);
                     auditRecord.setUpdateTime(now);
                     auditRecord.setCreateTime(now);
                     taskAuditRecordMapper.insert(auditRecord);
                     noticeInfoService.createNotices(noticeInfos);
                     result = Result.genOkResult();
-                    LogManager.logInfo(Constants.LOG_CONTEXT_API, "提交任务id:{},name:{}到审核",
-                            taskId, task.getRuleName());
+                    LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}提交任务id:{},name:{}到审核",
+                           user, taskId, task.getRuleName());
                 } else {
                     result = Result.genFailedResult("此配置此任务审批人,ruleType=" + ruleType + ",归属部门=" + indDept);
                 }
@@ -349,7 +348,7 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void auditTask(TaskAuditResult auditResult, String auditUserId) {
+    public void auditTask(TaskAuditResult auditResult, String auditUser) {
         Date now = new Date();
         Task task = taskMapper.getById(auditResult.getTaskId());
         task.setUpdateTime(now);
@@ -370,13 +369,13 @@ public class TaskServiceImpl implements TaskService {
         auditRecord.setTaskId(task.getId());
         auditRecord.setId(IdWorker.getStrId());
         auditRecord.setPTaskId(task.getPId());
-        auditRecord.setCreator(auditUserId);
-        auditRecord.setUpdater(auditUserId);
+        auditRecord.setCreator(auditUser);
+        auditRecord.setUpdater(auditUser);
         auditRecord.setUpdateTime(now);
         auditRecord.setCreateTime(now);
         taskAuditRecordMapper.insert(auditRecord);
-        LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}任务:{}Id:{},ruleId:{}, ruleLevel:{}",
-                recordType, task.getRuleName(), task.getId(), task.getRuleId(), task.getRuleLevel());
+        LogManager.logInfo(Constants.LOG_CONTEXT_API, "{} {}任务:{}Id:{},ruleId:{}, ruleLevel:{}",
+                auditUser, recordType, task.getRuleName(), task.getId(), task.getRuleId(), task.getRuleLevel());
     }
 
     /**