APP端隐患问题待办 已逾期状态显示为已逾期

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

@@ -431,7 +431,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);
+        wrapper.orderByAsc(Question::getConfirmStatus).orderByDesc(Question::getReformDeadline);
         if (wrapper.isEmptyOfWhere()) {
             return new ArrayList<>();
         } else {
@@ -453,7 +453,13 @@ public class QuestionServiceImpl extends ServiceImpl<QuestionMapper, Question> i
                 if (ObjectUtil.isNull(item.getReformStatus())) {
                     vo.setStatus(item.getConfirmStatus());
                 } else {
-                    vo.setStatus(item.getReformStatus());
+                    if (ObjectUtil.equal(item.getReformStatus(), QuestionReformEnum.Unreform.getValue())
+                            && item.getReformDeadline().before(DateUtil.beginOfDay(new Date()))) {
+                        //任务已逾期
+                        vo.setStatus(QuestionReformEnum.OverReformed.getValue());
+                    }else{
+                        vo.setStatus(item.getReformStatus());
+                    }
                 }
 
                 return vo;