Browse Source

修改小程序临时人员展示接口

liu 1 year ago
parent
commit
60c065c14a

+ 7 - 3
src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -361,7 +361,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
             }else {
                 LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
                 wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
-                        .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
+                        .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
+                        .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
+
                 pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
                 return CommonResult.ok(pageList);
             }
@@ -382,14 +384,16 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
                 wrapper.eq(ApplicationProcedureTemporary::getStatus,status);
             }
 
-            wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
+            wrapper.between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
+                    .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
             pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
             return CommonResult.ok(pageList);
 
         }
         LambdaQueryWrapper<ApplicationProcedureTemporary> wrapper=new LambdaQueryWrapper<>();
         wrapper.eq(ObjectUtils.isNotEmpty(status),ApplicationProcedureTemporary::getStatus,status)
-                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime);
+                .between(ObjectUtils.isNotEmpty(startTime)&&ObjectUtils.isNotEmpty(endTime),ApplicationProcedureTemporary::getSubmissionTime,startTime,endTime)
+                .orderByDesc(ApplicationProcedureTemporary::getSubmissionTime);
         pageList=applicationProcedureTemporaryService.page(new Page<>(page,size),wrapper);
         return CommonResult.ok(pageList);
 

+ 1 - 0
src/main/java/com/template/model/vo/HouseStateVo.java

@@ -42,4 +42,5 @@ public class HouseStateVo {
     private String element;
     private Integer lockStatus;
     private String passWord;
+    private Integer orderStatus;
 }

+ 2 - 1
src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -21,7 +21,8 @@
         b.building,
         b.element,
         ho.key_type as lockStatus,
-        ho.key_pass_word as passWord
+        ho.key_pass_word as passWord,
+        ho.order_status as orderStatus
         FROM
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id