Browse Source

fix:排序修改

ly 10 months ago
parent
commit
de5595bd3a

+ 11 - 0
src/main/java/cn/ezhizao/common/utils/PageUtils.java

@@ -24,6 +24,17 @@ public class PageUtils extends PageHelper
         Boolean reasonable = pageDomain.getReasonable();
         PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
     }
+    /**
+     * 设置请求分页数据
+     */
+    public static void OnceStartPage()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        Integer pageNum = pageDomain.getPageNum();
+        Integer pageSize = pageDomain.getPageSize();
+        Boolean reasonable = pageDomain.getReasonable();
+        PageHelper.startPage(pageNum, pageSize).setReasonable(reasonable);
+    }
 
     /**
      * 清理分页的线程变量

+ 2 - 3
src/main/java/cn/ezhizao/project/business/workOrder/controller/OnceWorkOrderProductionController.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.workOrder.controller;
 
 import cn.ezhizao.common.utils.DateUtils;
+import cn.ezhizao.common.utils.PageUtils;
 import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.StringUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
@@ -68,8 +69,7 @@ public class OnceWorkOrderProductionController extends BaseController {
     @ResponseBody
     public TableDataInfo getList(BizWorkOrder conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);
-        startPage();
-        startOrderBy();
+        PageUtils.OnceStartPage();
         List<BizWorkOrder> list = workOrderService.getList(conditions);
         list.forEach(v -> {
             Integer style = v.getAddressStyle();
@@ -106,7 +106,6 @@ public class OnceWorkOrderProductionController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizWorkOrder conditions) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(conditions);
-        startOrderBy();
         List<BizWorkOrder> list = workOrderService.getList(conditions);
         for (BizWorkOrder l : list) {
             l.setProjectType((l.getNoContract() == 1 ? l.getRemark() : "") + l.getTaskTypeName() + (l.getTaskTypeDetailName() != null ? "-" + l.getTaskTypeDetailName() : ""));

+ 1 - 0
src/main/resources/mybatis/business/BizWorkOrderMapper.xml

@@ -121,6 +121,7 @@
             </if>
             <if test="companyName != null">AND t2.name like concat('%', #{companyName}, '%')</if>
         </trim>
+        order by t2.name desc,t1.create_time desc
     </select>
 
     <delete id="physicalDelete">