隐患问题 导出 的整改截止日期 调整

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/dto/QuestionExportDto.java

@@ -88,7 +88,7 @@ public class QuestionExportDto {
     @ApiModelProperty(value = "整改期限")
     @ExcelProperty(value="整改期限",index = 10)
     @ColumnWidth(12)
-    @DateTimeFormat("yyyy-MM-dd")
+    @DateTimeFormat("yyyy-MM-dd HH:mm:ss")
     private Date reformDeadline;
 
     @ExcelIgnore

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionReformServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.question.service.impl;
 
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
@@ -211,6 +212,10 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
                 //任务未结束并且过了整改结束日期
                 questionExportDto.setReformStatusText("已逾期");
             }
+            if(questionExportDto.getReformDeadline()!=null)
+            {
+                questionExportDto.setReformDeadline(DateUtil.endOfDay(DateUtil.offset(questionExportDto.getReformDeadline(), DateField.DAY_OF_YEAR, -1)));
+            }
 
         }
         response.setContentType("application/vnd.ms-excel");

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/question/service/impl/QuestionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.question.service.impl;
 
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.excel.EasyExcel;
@@ -330,6 +331,12 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 questionExportDto.setConfirmStatusText("已逾期");
                 questionExportDto.setReformStatusText("已逾期");
             }
+
+            if(questionExportDto.getReformDeadline()!=null)
+            {
+                questionExportDto.setReformDeadline(DateUtil.endOfDay(DateUtil.offset(questionExportDto.getReformDeadline(), DateField.DAY_OF_YEAR, -1)));
+            }
+
             questionExportDto.setIndex(index++);
         }
         response.setContentType("application/vnd.ms-excel");