app履职任务列表时间查询逻辑；app隐患问题时间查询逻辑

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

@@ -83,24 +83,34 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 //            }
         }
 
-        //时间范围查询
-        if (ObjectUtil.isNotEmpty(query.getSubmitRange()) && query.getSubmitRange().length == 2) {
-            Date start = DateUtil.beginOfDay(query.getSubmitRange()[0]);
-            Date end = DateUtil.endOfDay(query.getSubmitRange()[1]);
-            wrapper.between(Question::getSubmitTime, start, end);
-        }
-        if (ObjectUtil.isNotNull(query.getReformDate())) {
-            Date start = DateUtil.beginOfDay(query.getReformDate());
-            wrapper.ge(Question::getReformDeadline, start);
 
-            Date end = DateUtil.endOfDay(query.getReformDate());
-            wrapper.le(Question::getReformDeadline, end);
-        }
-        if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
-            wrapper.and(w ->
-                    w.like(Question::getCheckItem, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())
-            );
+        if (ObjectUtil.isNotNull(query.getReformDate())) {
+            Date submitTime = DateUtil.endOfDay(query.getReformDate());
+            wrapper.le(Question::getSubmitTime, submitTime);
+
+            Date reformDeadLine = DateUtil.beginOfDay(query.getReformDate());
+            wrapper.ge(Question::getReformDeadline, reformDeadLine);
+
+            if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
+                wrapper.and(w ->
+                        w.like(Question::getQuestionDesc, query.getSearchKey())
+                );
+            }
+        }else{
+            //时间范围查询
+            if (ObjectUtil.isNotEmpty(query.getSubmitRange()) && query.getSubmitRange().length == 2) {
+                Date start = DateUtil.beginOfDay(query.getSubmitRange()[0]);
+                Date end = DateUtil.endOfDay(query.getSubmitRange()[1]);
+                wrapper.between(Question::getSubmitTime, start, end);
+            }
+
+            if (ObjectUtil.isNotEmpty(query.getSearchKey())) {
+                wrapper.and(w ->
+                        w.like(Question::getCheckItem, query.getSearchKey()).or().like(Question::getSrcTaskName, query.getSearchKey())
+                );
+            }
         }
+
         wrapper.orderByDesc(Question::getId);
         //获取数据
         page = baseMapper.selectPage(page, wrapper);

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

@@ -102,6 +102,11 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
 
     @Override
     public List<ResumptionAppVo> findResumptionApp(ResumptionTaskNewDto res) {
+        if(ObjectUtil.isNotNull(res.getDateTime())){
+            res.setStartTime(DateUtil.endOfDay(res.getDateTime()));
+            res.setEndTime(DateUtil.beginOfDay(res.getDateTime()));
+        }
+
         return resumptionMapper.findResumptionApp(res);
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/ResumptionTaskNewDto.java

@@ -1,5 +1,6 @@
 package com.xunmei.core.resumption.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +13,12 @@ import java.util.List;
 public class ResumptionTaskNewDto {
     @ApiModelProperty(value = "日期")
     private Date dateTime;
+
+    @JsonIgnore
+    private Date startTime;
+    @JsonIgnore
+    private Date endTime;
+
     @ApiModelProperty(value = "角色id")
     private List<Long> roleId;
     @ApiModelProperty(value = "机构id")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/SafetyCheckRegisterController.java

@@ -76,7 +76,7 @@ public class SafetyCheckRegisterController extends BaseController {
     @PostMapping("webtempsubmit")
 //    @RequiresPermissions(value = {"core:safetycheck:register","core:safetycheck:appregister"})
     public AjaxResult webTempSubmit(@RequestBody TaskRegisterVo<TaskRegisterAreaVo> dto) {
-        boolean r = safetyCheckRegisterSerice.webSubmit(dto);
+        boolean r = safetyCheckRegisterSerice.webTempSubmit(dto);
         return success(r);
     }
 }

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

@@ -287,6 +287,10 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
      */
     @Override
     public Boolean webSubmit(TaskRegisterVo<TaskRegisterAreaVo> data) {
+        return webSubmit(data, false);
+    }
+
+    private Boolean webSubmit(TaskRegisterVo<TaskRegisterAreaVo> data, Boolean isNewTask) {
         TaskRegisterVo<AppTaskRegisterPointVo> appdata = new TaskRegisterVo<AppTaskRegisterPointVo>();
         BeanUtils.copyProperties(data, appdata);
         appdata.setCheckList(new ArrayList<>());
@@ -308,7 +312,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             }
         }
 
-        return submit(appdata, false);
+        return submit(appdata, isNewTask);
     }
 
     /**
@@ -322,32 +326,9 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         if (ObjectUtil.isNull(data.getId())) {
             data.setId(IDHelper.id());
         }
-
-
-//        TaskRegisterVo<AppTaskRegisterPointVo> appdata = new TaskRegisterVo<AppTaskRegisterPointVo>();
-//        BeanUtils.copyProperties(data, appdata);
-//        appdata.setCheckList(new ArrayList<>());
-//        for (TaskRegisterAreaVo areaVo : data.getCheckList()) {
-//            boolean firstPoint = true;
-//
-//            for (TaskRegisterItemVo itemVo : areaVo.getItemList()) {
-//
-//                for (TaskRegisterPointVo pointVo : itemVo.getPointList()) {
-//
-//                    AppTaskRegisterPointVo appPointVo = new AppTaskRegisterPointVo();
-//                    BeanUtils.copyProperties(pointVo, appPointVo);
-//                    BeanUtils.copyProperties(itemVo, appPointVo);
-//                    BeanUtils.copyProperties(areaVo, appPointVo);
-//                    appPointVo.setNfcList(new ArrayList<>());
-//                    if (firstPoint) {
-//                        appPointVo.setNfcList(areaVo.getNfcList());
-//                        firstPoint = false;
-//                    }
-//                    appdata.getCheckList().add(appPointVo);
-//                }
-//            }
-//        }
-        return webSubmit(data);
+        data.setPlanStartTime(DateUtil.beginOfDay(data.getPlanStartTime()));
+        data.setPlanEndTime(DateUtil.endOfDay(data.getPlanStartTime()));
+        return webSubmit(data, true);
     }
 
     /**
@@ -412,7 +393,11 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 questionService.insertQuestion(question);
             }
         }
-        updateTask(data, questions.size(), data.getIsSubmit());
+        if (isNewTask) {
+            addTask(data, questions.size(), data.getIsSubmit());
+        } else {
+            updateTask(data, questions.size(), data.getIsSubmit());
+        }
 
         return true;
     }

soc-modules/soc-modules-core/src/main/resources/mapper/resumption/ResumptionMapper.xml

@@ -133,7 +133,7 @@
             inner join core_resumption_plan p on pr.plan_id=p.id and p.parent_id =-1 and p.deleted=0)
         </if>
         <if test="res.dateTime != null ">
-            and r.plan_start_time &lt;= #{res.dateTime} and r.plan_end_time>= #{res.dateTime}
+            and r.plan_start_time &lt;= #{res.startTime} and r.plan_end_time>= #{res.endTime}
         </if>
     </select>
     <select id="selectAllByPlanStartTime" resultType="com.xunmei.core.resumption.domain.Resumption">