app排序功能

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

@@ -426,7 +426,7 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
 
     private List<PanelListVo> selectCurUserTaskList(PanelListDto panelListDto, Long confirmButton, Long dissentButton, Long reformButton) {
         LambdaQueryWrapper<Question> wrapper = generateCurUserTaskWrapper(panelListDto, confirmButton, dissentButton, reformButton);
-
+        wrapper.orderByAsc(Question::getConfirmStatus);
         if (wrapper.isEmptyOfWhere()) {
             return new ArrayList<>();
         } else {

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

@@ -42,10 +42,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
@@ -65,6 +62,7 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
     private CoreSafetyExceptionDataMapper exceptionDataMapper;
     @Autowired
     private CoreSafeMonthScoreMapper safeMonthScoreMapper;
+
     @Override
     public List<Map<String, Object>> findDayTaskList(int year, int quarter, String dateTime, Long roleId, Long orgid) {
         return resumptionMapper.findDayTaskList(year, quarter, dateTime, roleId, orgid);
@@ -116,12 +114,32 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
 
     @Override
     public List<ResumptionAppVo> findResumptionApp(ResumptionTaskNewDto res) {
-        if(ObjectUtil.isNotNull(res.getDateTime())){
+        if (ObjectUtil.isNotNull(res.getDateTime())) {
             res.setStartTime(DateUtil.endOfDay(res.getDateTime()));
             res.setEndTime(DateUtil.beginOfDay(res.getDateTime()));
         }
 
-        return resumptionMapper.findResumptionApp(res);
+        List<ResumptionAppVo> data = resumptionMapper.findResumptionApp(res);
+        data.sort(new Comparator<ResumptionAppVo>() {
+            @Override
+            public int compare(ResumptionAppVo o1, ResumptionAppVo o2) {
+                Integer o1Status = o1.getStatus();
+                Integer o2Status = o2.getStatus();
+                if (ObjectUtil.equal(o1Status, 1)) {
+                    o1Status = -1;
+                }
+                if (ObjectUtil.equal(o2Status, 1)) {
+                    o2Status = -1;
+                }
+                if (ObjectUtil.equal(o1Status, o2Status)) {
+                    return o1.getPlanEndTime().compareTo(o2.getPlanEndTime());
+                } else {
+                    return -o1Status.compareTo(o2Status);
+                }
+            }
+        });
+
+        return data;
     }
 
     @Override
@@ -211,7 +229,25 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
         list.forEach(item -> {
             item.setType(PanelTypeEnums.RESUMPTION.getCode());
         });
+        list.sort(new Comparator<PanelListVo>() {
+            @Override
+            public int compare(PanelListVo o1, PanelListVo o2) {
+                Integer o1Status = o1.getStatus();
+                Integer o2Status = o2.getStatus();
+                if (ObjectUtil.equal(o1Status, 1)) {
+                    o1Status = -1;
+                }
+                if (ObjectUtil.equal(o2Status, 1)) {
+                    o2Status = -1;
+                }
 
+                if (ObjectUtil.equal(o1Status, o2Status)) {
+                    return o1.getEndTime().compareTo(o2.getEndTime());
+                } else {
+                    return -o1Status.compareTo(o2Status);
+                }
+            }
+        });
         return list;
     }
 
@@ -328,15 +364,15 @@ public class ResumptionServiceImpl extends ServiceImpl<ResumptionMapper, Resumpt
 //    }
 
     @Override
-    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
-    public void findResumptionList(List<Long> orgIds,DateTime time) {
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    public void findResumptionList(List<Long> orgIds, DateTime time) {
         SysRole role = roleService.getRoleByName("网点安全员", SecurityConstants.INNER);
-         //baseMapper.findResumptionExceptionList(time.year(), time.quarter(), time.month() + 1, role.getId());
-         baseMapper.saveResumptionExceptionList(time.year(), time.quarter(), time.month() + 1, role.getId(),orgIds);
+        //baseMapper.findResumptionExceptionList(time.year(), time.quarter(), time.month() + 1, role.getId());
+        baseMapper.saveResumptionExceptionList(time.year(), time.quarter(), time.month() + 1, role.getId(), orgIds);
     }
 
     @Override
-    public List<SafeScoreResumptionDataVo>  findSource(SafeScoreSourceDto request) {
+    public List<SafeScoreResumptionDataVo> findSource(SafeScoreSourceDto request) {
 
 
         List<CoreSafetyExceptionData> exceptionDataList = exceptionDataMapper.selectList(new LambdaQueryWrapper<CoreSafetyExceptionData>()

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

@@ -20,6 +20,7 @@ import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.vo.IdNameVo;
 import com.xunmei.common.security.utils.DictUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.core.resumption.vo.ResumptionAppVo;
 import com.xunmei.core.safetyCheck.domain.CoreSafetyTask;
 import com.xunmei.core.safetyCheck.enums.SafetyTaskSourceType;
 import com.xunmei.core.safetyCheck.mapper.CoreSafecheckPlanToRoleMapper;
@@ -83,9 +84,9 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
         if (coreSafetyTask.getParams().get("beginTime") != null && coreSafetyTask.getParams().get("endTime") != null) {
             query.between("create_time", coreSafetyTask.getParams().get("beginTime"), coreSafetyTask.getParams().get("endTime"));
         }
-        if(CollectionUtil.isNotEmpty(coreSafetyTask.getRange()) && coreSafetyTask.getRange().size()==2 ){
-            coreSafetyTask.getRange().set(0,DateUtil.beginOfDay(coreSafetyTask.getRange().get(0)));
-            coreSafetyTask.getRange().set(1,DateUtil.endOfDay(coreSafetyTask.getRange().get(1)));
+        if (CollectionUtil.isNotEmpty(coreSafetyTask.getRange()) && coreSafetyTask.getRange().size() == 2) {
+            coreSafetyTask.getRange().set(0, DateUtil.beginOfDay(coreSafetyTask.getRange().get(0)));
+            coreSafetyTask.getRange().set(1, DateUtil.endOfDay(coreSafetyTask.getRange().get(1)));
         }
         coreSafetyTask.setGrantUserId(SecurityUtils.getUserId());
         //获取数据
@@ -107,7 +108,7 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
                     List<SafetyPlanRoleVo> roles = planRoles.stream().filter(pr -> ObjectUtil.equal(r.getPlanId(), pr.getPlanId())).collect(Collectors.toList());
 //                    if (coreSafetyTask.getRoleId() != null) {
 //                        roles = roles.stream().filter(e -> e.getRoleId().equals(coreSafetyTask.getRoleId())).collect(Collectors.toList());
-                        r.setRoles(roles);
+                    r.setRoles(roles);
 //                    } else {
 //                        r.setRoles(roles);
 //                    }
@@ -218,7 +219,7 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
         return WebPanelResult
                 .builder()
                 .status(1)
-                .statusText(DictUtils.getDictLabel(DictConstants.SAFETY_CHECK_STATUS,1))
+                .statusText(DictUtils.getDictLabel(DictConstants.SAFETY_CHECK_STATUS, 1))
                 .taskType(PanelTypeEnums.SAFETY_CHECK.ordinal())
                 .taskTypeText(PanelTypeEnums.SAFETY_CHECK.getName())
                 .nums(taskList.size()).build();
@@ -231,6 +232,25 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
         list.forEach(item -> {
             item.setType(PanelTypeEnums.SAFETY_CHECK.getCode());
         });
+        list.sort(new Comparator<PanelListVo>() {
+            @Override
+            public int compare(PanelListVo o1, PanelListVo o2) {
+                Integer o1Status = o1.getStatus();
+                Integer o2Status = o2.getStatus();
+                if (ObjectUtil.equal(o1Status, 1)) {
+                    o1Status = -1;
+                }
+                if (ObjectUtil.equal(o2Status, 1)) {
+                    o2Status = -1;
+                }
+
+                if (ObjectUtil.equal(o1Status, o2Status)) {
+                    return o1.getStartTime().compareTo(o2.getStartTime());
+                } else {
+                    return -o1Status.compareTo(o2Status);
+                }
+            }
+        });
         return list;
     }
 
@@ -241,9 +261,9 @@ public class CoreSafetyTaskServiceImpl extends ServiceImpl<CoreSafetyTaskMapper,
 
     @Override
     public List<CoreSafetyTaskExport> down(CoreSafetyTask coreSafetyTask) {
-        if(CollectionUtil.isNotEmpty(coreSafetyTask.getRange()) && coreSafetyTask.getRange().size()==2 ){
-            coreSafetyTask.getRange().set(0,DateUtil.beginOfDay(coreSafetyTask.getRange().get(0)));
-            coreSafetyTask.getRange().set(1,DateUtil.endOfDay(coreSafetyTask.getRange().get(1)));
+        if (CollectionUtil.isNotEmpty(coreSafetyTask.getRange()) && coreSafetyTask.getRange().size() == 2) {
+            coreSafetyTask.getRange().set(0, DateUtil.beginOfDay(coreSafetyTask.getRange().get(0)));
+            coreSafetyTask.getRange().set(1, DateUtil.endOfDay(coreSafetyTask.getRange().get(1)));
         }
         coreSafetyTask.setGrantUserId(SecurityUtils.getUserId());
         return coreSafetyTaskMapper.down(coreSafetyTask);

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

@@ -3,6 +3,7 @@ package com.xunmei.core.safetyCheck.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -40,6 +41,7 @@ import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.api.model.LoginUser;
+import io.reactivex.rxjava3.core.Completable;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -145,6 +147,19 @@ public class SafetyCheckRegisterSericeImpl extends ServiceImpl<CoreSafetyTaskMap
             vo.setInRegisterTime(getInRegisterTime(vo.getPlanStartTime(), vo.getPlanEndTime()));
         });
 
+        page.getRecords().sort(new Comparator<AppPageVo>() {
+            @Override
+            public int compare(AppPageVo o1, AppPageVo o2) {
+                int o1Uncount = o1.getUncompleted().size();
+                int o2Uncount = o2.getUncompleted().size();
+
+                if (o1Uncount == o2Uncount) {
+                    return o1.getPlanStartTime().compareTo(o2.getPlanStartTime());
+                } else {
+                    return -NumberUtil.compare(o1Uncount, o2Uncount);
+                }
+            }
+        });
         return TableDataInfo.success(page);
     }
 

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 a.org_Id asc,a.id desc
+        order by a.org_Id asc,a.name,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/resumption/ResumptionMapper.xml

@@ -264,7 +264,6 @@
             </foreach>
         </if>
         )
-
         and t.status in (1, 2)
         and ((
         #{request.startTime}   <![CDATA[<=]]> t.plan_start_time
@@ -278,6 +277,7 @@
         #{request.startTime} >= t.plan_start_time
         and #{request.endTime}  <![CDATA[<=]]> t.plan_end_time
         ))
+        order by t.status asc,t.plan_end_time desc,t.id desc
     </select>
 
     <select id="findResumptionExceptionList"

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

@@ -891,6 +891,7 @@ SELECT t.id,
         #{request.startTime} >= t.plan_start_time
         and #{request.endTime}  <![CDATA[<=]]>  t.plan_end_time
         ))
+        order by t.status asc,t.plan_end_time desc,t.id desc
     </select>
     <select id="down" resultType="com.xunmei.core.safetyCheck.vo.CoreSafetyTaskExport">
         SELECT