短板保留历史填报值-完善01

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

@@ -55,6 +55,10 @@ public class ShortboardTaskValCtrl {
     @ApiOperation(value = "保存短板清单填报(在线填报)", notes = "保存短板清单填报(在线填报)")
     @PostMapping("saveOrUpdate")
     public Result saveOrUpdate(@RequestBody ShortBoardTaskVal shortBoardTaskVal){
+        //根据版本号和任务id查询如果为空则新增
+        ShortBoardTaskVal tmpValue = shortboardTaskService.selectShortBoardTaskValByTaskIdAndAuditCount(shortBoardTaskVal.getShortBoardTaskId(), shortBoardTaskVal.getAuditCount());
+        //设置id号
+        shortBoardTaskVal.setId(tmpValue.getId());
 
         Result result = shortboardTaskService.saveOrUpdateShortBoardTaskVal(shortBoardTaskVal,false);
         String message = SystemUserUtil.getCurrentUser()+"在线填报了短板清单：id={}";
@@ -105,14 +109,19 @@ public class ShortboardTaskValCtrl {
     }
     @ApiOperation(value = "下载excel模板", notes = "下载excel模板")
     @GetMapping("exportToExcel")
-    public void exportToExcel(@RequestParam("id")Integer id,@RequestParam("auditCount") Integer auditCount, HttpServletResponse response) throws IOException {
+    public void exportToExcel(@RequestParam("id")Integer id,@RequestParam(name = "auditCount",required = false) Integer auditCount, HttpServletResponse response) throws IOException {
         try {
             List<List<String>> headers = new ArrayList<>();
             List<List<String>> datas = new ArrayList<>();
             response.setContentType("application/vnd.ms-excel");
             response.setCharacterEncoding("utf-8");
             ExcelWriterBuilder writerBuilder = EasyExcel.write(response.getOutputStream());
-            ShortBoardTaskVal shortBoardTaskVal = shortboardTaskService.selectShortBoardTaskValByTaskIdAndAuditCount(id,auditCount);//selectShortBoardTaskValByTaskIdId(id);
+            ShortBoardTaskVal shortBoardTaskVal = new ShortBoardTaskVal();
+            if(auditCount!=null&&auditCount>=0){
+                 shortBoardTaskVal = shortboardTaskService.selectShortBoardTaskValByTaskIdAndAuditCount(id,auditCount);//selectShortBoardTaskValByTaskIdId(id);
+            }
+
+
             ShortBoardTask shortBoardTask = shortboardTaskService.selectShortBoardTaskById(id);
             String fileName = URLEncoder.encode("短板任务清单填报", "UTF-8");
             String levelArr[] = {"省","市","县"};
@@ -153,33 +162,37 @@ public class ShortboardTaskValCtrl {
             //短板原因分析
             List<String> column7 = new ArrayList<>();
             column7.add("短板原因分析");
-            column7.add("");
+            column7.add(shortBoardTaskVal.getAnalysisCauses());
 
             //短板受理员
             List<String> column8 = new ArrayList<>();
             column8.add("短板受理员");
-            column8.add("");
+            column8.add(shortBoardTaskVal.getHandleUser());
 
             //制定改善措施
             List<String> column9 = new ArrayList<>();
             column9.add("制定改善措施");
-            column9.add("");
+            column9.add(shortBoardTaskVal.getCreateMeasure());
 
             //改善人员
             List<String> column10 = new ArrayList<>();
             column10.add("改善人员");
-            column10.add("");
+            column10.add(shortBoardTaskVal.getImproveUser());
 
             //执行改善措施
             List<String> column11 = new ArrayList<>();
             column11.add("执行改善措施");
-            column11.add("");
+            column11.add(shortBoardTaskVal.getStartMeasure());
 
             //执行人员
             List<String> column12 = new ArrayList<>();
             column12.add("执行人员");
-            column12.add("");
+            column12.add(shortBoardTaskVal.getStartUser());
 
+            //执行人员
+            List<String> column13 = new ArrayList<>();
+            column13.add("改善后指标值");
+            column13.add(shortBoardTaskVal.getImproveValue());
             datas.add(column2);
             datas.add(column3);
             datas.add(column4);
@@ -191,7 +204,7 @@ public class ShortboardTaskValCtrl {
             datas.add(column10);
             datas.add(column11);
             datas.add(column12);
-
+            datas.add(column13);
             List<String> header = new ArrayList<>();
 
             header.add("短板清单填报");
@@ -200,7 +213,7 @@ public class ShortboardTaskValCtrl {
             response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
 
 
-            LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,"下载短板清楚excel，id:{}",shortBoardTaskVal.getShortBoardTaskId());
+            LogManager.logInfo(Constants.LOG_INDICATOR_SHORTBOARD_TASK_API,"下载短板清楚excel，id:{}",id);
 
             writerBuilder.excelType(ExcelTypeEnum.XLSX).registerWriteHandler(new Custemhandler()).
                     head(headers)

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

@@ -51,14 +51,15 @@ public class TaskCtrl  {
         if (needLast != null) {
             need = needLast.booleanValue();
         }
+        String currentUser = SystemUserUtil.getCurrentUser();
         if (CollectionUtils.isNotEmpty(ruleIds)) {
             if (ruleIds.size() > 1) {
-                taskService.batchCreateTaskByRule(ruleIds, valueTime, need);
+                taskService.batchCreateTaskByRule(currentUser,ruleIds, valueTime, need);
                 result = Result.genOkResult("开始批量启动任务");
                 LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "启动了批量任务数据时间为：{}的任务， ids为{}",
                          valueTime,ruleIds);
             } else {
-                result = taskService.createTaskByRule(ruleIds.get(0), valueTime, need);
+                result = taskService.createTaskByRule(currentUser,ruleIds.get(0), valueTime, need);
                 LogManager.logInfo(Constants.LOG_INDICATOR_TASK_START_API, "启动了数据时间为：{}的任务id为{}",
                          valueTime,ruleIds);
             }

src/main/java/com/keymobile/indicators/service/dataenter/TaskService.java

@@ -187,7 +187,7 @@ public interface TaskService {
      * @param needLast
      * @return
      */
-    void batchCreateTaskByRule(List<Integer> ruleIds,
+    void batchCreateTaskByRule(String user,List<Integer> ruleIds,
                             @ApiParam("收数月份, 格式: 2020-03、2020-06、2020-09、2020-12")String valueTime, boolean needLast);
 
     /**
@@ -196,7 +196,7 @@ public interface TaskService {
      * @param valueTime
      * @return
      */
-    Result createTaskByRule(Integer ruleId,
+    Result createTaskByRule(String user,Integer ruleId,
                                  @ApiParam("收数月份, 格式: 2020-03、2020-06、2020-09、2020-12")String valueTime, boolean needLast);
      /**
       * 查询审核过的数目，

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

@@ -713,9 +713,9 @@ public class TaskServiceImpl implements TaskService {
 
     @Override
     @Async
-    public void batchCreateTaskByRule(List<Integer> ruleIds, String valueTime, boolean needLast) {
+    public void batchCreateTaskByRule(String user,List<Integer> ruleIds, String valueTime, boolean needLast) {
         for (Integer ruleId : ruleIds) {
-            createTaskByRule(ruleId, valueTime, needLast);
+            createTaskByRule(user,ruleId, valueTime, needLast);
         }
     }
 
@@ -753,7 +753,7 @@ public class TaskServiceImpl implements TaskService {
     }
 
     @Override
-    public Result createTaskByRule(Integer ruleId, String valueTime, boolean needLast) {
+    public Result createTaskByRule(String user,Integer ruleId, String valueTime, boolean needLast) {
         Result result = null;
         TaskRule rule = taskRuleService.getById(ruleId, true);
         if (rule != null) {
@@ -796,7 +796,7 @@ public class TaskServiceImpl implements TaskService {
                                 int addAuditDate = rule.getAuditLimit();
                                 Date editEndDate = DateUtils.addDay(now, addEndDate);
                                 Date auditEndDate = DateUtils.addDay(now, addEndDate + addAuditDate);
-                                String user = SystemUserUtil.getCurrentUser();
+                                //String user = SystemUserUtil.getCurrentUser();
                                 List<Task> allTasks = new ArrayList<>();
                                 for (String dept : deptMapInds.keySet()) {
                                     List<TaskIndicator> tis = deptMapInds.get(dept);