排序

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionAreaController.java

@@ -5,8 +5,6 @@ import com.usky.common.core.bean.ApiResult;
 import com.usky.fire.domain.PatrolInspectionArea;
 import com.usky.fire.service.PatrolInspectionAreaService;
 import com.usky.fire.service.vo.PatrolInspectionAreaVo;
-import com.usky.fire.controller.web.BaseController;
-import com.usky.fire.controller.web.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -72,9 +70,9 @@ public class PatrolInspectionAreaController {
      */
     @GetMapping("patrolInspectionAreaList")
     public ApiResult<List<PatrolInspectionArea>> patrolInspectionAreaList(@RequestParam(value = "areaName", required = false) String areaName,
-                                                             @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
-                                                             @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
-                                                             @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
+                                                                          @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                          @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize,
+                                                                          @RequestParam(value = "id", required = false, defaultValue = "0") Integer id) {
         return ApiResult.success(patrolInspectionAreaService.patrolInspectionAreaList(id, areaName, pageNum, pageSize));
     }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionSiteController.java

@@ -100,9 +100,10 @@ public class PatrolInspectionSiteController {
 
     /**
      * 巡查自检-巡检地点-分配内容-列表查询
-     * @param pageNum 当前页
+     *
+     * @param pageNum  当前页
      * @param pageSize 每页条数
-     * @param siteId 巡检地点ID
+     * @param siteId   巡检地点ID
      * @return
      */
     @GetMapping("siteContentList")
@@ -117,6 +118,7 @@ public class PatrolInspectionSiteController {
 
     /**
      * 巡查自检-巡检地点-分配内容-保存
+     *
      * @param siteContentList
      * @return
      */

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionContentServiceImpl.java

@@ -7,6 +7,7 @@ import com.usky.common.core.exception.BusinessException;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.ContentOption;
+import com.usky.fire.domain.PatrolInspectionArea;
 import com.usky.fire.domain.PatrolInspectionContent;
 import com.usky.fire.domain.SiteContent;
 import com.usky.fire.mapper.PatrolInspectionContentMapper;
@@ -145,6 +146,7 @@ public class PatrolInspectionContentServiceImpl extends AbstractCrudService<Patr
         if (id != 0 && id != null) {
             queryWrapper.eq(PatrolInspectionContent::getId, id);
         }
+        queryWrapper.orderByDesc(PatrolInspectionContent::getId);
         List<PatrolInspectionContent> patrolInspectionContentList = this.list(queryWrapper);
         List<PatrolInspectionContentVo> list = new ArrayList<>();
         List<PatrolInspectionContentVo> patrolInspectionContentVoList = new ArrayList<>();

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanServiceImpl.java

@@ -479,6 +479,7 @@ public class PatrolInspectionPlanServiceImpl extends AbstractCrudService<PatrolI
         if (areaId != null && areaId != 0) {
             queryWrapper.eq(PatrolInspectionPlan::getAreaId, areaId);
         }
+        queryWrapper.orderByDesc(PatrolInspectionPlan::getId);
         List<PatrolInspectionPlan> patrolInspectionPlanSonList = this.list(queryWrapper);
         List<PlanSchedule> planScheduleList = planScheduleService.list();
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionSiteServiceImpl.java

@@ -6,6 +6,7 @@ import com.usky.common.core.bean.CommonPage;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.PatrolInspectionArea;
+import com.usky.fire.domain.PatrolInspectionContent;
 import com.usky.fire.domain.PatrolInspectionSite;
 import com.usky.fire.domain.SiteContent;
 import com.usky.fire.mapper.PatrolInspectionSiteMapper;
@@ -102,6 +103,7 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
         if (siteName != null && !"".equals(siteName)) {
             queryWrapper.like(PatrolInspectionSite::getSiteName, siteName);
         }
+        queryWrapper.orderByDesc(PatrolInspectionSite::getId);
         List<PatrolInspectionSite> patrolInspectionSiteList = this.list(queryWrapper);
         List<PatrolInspectionSite> list = patrolInspectionSiteList.stream().skip((pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
         return new CommonPage<>(list, patrolInspectionSiteList.size(), pageNum, pageSize);
@@ -153,15 +155,16 @@ public class PatrolInspectionSiteServiceImpl extends AbstractCrudService<PatrolI
 
     /**
      * 根据巡检地点ID查询巡检内容ID
+     *
      * @param siteId 巡检地点ID
      * @return
      */
-    public Integer[] siteContentList(Integer siteId){
+    public Integer[] siteContentList(Integer siteId) {
         LambdaQueryWrapper<SiteContent> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(SiteContent::getSiteId, siteId);
         List<SiteContent> siteContenList = siteContentService.list(queryWrapper);
         Integer[] contenIdList = new Integer[siteContenList.size()];
-        if (siteContenList.size()>0){
+        if (siteContenList.size() > 0) {
             for (int i = 0; i < siteContenList.size(); i++) {
                 contenIdList[i] = siteContenList.get(i).getContentId();
             }