解决缺陷

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreIntroduceLetterServiceImpl.java

@@ -462,9 +462,9 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
         if(outInRequest.getApproveStatus() ==1)
         {
             CoreIntroduceLetterOutInRequest outInRequestDo = outInRequestMapper.selectById(outInRequest.getId());
-            Date currentDate = DateUtil.beginOfDay(new Date());
+            Date currentDate = new Date();
             // 判断是否已逾期
-            final int result = currentDate.compareTo(outInRequestDo.getCreateTime());
+            final int result = currentDate.compareTo(DateUtil.endOfDay(outInRequestDo.getCreateTime()));
 
             if (result > 0) {
                 //4 已过期
@@ -1140,9 +1140,8 @@ public class CoreIntroduceLetterServiceImpl extends ServiceImpl<CoreIntroduceLet
             CoreRegisterBookPdf registerBookPdf = new CoreRegisterBookPdf();
             registerBookPdf.setId(requestId);
             registerBookPdf.setRegisterBookType(RegisterBookType.VISIT_RECORD.getNum());
-            //日期原先取的是以人员为单位的离开时间，现在改成以最后一个离开时间为日期
-            Date departureTime = (Date) data.get("maxTime");
-            registerBookPdf.setDate(departureTime);
+            //使用申请时间作为 登记簿表中的日期
+            registerBookPdf.setDate(coreIntroduceLetterVo.getCreateTime());
 
             registerBookPdf.setOrgId(coreIntroduceLetterVo.getOrgId());
             registerBookPdf.setOrgName(coreIntroduceLetterVo.getOrgName());

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

@@ -109,6 +109,10 @@ public class QuestionReformServiceImpl extends ServiceImpl<QuestionMapper, Quest
                 //任务未结束并且过了整改结束日期
                 r.setOverdueStatus(QuestionReformEnum.OverDue.getValue());
             }
+            if(r.getReformDeadline()!=null)
+            {
+                r.setReformDeadline(DateUtil.endOfDay(DateUtil.offset(r.getReformDeadline(), DateField.DAY_OF_YEAR, -1)));
+            }
         });
 //        Page<QuestionPageDto> r =page.
         //抓换为TableDataInfo适配前端

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

@@ -106,6 +106,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             if(isOverdue(r)){
                 r.setOverdueStatus(QuestionReformEnum.OverDue.getValue());
             }
+            if(r.getReformDeadline()!=null)
+            {
+                r.setReformDeadline(DateUtil.endOfDay(DateUtil.offset(r.getReformDeadline(), DateField.DAY_OF_YEAR, -1)));
+            }
         });
         return TableDataInfo.build(page);
     }
@@ -151,6 +155,10 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
         if(isOverdue(q)){
             vo.setOverdueStatus(QuestionReformEnum.OverDue.getValue());
         }
+        if(vo.getReformDeadline()!=null)
+        {
+            vo.setReformDeadline(DateUtil.endOfDay(DateUtil.offset(vo.getReformDeadline(), DateField.DAY_OF_YEAR, -1)));
+        }
         return vo;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/controller/ResumptionReportController.java

@@ -64,30 +64,35 @@ public class ResumptionReportController {
 //    @RequiresPermissions("core:resumptionReport:list")
     @PostMapping("/list")
     public AjaxResult list(@RequestBody ResumptionDTO resumptionDTO) throws ExecutionException, InterruptedException, TimeoutException {
-        if (null == resumptionDTO.getSearchTime()) {
-            LocalDate currentDate = LocalDate.now();
+        try {
+            if (null == resumptionDTO.getSearchTime()) {
+                LocalDate currentDate = LocalDate.now();
+                if (null == resumptionDTO.getCycle() || resumptionDTO.getCycle() == 1) {
+                    resumptionDTO.setSearchTime(currentDate.toString());
+                } else {
+                    String m = String.valueOf(currentDate.getMonthValue());
+                    if (m.length() == 1) {
+                        m = "0" + currentDate.getMonthValue();
+                    }
+                    resumptionDTO.setSearchTime(currentDate.getYear() + "-" + m);
+                }
+            }
+            AjaxResult ajaxResult = AjaxResult.success();
+            List<ResumptionDayVO> report = resumptionReportService.report(resumptionDTO);
+            ajaxResult.put(AjaxResult.DATA_TAG, report);
+            DateTime time = DateUtil.parse(resumptionDTO.getSearchTime());
             if (null == resumptionDTO.getCycle() || resumptionDTO.getCycle() == 1) {
-                resumptionDTO.setSearchTime(currentDate.toString());
+                ajaxResult.put(TITLE, "营业网点安全保卫履职情况表(" + DateUtil.format(time,Constants.DAILY_FORMAT) + ")");
             } else {
-                String m = String.valueOf(currentDate.getMonthValue());
-                if (m.length() == 1) {
-                    m = "0" + currentDate.getMonthValue();
-                }
-                resumptionDTO.setSearchTime(currentDate.getYear() + "-" + m);
+                ajaxResult.put(TITLE, "营业网点安全保卫履职情况表(" + DateUtil.format(time,Constants.MONTH_FORMAT) + ")");
             }
+            SysOrg sysOrg = remoteOrgService.selectSysOrgById(resumptionDTO.getOrgId(), SecurityConstants.INNER);
+            ajaxResult.put("orgName", sysOrg.getShortName());
+            return ajaxResult;
+        } catch (Exception e) {
+            // 生产上查询时间段过大，会查询报错，这里做一下错误提示处理
+            return AjaxResult.error("查询数据量过大，请缩短查询时间范围。");
         }
-        AjaxResult ajaxResult = AjaxResult.success();
-        List<ResumptionDayVO> report = resumptionReportService.report(resumptionDTO);
-        ajaxResult.put(AjaxResult.DATA_TAG, report);
-        DateTime time = DateUtil.parse(resumptionDTO.getSearchTime());
-        if (null == resumptionDTO.getCycle() || resumptionDTO.getCycle() == 1) {
-            ajaxResult.put(TITLE, "营业网点安全保卫履职情况表(" + DateUtil.format(time,Constants.DAILY_FORMAT) + ")");
-        } else {
-            ajaxResult.put(TITLE, "营业网点安全保卫履职情况表(" + DateUtil.format(time,Constants.MONTH_FORMAT) + ")");
-        }
-        SysOrg sysOrg = remoteOrgService.selectSysOrgById(resumptionDTO.getOrgId(), SecurityConstants.INNER);
-        ajaxResult.put("orgName", sysOrg.getShortName());
-        return ajaxResult;
     }
 
     @ApiOperation(value = "报警测试报表导出")