增加短板审核记录接口

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

 package com.keymobile.indicators.api.hytobacco;
 
 import com.keymobile.indicators.constant.Constants;
+import com.keymobile.indicators.model.entity.shortboard.ShortBoardAuditRecord;
 import com.keymobile.indicators.model.entity.shortboard.ShortBoardTask;
 import com.keymobile.indicators.model.entity.shortboard.ShortboardAnalysisValue;
 import com.keymobile.indicators.model.entity.shortboard.ShortboardParam;
@@ -62,9 +63,11 @@ public class ShortboardTaskCtrl {
 
     @ApiOperation(value = "更新短板状态", notes = "更新短板状态 1是短板清单 2待改善 3以改善 4加入白名单 5不合格")
     @GetMapping("updateStatus")
-    public Result updateStatus(@ApiParam("短板任务id") @RequestParam(name = "taskId") Integer taskId,@ApiParam("状态值")@RequestParam("status") Integer status){
+    public Result updateStatus(@ApiParam("短板任务id") @RequestParam(name = "taskId") Integer taskId,
+                               @ApiParam("状态值")@RequestParam("status") Integer status,
+                               @ApiParam("意见")@RequestParam( value = "description",required = false) String description){
 
-      return shortboardTaskService.updateTaskStatus(taskId,status);
+      return shortboardTaskService.updateTaskStatus(taskId,status,description);
     }
     @ApiOperation(value = "获取短板状态分析数据", notes = "获取短板状态分析数据")
     @PostMapping("analysisStatus")
@@ -95,5 +98,9 @@ public class ShortboardTaskCtrl {
         }
         return new PageImpl<>(lists,request,count);
     }
-
+    @ApiOperation(value = "查询短板检查记录", notes = "查询短板检查记录")
+    @GetMapping("findAuditRecord")
+    public List<ShortBoardAuditRecord> findAuditRecord(@RequestParam("taskId")Integer taskId){
+        return shortboardTaskService.findAuditRecord(taskId);
+    }
 }

src/main/java/com/keymobile/indicators/model/mapper/indmapper/ShortBoardAuditRecordMapper.java

+package com.keymobile.indicators.model.mapper.indmapper;
+
+import com.keymobile.indicators.model.entity.shortboard.ShortBoardAuditRecord;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+import tk.mybatis.mapper.common.BaseMapper;
+
+import java.util.List;
+
+@Mapper
+public interface ShortBoardAuditRecordMapper extends BaseMapper<ShortBoardAuditRecord> {
+
+    /**
+     * 查询短板检查记录
+     * * */
+    @Select("SELECT * FROM short_board_audit_record where short_task_id=#{taskId} order by create_time desc")
+    List<ShortBoardAuditRecord> findAuditRecord(Integer taskId);
+}

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

@@ -3,10 +3,7 @@ package com.keymobile.indicators.service.hytobacco;
 import com.keymobile.indicators.constant.Constants;
 import com.keymobile.indicators.model.entity.indicators.DriveIndCatalog;
 import com.keymobile.indicators.model.entity.shortboard.*;
-import com.keymobile.indicators.model.mapper.indmapper.ShortboardRecordMapper;
-import com.keymobile.indicators.model.mapper.indmapper.ShortboardRuleMapper;
-import com.keymobile.indicators.model.mapper.indmapper.ShortboardTaskMapper;
-import com.keymobile.indicators.model.mapper.indmapper.ShortboardTaskValMapper;
+import com.keymobile.indicators.model.mapper.indmapper.*;
 import com.keymobile.indicators.result.Result;
 import com.keymobile.indicators.utils.LogManager;
 import com.keymobile.indicators.utils.SystemUserUtil;
@@ -35,6 +32,8 @@ public class ShortboardTaskService {
     @Autowired
     private ShortboardRuleMapper shortboardRuleMapper;
 
+    @Autowired
+    private ShortBoardAuditRecordMapper shortBoardAuditRecordMapper;
 
     public Result assignShortboard(@RequestBody  ShortBoardTask shortBoardTask) {
 
@@ -148,7 +147,7 @@ public class ShortboardTaskService {
         return shortboardTaskMapper.selectByPrimaryKey(id);
     }
 
-    public Result updateTaskStatus(Integer taskId, Integer status) {
+    public Result updateTaskStatus(Integer taskId, Integer status,String description) {
         Date date = new Date();
         ShortBoardTask shortBoardTask = new ShortBoardTask();
         shortBoardTask.setUpdateTime(date);
@@ -158,6 +157,15 @@ public class ShortboardTaskService {
         shortboardTaskMapper.updateByPrimaryKeySelective(shortBoardTask);
         String message = SystemUserUtil.getCurrentUser()+":把id={}的短板清单状态修改为{} ";
         LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,message,taskId,status);
+        if(StringUtils.isNotBlank(description)){
+            ShortBoardAuditRecord shortBoardAuditRecord = new ShortBoardAuditRecord();
+            shortBoardAuditRecord.setDescription(description);
+            shortBoardAuditRecord.setCreateTime(date);
+            shortBoardAuditRecord.setCreateUser(SystemUserUtil.getCurrentUser());
+            shortBoardAuditRecord.setShortTaskId(taskId);
+            shortBoardAuditRecord.setStatus(status);
+            shortBoardAuditRecordMapper.insert(shortBoardAuditRecord);
+        }
         return Result.genOkResult();
     }
 
@@ -197,4 +205,8 @@ public class ShortboardTaskService {
     public List<ShortBoardTask> selectAnalysisDataPageByParam(ShortboardParam shortboardParam) {
         return shortboardTaskMapper.selectAnalysisDataPageByParam(shortboardParam);
     }
+
+    public List<ShortBoardAuditRecord> findAuditRecord(Integer taskId) {
+        return this.shortBoardAuditRecordMapper.findAuditRecord(taskId);
+    }
 }