【CHG】默认排序

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbBlqController.java

@@ -2,15 +2,11 @@ package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbBlq;
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
-import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.service.IBusJcbBlqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
-import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.common.enums.PostTypeEnum;
 import com.railway.common.utils.DateUtils;
-import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
@@ -83,15 +79,6 @@ public class BusJcbBlqController extends BaseController {
     @GetMapping(value = "list")
     public TableDataInfo getList(BusJcbBlq busJcbBlq) {
         startPage();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        String post = user.getPost();
-        PostTypeEnum postType = PostTypeEnum.ofValue(post);
-        if(postType == PostTypeEnum.LEADER){
-            busJcbBlq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-            busJcbBlq.setDeptId(user.getDeptId());
-        }else {
-            busJcbBlq.setCreateBy(user.getUserName());
-        }
         List<BusJcbBlq> list = busJcbBlqService.getList(busJcbBlq);
         return getDataTable(list);
     }

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbDmcgyqController.java

@@ -1,14 +1,10 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbDmcgyq;
-import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.service.IBusJcbDmcgyqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
-import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.common.enums.PostTypeEnum;
-import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
@@ -78,15 +74,6 @@ public class BusJcbDmcgyqController extends BaseController {
     @GetMapping(value = "/list")
     public TableDataInfo getList(BusJcbDmcgyq busJcbDmcgyq) {
         startPage();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        String post = user.getPost();
-        PostTypeEnum postType = PostTypeEnum.ofValue(post);
-        if(postType == PostTypeEnum.LEADER){
-            busJcbDmcgyq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-            busJcbDmcgyq.setDeptId(user.getDeptId());
-        }else {
-            busJcbDmcgyq.setCreateBy(user.getUserName());
-        }
         List<BusJcbDmcgyq> list = busJcbDmcgyqService.getList(busJcbDmcgyq);
         return getDataTable(list);
     }

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbFdfxjyqController.java

@@ -1,15 +1,11 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbFdfxjyq;
-import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.service.IBusJcbFdfxjyqService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
-import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.common.enums.PostTypeEnum;
 import com.railway.common.utils.DateUtils;
-import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.file.BASE64DecodedMultipartFile;
 import com.railway.common.utils.http.HttpUtils;
@@ -98,15 +94,6 @@ public class BusJcbFdfxjyqController extends BaseController {
     @GetMapping(value = "list")
     public TableDataInfo getList(BusJcbFdfxjyq busJcbFdfxjyq) {
         startPage();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        String post = user.getPost();
-        PostTypeEnum postType = PostTypeEnum.ofValue(post);
-        if(postType == PostTypeEnum.LEADER){
-            busJcbFdfxjyq.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-            busJcbFdfxjyq.setDeptId(user.getDeptId());
-        }else {
-            busJcbFdfxjyq.setCreateBy(user.getUserName());
-        }
         List<BusJcbFdfxjyq> list = busJcbFdfxjyqService.getList(busJcbFdfxjyq);
         return getDataTable(list);
     }

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbGlkgController.java

@@ -1,15 +1,11 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbGlkg;
-import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.service.IBusJcbGlkgService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
-import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.common.enums.PostTypeEnum;
 import com.railway.common.utils.DateUtils;
-import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
@@ -100,15 +96,6 @@ public class BusJcbGlkgController extends BaseController {
     @GetMapping(value = "list")
     public TableDataInfo getList(BusJcbGlkg busJcbGlkg) {
         startPage();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        String post = user.getPost();
-        PostTypeEnum postType = PostTypeEnum.ofValue(post);
-        if(postType == PostTypeEnum.LEADER){
-            busJcbGlkg.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-            busJcbGlkg.setDeptId(user.getDeptId());
-        }else {
-            busJcbGlkg.setCreateBy(user.getUserName());
-        }
         List<BusJcbGlkg> list = busJcbGlkgService.getList(busJcbGlkg);
         return getDataTable(list);
     }

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbJcxcController.java

@@ -1,14 +1,10 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbJcxc;
-import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.service.IBusJcbJcxcService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
-import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.common.enums.PostTypeEnum;
-import com.railway.common.utils.SecurityUtils;
 import com.railway.common.utils.StringUtils;
 import com.railway.common.utils.poi.WordUtils;
 import com.railway.system.service.ISysFileService;
@@ -79,15 +75,6 @@ public class BusJcbJcxcController extends BaseController {
     @GetMapping(value = "list")
     public TableDataInfo getList(BusJcbJcxc busJcbJcxc) {
         startPage();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        String post = user.getPost();
-        PostTypeEnum postType = PostTypeEnum.ofValue(post);
-        if(postType == PostTypeEnum.LEADER){
-            busJcbJcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-            busJcbJcxc.setDeptId(user.getDeptId());
-        }else {
-            busJcbJcxc.setCreateBy(user.getUserName());
-        }
         List<BusJcbJcxc> list = busJcbJcxcService.getList(busJcbJcxc);
         return getDataTable(list);
     }

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcbWjcxcController.java

@@ -1,14 +1,10 @@
 package com.railway.web.controller.business.catenary;
 
 import com.railway.business.catenary.domain.BusJcbWjcxc;
-import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.service.IBusJcbWjcxcService;
 import com.railway.common.core.controller.BaseController;
 import com.railway.common.core.domain.AjaxResult;
-import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
-import com.railway.common.enums.PostTypeEnum;
-import com.railway.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.List;
@@ -69,15 +65,6 @@ public class BusJcbWjcxcController extends BaseController {
     @GetMapping(value = "list")
     public TableDataInfo getList(BusJcbWjcxc busJcbWjcxc) {
         startPage();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        String post = user.getPost();
-        PostTypeEnum postType = PostTypeEnum.ofValue(post);
-        if(postType == PostTypeEnum.LEADER){
-            busJcbWjcxc.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-            busJcbWjcxc.setDeptId(user.getDeptId());
-        }else {
-            busJcbWjcxc.setCreateBy(user.getUserName());
-        }
         List<BusJcbWjcxc> list = busJcbWjcxcService.getList(busJcbWjcxc);
         return getDataTable(list);
     }

railway-business/src/main/java/com/railway/business/catenary/domain/BusJceb.java

@@ -65,4 +65,10 @@ public class BusJceb extends BaseEntity{
     @Length(min = 1, max = 1, message = "【del_flag】长度必须介于 {min} 和 {max} 之间")
     private String delFlag;
 
+    @ApiModelProperty(value = "要排序的列")
+    private String orderBy;
+
+    @ApiModelProperty(value = "1-ASC 正序排序，0-DESC 倒序排序")
+    private String isAsc;
+
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcabServiceImpl.java

@@ -40,6 +40,11 @@ public abstract class BusJcabServiceImpl {
     }else {
       jcab.setCreateBy(user.getUserName());
     }
+    if(StringUtils.isEmpty(jcab.getOrderBy())){
+      // 默认倒序排列
+      jcab.setOrderBy("operation_date");
+      jcab.setIsAsc("0");
+    }
   }
 
   /**

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -84,6 +84,11 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 		}else {
 			jceb.setCreateBy(user.getUserName());
 		}
+		if(StringUtils.isEmpty(jceb.getOrderBy())){
+			// 默认倒序排列
+			jceb.setOrderBy("check_date");
+			jceb.setIsAsc("0");
+		}
 	}
 
 	/**

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -355,6 +355,17 @@
         and t.update_time=#{updateTime}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">

railway-business/src/main/resources/mapper/catenary/BusJcebJddzMapper.xml

@@ -273,6 +273,17 @@
         and t.del_flag=#{delFlag}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">

railway-business/src/main/resources/mapper/catenary/BusJcebJyzqsjlMapper.xml

@@ -242,6 +242,17 @@
         and t.update_time=#{updateTime}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">

railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml

@@ -279,7 +279,17 @@
         and a.update_time=#{updateTime}
       </if>
     </where>
-    order by a.operation_date desc
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">

railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml

@@ -319,7 +319,17 @@
         and t.update_time=#{updateTime}
       </if>
     </where>
-    order by str_to_date(t.operation_date,'%Y-%m-%d') desc
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">

railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

@@ -303,6 +303,17 @@
         and t.del_flag=#{delFlag}
       </if>
     </where>
+    <if test="orderBy!=null and orderBy!=''">
+      order by t.${orderBy}
+    </if>
+    <if test="isAsc!=null and isAsc!=''">
+      <if test="isAsc == '1'.toString()">
+        asc
+      </if>
+      <if test="isAsc == '0'.toString()">
+        desc
+      </if>
+    </if>
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">