实现排序

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

@@ -313,7 +313,7 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
      */
     private Date getEffectiveTime(CoreSafecheckPlan plan, Boolean immediateEffect) {
         if (ObjectUtil.equal(plan.getPlanCycle(), SafetyPlanCycle.NONE.getCode())) {
-            return DateUtil.beginOfDay(plan.getEndDate());
+            return DateUtil.beginOfDay(plan.getStartDate());
         }
 
         Date effectiveTime = new Date();

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

@@ -87,8 +87,8 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
 
     @Override
     public TableDataInfo appList(AppPageDto dto) {
-        if(ObjectUtil.isNotNull(dto.getTaskTime())){
-            DateRange r= DateUtils.getStartAndEnd(dto.getTaskTime(), CycleCommonEnum.MONTHLY);
+        if (ObjectUtil.isNotNull(dto.getTaskTime())) {
+            DateRange r = DateUtils.getStartAndEnd(dto.getTaskTime(), CycleCommonEnum.MONTHLY);
             dto.setStartTime(r.getStartTime());
             dto.setEndTime(r.getEndTime());
         }
@@ -121,7 +121,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
 //        }
 //        wrapper.in(CoreSafetyTask::getPlanId, page.getRecords().stream().map(r -> r.getPlanId()).collect(Collectors.toList()));
 
-        List<CoreSafetyTask> list = baseMapper.selectTaskList(dto,SecurityUtils.getUserId());
+        List<CoreSafetyTask> list = baseMapper.selectTaskList(dto, SecurityUtils.getUserId());
 //        Map<Long, List<CoreSafetyTask>> grouped = list.stream().collect(Collectors.groupingBy(t -> t.getBatchId()));
 
         List<Long> planIds = page.getRecords().stream().map(r -> r.getPlanId()).distinct().collect(Collectors.toList());
@@ -142,10 +142,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
                 vo.setUncompleted(convertToAppItemVo(v, i -> !ObjectUtil.equal(i.getStatus(), SafetyCheckTaskStatus.Completed.getValue())));
             }
 
-            Date date=DateUtil.beginOfDay(new Date());
-            Date planStartDate=DateUtil.beginOfDay(vo.getPlanStartTime());
-            Date planEndDate=DateUtil.beginOfDay(vo.getPlanEndTime());
-            vo.setInRegisterTime((planStartDate.before(date) && planEndDate.after(date) || date.getTime()==planStartDate.getTime())?1:0);
+            vo.setInRegisterTime(getInRegisterTime(vo.getPlanStartTime(), vo.getPlanEndTime()));
         });
 
         return TableDataInfo.success(page);
@@ -211,7 +208,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         BeanUtils.copyProperties(baseData, vo);
         List<AppTaskRegisterItemVo> itemVos = new ArrayList<>();
         //for (Long itemId : groupByItem.keySet()) {
-        for(Map.Entry<Long, List<AppTaskRegisterPointVo>> map:groupByItem.entrySet()){
+        for (Map.Entry<Long, List<AppTaskRegisterPointVo>> map : groupByItem.entrySet()) {
             List<AppTaskRegisterPointVo> pointVos = map.getValue();//groupByItem.get(itemId);
             AppTaskRegisterItemVo itemVo = new AppTaskRegisterItemVo();
             itemVo.setItemId(pointVos.get(0).getItemId());
@@ -235,7 +232,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         if (ObjectUtil.isNotNull(task.getPlanId())) {
             plan = coreSafecheckPlanMapper.get(task.getPlanId());
         } else {
-          throw  new RuntimeException("计划id不存在");
+            throw new RuntimeException("计划id不存在");
         }
 
         SysOrg beCheckedOrg = remoteOrgService.selectOrgById(task.getOrgId(), SecurityConstants.INNER);
@@ -272,7 +269,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             taskImgs = imgs.stream().collect(Collectors.groupingBy(CoreSafetyTaskDataRemarkimg::getTaskDataId));
         }
 
-        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, beCheckedOrg.getType().toString(), roleNames);
+        TaskRegisterVo<AppTaskRegisterPointVo> vo = TaskRegisterVo.of(task, beCheckedOrg.getType().toString(), roleNames, getInRegisterTime(task.getPlanStartTime(), task.getPlanEndTime()));
         if (ObjectUtil.isNotNull(plan)) {
             vo.setPlanType(plan.getCheckType().intValue());
         }
