优化，修改注释

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

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
 
-@Api(tags={"数据填报-填报任务管理（任务清单、数据填报、数据审核）"})
+@Api(tags={"数据填报-填报任务管理（任务清单、数据填报、数据审核,数据确认）"})
 @RestController
 @RequestMapping(value = "/task")
 public class TaskCtrl  {
@@ -76,7 +76,7 @@ public class TaskCtrl  {
         return taskService.findTask(param);
     }
 
-    @ApiOperation("获取我的任务(数据填报、数据审核)")
+    @ApiOperation("获取我的任务(数据填报、数据审核、数据确认)")
     @PostMapping("findMyTask")
     public List<Task> findMyTask(@RequestBody QueryAllTaskParam param) {
         //如果userId是空就是管理员
@@ -123,7 +123,7 @@ public class TaskCtrl  {
         return taskService.submitTask(id, SystemUserUtil.getCurrentUser());
     }
 
-    @ApiOperation("审核任务")
+    @ApiOperation("审核任务，数据确认")
     @PostMapping("audit")
     public Result audit(@ApiParam("审核信息") @RequestBody TaskAuditResult param) {
         taskService.auditTask(param, SystemUserUtil.getCurrentUser());

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

@@ -286,21 +286,20 @@ public class TaskServiceImpl implements TaskService {
         String orgNo = task.getOrgNo();
         String auditUsers = task.getAuditUsers();
         TaskRuleTargetRoles taskRuleTargetRoles = taskRuleTargetRolesMapper.getByOrgNo(orgNo);
-        String enterRoleIdsStr = taskRuleTargetRoles.getEnterRoleIds();
-        String auditRoleIds = taskRuleTargetRoles.getAuditRoleIds();
-        String[] enterRoleIds = enterRoleIdsStr.split(Constants.SEP_COMMA);
-        //获取填报人角色id
-        String roleId = taskMapper.selectToRoleIdByTaskId(taskId);
-        //找不到对应的，按原来的方法走。。。。
-
-        String roleIdStr=taskRuleTargetRoles.getAuditRoleIds();
-        for (int i=0;i<enterRoleIds.length;i++) {
-            if(enterRoleIds[i].equals(roleId)){
-                roleIdStr = auditRoleIds.split(Constants.SEP_COMMA)[i];
-                break;
-            }
-        }
         if (taskRuleTargetRoles != null) {
+            String enterRoleIdsStr = taskRuleTargetRoles.getEnterRoleIds();
+            String auditRoleIds = taskRuleTargetRoles.getAuditRoleIds();
+            String[] enterRoleIds = enterRoleIdsStr.split(Constants.SEP_COMMA);
+            //获取填报人角色id
+            String roleId = taskMapper.selectToRoleIdByTaskId(taskId);
+            //默认值是该机构下的全部审核角色
+            String roleIdStr=taskRuleTargetRoles.getAuditRoleIds();
+            for (int i=0;i<enterRoleIds.length;i++) {
+                if(enterRoleIds[i].equals(roleId)){
+                    roleIdStr = auditRoleIds.split(Constants.SEP_COMMA)[i];
+                    break;
+                }
+            }
             String indDept = task.getRefIndDept();
             List<RoleRefUserModel> users = getUserByRoleIdStr(roleIdStr);
             if (CollectionUtils.isNotEmpty(users)) {
@@ -331,8 +330,6 @@ public class TaskServiceImpl implements TaskService {
                         noticeInfo.setTaskId(taskId);
                         noticeInfo.setNoticeClass(Constants.NOTICEINFO_DATA_AUDIT);
                         noticeInfos.add(noticeInfo);
-
-
                     }
                 }
                 if (found) {

src/main/java/com/keymobile/indicators/service/hytobacco/ShortboardTaskService.java

@@ -51,6 +51,7 @@ public class ShortboardTaskService {
             shortBoardTask.setValue(shortboardRecord.getValue());
             shortBoardTask.setDriveName(shortboardRecord.getDriveName());
             shortBoardTask.setRuleIds(shortboardRecord.getShortboardRuleIds());
+            shortBoardTask.setActionRecord("未执行");
             shortBoardTask.setStatus(Constants.SHORT_BOARD_START);
             //获取短板筛选规则名称 多个逗号分隔
 //            String shortboardRuleIds = shortboardRecord.getShortboardRuleIds();
@@ -142,6 +143,7 @@ public class ShortboardTaskService {
         shortboardTask.setUpdater(SystemUserUtil.getCurrentUser());
         shortboardTask.setId(shortBoardTaskVal.getShortBoardTaskId());
         shortboardTask.setStatus(Constants.SHORT_BOARD_START_IMPROVED);
+        shortboardTask.setActionRecord("已执行");
         shortboardTaskMapper.updateByPrimaryKeySelective(shortboardTask);
         return Result.genOkResult();
     }