Merge branch 'hy-tobacco' of ssh://132.232.112.242:7022/zhangkb/indicators into hy-tobacco

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

@@ -15,6 +15,7 @@ import com.keymobile.indicators.service.dataenter.TaskRuleService;
 import com.keymobile.indicators.service.dataenter.TaskService;
 import com.keymobile.indicators.service.hytobacco.IndicatorsRelService;
 import com.keymobile.indicators.utils.DateUtils;
+import com.keymobile.indicators.utils.LogManager;
 import com.keymobile.indicators.utils.SystemUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -49,8 +50,12 @@ public class TaskCtrl  {
             if (ruleIds.size() > 1) {
                 taskService.batchCreateTaskByRule(ruleIds, valueTime);
                 result = Result.genOkResult("开始批量启动任务");
+                LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}启动了批量任务数据时间为：{}的任务， ids为{}",
+                        SystemUserUtil.getCurrentUser(), valueTime,ruleIds);
             } else {
                 result = taskService.createTaskByRule(ruleIds.get(0), valueTime);
+                LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}启动了数据时间为：{}的任务id为{}",
+                        SystemUserUtil.getCurrentUser(), valueTime,ruleIds);
             }
         } else {
             result = Result.genFailedResult("没有选择需要启动的任务");
@@ -70,6 +75,8 @@ public class TaskCtrl  {
     @PostMapping("findMyTask")
     public List<Task> findMyTask(@RequestBody QueryAllTaskParam param) {
         param.setUserId(SystemUserUtil.getCurrentUserId());
+        LogManager.logInfo(Constants.LOG_CONTEXT_API, "{}查询了我任务：{}",
+                SystemUserUtil.getCurrentUser());
         return taskService.findAllTask(param);
     }
 

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

@@ -551,7 +551,7 @@ public class TaskServiceImpl implements TaskService {
                             int addAuditDate = rule.getAuditLimit();
                             Date editEndDate = DateUtils.addDay(now, addEndDate);
                             Date auditEndDate = DateUtils.addDay(now, addEndDate + addAuditDate);
-                            String userId = SystemUserUtil.getCurrentUserId();
+                            String user = SystemUserUtil.getCurrentUser();
                             List<Task> allTasks = new ArrayList<>();
                             for (String dept : deptMapInds.keys()) {
                                 List<TaskIndicator> tis = deptMapInds.get(dept);
@@ -565,9 +565,9 @@ public class TaskServiceImpl implements TaskService {
                                     task.setValueTime(valueTime);
                                     task.setCreateTime(now);
                                     task.setToRoleNames(rule.getToRoleNames());
-                                    task.setCreator(userId);
+                                    task.setCreator(user);
                                     task.setUpdateTime(now);
-                                    task.setUpdater(userId);
+                                    task.setUpdater(user);
                                     task.setStatus(Constants.APPLY_STATE_DRAFT);
                                     task.setState(Constants.DATA_STATE_A);
                                     task.setIndicators(tis);