@@ -289,13 +286,13 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             }
 
             point.setNfcList(new ArrayList<>());
-            if(ObjectUtil.equal( point.getMustCheck(),1)){
+            if (ObjectUtil.equal(point.getMustCheck(), 1)) {
                 for (TaskRegisterNfcVo nfc : nfcs) {
-                    if(usedNfcId.contains(nfc.getNfcId())){
+                    if (usedNfcId.contains(nfc.getNfcId())) {
                         continue;
                     }
 
-                    if(ObjectUtil.equal(point.getAreaId(),nfc.getAreaId())){
+                    if (ObjectUtil.equal(point.getAreaId(), nfc.getAreaId())) {
                         point.getNfcList().add(nfc);
                         usedNfcId.add(nfc.getNfcId());
                     }
@@ -307,6 +304,13 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         return vo;
     }
 
+    private int getInRegisterTime(Date startTime, Date endTime) {
+        Date date = DateUtil.beginOfDay(new Date());
+        Date planStartDate = DateUtil.beginOfDay(startTime);
+        Date planEndDate = DateUtil.endOfDay(endTime);
+        return (!planStartDate.after(date) && !planEndDate.before(date)) ? 1 : 0;
+    }
+
     private List<IdNameVo> getTaskRoles(CoreSafecheckPlan plan, CoreSafetyTask task) {
         List<Long> roleIds = new ArrayList<>();
         if (ObjectUtil.equal(task.getSourceType(), SafetyTaskSourceType.TempTask.getCode().longValue())) {
@@ -407,11 +411,11 @@ 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()))){
+        if (DateUtil.beginOfDay(data.getPlanStartTime()).after(DateUtil.beginOfDay(new Date()))) {
             throw new ServiceException("任务未到开始时间");
         }
 
-        if(DateUtil.beginOfDay(data.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))){
+        if (DateUtil.beginOfDay(data.getPlanEndTime()).before(DateUtil.beginOfDay(new Date()))) {
             throw new ServiceException("任务已过结束时间");
         }
 
@@ -433,8 +437,8 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
 
         if (!isNewTask) {
             removeExistData(data.getId());
-        }else{
-            SysOrg checkOrg =null;
+        } else {
+            SysOrg checkOrg = null;
             checkOrg = remoteOrgService.selectOrgById(data.getCheckOrgId(), SecurityConstants.INNER);
             data.setBeCheckOrgType(org.getType().toString());
             data.setBeCheckedOrgName(org.getShortName());
@@ -478,13 +482,13 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             }
         }
         if (isNewTask) {
-            addTask(data, questions.size(), data.getIsSubmit(),org);
+            addTask(data, questions.size(), data.getIsSubmit(), org);
         } else {
             updateTask(data, questions.size(), data.getIsSubmit());
         }
         if (data.getIsSubmit() > 0) {
             coreSafecheckPlanService.buildPdf(data.getId());
-            coreSafecheckPlanService.updatePlanCompletedState(data.getPlanId(),1);
+            coreSafecheckPlanService.updatePlanCompletedState(data.getPlanId(), 1);
         }
         return true;
     }
@@ -588,7 +592,7 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
      * @param isSubmit
      * @return
      */
-    private boolean addTask(TaskRegisterVo data, Integer exceptionCount, Integer isSubmit,SysOrg beCheckedOrg) {
+    private boolean addTask(TaskRegisterVo data, Integer exceptionCount, Integer isSubmit, SysOrg beCheckedOrg) {
         CoreSafetyTask task = new CoreSafetyTask();
         task.setId(data.getId());
         task.setPlanId(-1L);
@@ -686,17 +690,17 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
         }
 
 //        if (ObjectUtil.isNull(task.getGrantUserId())) {
-            Long canGrantCount = tasks.stream()
-                    .filter(t -> ObjectUtil.notEqual(t.getStatus(), SafetyCheckTaskStatus.Completed.getValue()) &&
-                            ObjectUtil.notEqual(t.getStatus(),SafetyCheckTaskStatus.OverDue.getValue()) &&
-                            (ObjectUtil.isNull(t.getGrantUserId()) || ObjectUtil.equal(t.getId(),dto.getTaskId())))
-                    .count();
-            Long selfCompletedCount = tasks.stream()
-                    .filter(t -> ObjectUtil.equal(t.getStatus(), SafetyCheckTaskStatus.Completed.getValue()) && ObjectUtil.isNull(t.getGrantUserId()))
-                    .count();
-            if (canGrantCount <= 1 && selfCompletedCount == 0) {
-                throw new ServiceException("网点负责人每月亲自检查不少于1次");
-            }
+        Long canGrantCount = tasks.stream()
+                .filter(t -> ObjectUtil.notEqual(t.getStatus(), SafetyCheckTaskStatus.Completed.getValue()) &&
+                        ObjectUtil.notEqual(t.getStatus(), SafetyCheckTaskStatus.OverDue.getValue()) &&
+                        (ObjectUtil.isNull(t.getGrantUserId()) || ObjectUtil.equal(t.getId(), dto.getTaskId())))
+                .count();
+        Long selfCompletedCount = tasks.stream()
+                .filter(t -> ObjectUtil.equal(t.getStatus(), SafetyCheckTaskStatus.Completed.getValue()) && ObjectUtil.isNull(t.getGrantUserId()))
+                .count();
+        if (canGrantCount <= 1 && selfCompletedCount == 0) {
+            throw new ServiceException("网点负责人每月亲自检查不少于1次");
+        }
 //        }
 
         LambdaUpdateWrapper<CoreSafetyTask> updateWrapper = new LambdaUpdateWrapper<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/vo/regsiter/TaskRegisterVo.java

@@ -38,9 +38,11 @@ public class TaskRegisterVo<T> {
     private Integer planType;
 
     @ApiModelProperty(value = "计划开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planStartTime;
 
     @ApiModelProperty(value = "计划结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date planEndTime;
 
     @ApiModelProperty(value = "检查时间")
@@ -92,7 +94,7 @@ public class TaskRegisterVo<T> {
     @ApiModelProperty(value = "检查列表")
     private List<T> checkList;
 
-    public static TaskRegisterVo of(CoreSafetyTask task, String beCheckOrgType, List<IdNameVo> checkRoles) {
+    public static TaskRegisterVo of(CoreSafetyTask task, String beCheckOrgType, List<IdNameVo> checkRoles,int inRegisterTime) {
         TaskRegisterVo vo = new TaskRegisterVo();
         vo.setId(task.getId());
         vo.setTaskName(task.getTitle());
@@ -113,10 +115,7 @@ public class TaskRegisterVo<T> {
         vo.setExceptionCount(task.getExceptionCount().intValue());
         vo.setSubmitBy(task.getSubmitBy());
 
-        Date date=DateUtil.beginOfDay(new Date());
-        Date planStartDate=DateUtil.beginOfDay(task.getPlanStartTime());
-        Date planEndDate=DateUtil.beginOfDay(task.getPlanEndTime());
-        vo.setInRegisterTime((planStartDate.before(date) && planEndDate.after(date) || date.getTime()==planStartDate.getTime())?1:0);
+        vo.setInRegisterTime(inRegisterTime);
 
         return vo;
     }

soc-modules/soc-modules-core/src/main/resources/mapper/device/ProtectionMapper.xml

@@ -40,7 +40,7 @@
         <if test="request.startTime!=null and request.endTime!=null">
             and a.status_update_time >= #{request.startTime} and  a.status_update_time&lt;=#{request.endTime}
         </if>
-        order by c.sort asc,a.id desc
+        order by a.org_Id asc,a.id desc
     </select>
 <!--    <select id="pageLog" resultType="com.xunmei.core.resumption.vo.protection.ProtectionLogPageVo">-->
 <!--        select a.id, a.name as name,a.status as status,a.status_update_time,a.status_updator_name-->

soc-modules/soc-modules-core/src/main/resources/mapper/question/QuestionMapper.xml

@@ -309,7 +309,7 @@
                 concat('%',#{params.searchKey},'%'))
             </if>
         </if>
-        order by q.submit_time desc,o.sort desc ,q.id desc
+        order by q.submit_time desc,q.id desc
     </select>
     <select id="pageReform" resultType="com.xunmei.core.question.domain.Question">
         select * from core_question q
@@ -336,7 +336,7 @@
             and (q.question_desc like concat('%',#{params.searchKey},'%') or q.check_content like
             concat('%',#{params.searchKey},'%'))
         </if>
-        order by q.submit_time desc,o.sort desc ,q.id desc
+        order by q.submit_time desc,q.id desc
     </select>
     <select id="selectQuestionExceptionData"
             resultType="com.xunmei.common.core.domain.safetyindex.domain.CoreSafetyExceptionData">

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

@@ -113,7 +113,7 @@
                 where path like concat((select path from sys_org where id=#{info.orgId}),'%'))
             </if>
         </where>
-        order by a.plan_name DESC
+        order by a.plan_status asc, a.plan_name DESC,a.id desc
     </select>
     <!--    <select id="selectChildren" parameterType="com.xunmei.core.resumption.dto.plan.CoreResumptionPlanPageDto"-->
     <!--            resultMap="appPlans">-->

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

@@ -165,7 +165,7 @@
             <!--            </if>-->
 
         </where>
-        order by r.name desc ,o.sort asc,r.id desc
+        order by r.plan_start_time desc, r.name desc ,r.id desc
     </select>
     <select id="selectResumptionDataList"
             resultType="com.xunmei.core.resumption.vo.resumptionRecord.AppResumptionDataInfoVo">

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafecheckPlanMapper.xml

@@ -291,7 +291,7 @@
 
         ) tem
         GROUP BY tem.id,tem.create_time
-        order by tem.id desc
+        order by tem.plan_status asc, tem.plan_name DESC,tem.id desc
     </select>
     <select id="selectItemIdsByPlanId" resultType="java.lang.String">
         select distinct point_id as item_id

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/CoreSafetyTaskMapper.xml

@@ -197,7 +197,6 @@
         where id = #{id}
     </select>
     <select id="selectCoreSafetyTaskPage" resultType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">
-select  * from (
 SELECT t.id,
         t.title,
         o1.`short_name` as org_name,
@@ -237,7 +236,18 @@ SELECT t.id,
             and DATE_FORMAT(t.plan_start_time, '%Y-%m-%d') = DATE_FORMAT(#{task.planStartTime}, '%Y-%m-%d')
         </if>
         <if test="task.range !=null and task.range.size==2">
-            and t.plan_start_time>=#{task.range[0]} and t.plan_start_time &lt; #{task.range[1]}
+            and ((
+            #{task.range[0]}  &lt;= t.plan_start_time
+            and #{task.range[1]} >= t.plan_start_time
+            )
+            or (
+            #{task.range[0]}   &lt;= t.plan_end_time
+            and #{task.range[1]} >= t.plan_end_time
+            )
+            or (
+            #{task.range[0]} >= t.plan_start_time
+            and #{task.range[1]} &lt;=  t.plan_end_time
+            ))
         </if>
         <if test="task.status != null  and task.status != ''">
             and t.status =#{task.status}
@@ -260,7 +270,8 @@ SELECT t.id,
                 #{id}
             </foreach>
         </if>
-        ) temp group by temp.id
+        order by t.plan_start_time desc, t.title desc ,t.id desc
+
     </select>
 
     <insert id="insertCoreSafetyTask" parameterType="com.xunmei.core.safetyCheck.domain.CoreSafetyTask">

soc-modules/soc-modules-core/src/main/resources/mapper/safetycheck/SafetyCheckRuleMapper.xml

@@ -39,7 +39,7 @@
                 </if>
             </if>
         </where>
-        order by a.id desc
+        order by a.status asc,a.name desc, a.id desc
     </select>
 
     <select id="getRuleGroupList" resultType="com.xunmei.core.safetyCheck.vo.rule.SafetyCheckRuleGroupVo">