一部分修改提交

onemap-common/onemap-common-core/src/main/java/com/onemap/common/core/web/page/RecordTableSupport.java

@@ -5,11 +5,10 @@ import com.onemap.common.core.utils.ServletUtils;
 
 /**
  * 表格数据处理(row、record格式)
- * 
+ *
  * @author onemap
  */
-public class RecordTableSupport
-{
+public class RecordTableSupport {
     /**
      * 当前记录起始索引
      */
@@ -38,19 +37,27 @@ public class RecordTableSupport
     /**
      * 封装分页对象
      */
-    public static PageDomain getPageDomain()
-    {
+    public static PageDomain getPageDomain() {
         PageDomain pageDomain = new PageDomain();
-        pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
-        pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
+        if (ServletUtils.getParameter("current") != null) {
+            pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter("current"), 1));
+        } else {
+            pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
+        }
+        if (ServletUtils.getParameter("size") != null) {
+            pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter("size"), 10));
+        } else {
+            pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
+        }
+//        pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1));
+//        pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10));
         pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN));
         pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC));
         pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE));
         return pageDomain;
     }
 
-    public static PageDomain buildPageRequest()
-    {
+    public static PageDomain buildPageRequest() {
         return getPageDomain();
     }
 }

onemap-modules/onemap-api/src/main/java/com/onemap/api/OneMapApiApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import com.onemap.common.security.annotation.EnableCustomConfig;
 import com.onemap.common.security.annotation.EnableRyFeignClients;
 import com.onemap.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * 公共接口
@@ -15,6 +16,7 @@ import com.onemap.common.swagger.annotation.EnableCustomSwagger2;
 @EnableCustomSwagger2
 @EnableRyFeignClients
 @SpringBootApplication
+@EnableScheduling
 public class OneMapApiApplication {
     public static void main(String[] args) {
         SpringApplication.run(OneMapApiApplication.class, args);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/controller/cggl/CgglController.java

@@ -434,14 +434,14 @@ public class CgglController extends BaseController {
     /**
      * 查询旗县修编列表
      *
-     * @param limit
-     * @param page
+     * @param size
+     * @param current
      * @param subject
      * @param divisionCode
      * @return
      */
     @GetMapping("/xblist")
-    public RecordTableDataInfo xblist(Integer limit, Integer page, String subject, String divisionCode, String id, String instid) {
+    public RecordTableDataInfo xblist(Integer size, Integer current, String subject, String divisionCode, String id, String instid) {
         startRecordPage();
         List<TCgglRevise> list = cgglService.xblist(subject, divisionCode, id, instid);
         return getRecordDataTable(list);

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/cggl/CgglServiceImpl.java

@@ -1027,6 +1027,7 @@ public class CgglServiceImpl implements CgglService {
         if (StringUtils.isNotEmpty(instid)) {
             wrapper.eq("instid", instid);
         }
+        wrapper.orderByDesc("uploadtime");
         List<TCgglRevise> res = tCgglReviseMapper.selectList(wrapper);
         return res;
     }