修复内网缺陷

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

@@ -220,7 +220,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
         updateWrapper.eq(Question::getId, confirmDto.getId());
         if (ObjectUtil.equal(confirmDto.getStatus(), 0)) {
-            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue());
+            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue())
+                    .set(Question::getReformStatus,QuestionReformEnum.Unreform.getValue());
         } else {
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Dissent.getValue());
         }
@@ -262,7 +263,8 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
             updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Closed.getValue())
                     .set(Question::getReformStatus, null);
         } else {
-            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue());
+            updateWrapper.set(Question::getConfirmStatus, QuestionConfirmEnum.Confirmed.getValue())
+                    .set(Question::getReformStatus,QuestionReformEnum.Unreform.getValue());
         }
 
         questionFlowMapper.insert(flow);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/ProtectionServiceImpl.java

@@ -57,6 +57,7 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, Protect
 
     @Resource
     private RemoteDictDataService remoteDictDataService;
+
     @Override
     public TableDataInfo pageList(ProtectionPageDto request) {
         if (ObjectUtil.isNull(request.getOrgId())) {
@@ -71,8 +72,8 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, Protect
         } else if (ObjectUtil.isNotEmpty(request.getDateRange()) && request.getDateRange().length == 2) {
             Date startTime = new DateTime(request.getDateRange()[0]).setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             Date endTime = new DateTime(request.getDateRange()[1]).setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-            request.setStartTime(startTime);
-            request.setEndTime(endTime);
+            request.setStartTime(DateUtil.beginOfDay(startTime));
+            request.setEndTime(DateUtil.endOfDay(endTime));
         }
 
 
@@ -208,11 +209,11 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, Protect
     }
 
     @Override
-    public void export(ProtectionPageDto pageDto, HttpServletResponse response) throws Exception{
+    public void export(ProtectionPageDto pageDto, HttpServletResponse response) throws Exception {
         pageDto.setPageNum(1L);
         pageDto.setPageSize(99999L);
-        TableDataInfo data= this.pageList(pageDto);
-        List<ProtectionPageVo> rows= data.getRows();
+        TableDataInfo data = this.pageList(pageDto);
+        List<ProtectionPageVo> rows = data.getRows();
         Map<String, SysDictData> dicts = remoteDictDataService.selectDictByeType("protection_status", SecurityConstants.INNER)
                 .stream().collect(Collectors.toMap(SysDictData::getDictValue, v -> v));
         int index = 1;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/SafetyCheckRegisterSericeImpl.java

@@ -383,6 +383,14 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
      */
     @Transactional
     public Boolean submit(TaskRegisterVo<AppTaskRegisterPointVo> data, Boolean isNewTask) {
+        if(DateUtil.beginOfDay(data.getPlanStartTime()).after(DateUtil.beginOfDay(new Date()))){
+            throw new ServiceException("任务未到开始时间");
+        }
+
+        if(DateUtil.beginOfDay(data.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))){
+            throw new ServiceException("任务已过结束时间");
+        }
+
         if (ObjectUtil.isNull(data) || CollectionUtil.isEmpty(data.getCheckList())) {
             throw new ServiceException("检查内容不存在");
         }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -156,6 +156,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         } else {
             page = new Page<>();
         }
+        user.setOnlyManager(null);
         page = userMapper.getPage(page, user);
         return TableDataInfo.build(page);
 //        user.setDeleted(0);