Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java

 package com.mortals.xhx.module.check.web;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
 import com.mortals.framework.model.Context;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.module.check.model.CheckAttendRecordEntity;
 import com.mortals.xhx.module.check.service.CheckAttendRecordService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import com.alibaba.fastjson.JSONObject;
+
 import java.util.Arrays;
+
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+
 import static com.mortals.framework.ap.SysConstains.*;
+
 /**
-*
-* 考勤绩效记录核查信息
-*
-* @author zxfei
-* @date 2023-07-10
-*/
+ * 考勤绩效记录核查信息
+ *
+ * @author zxfei
+ * @date 2023-07-10
+ */
 @RestController
 @RequestMapping("check/attend/record")
-public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingController<CheckAttendRecordService,CheckAttendRecordEntity,Long> {
+public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingController<CheckAttendRecordService, CheckAttendRecordEntity, Long> {
 
     @Autowired
     private ParamService paramService;
 
-    public CheckAttendRecordController(){
-        super.setModuleDesc( "考勤绩效记录核查信息");
+    public CheckAttendRecordController() {
+        super.setModuleDesc("考勤绩效记录核查信息");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckAttendRecord","subAddType"));
-        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckAttendRecord","checkStatus"));
-        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckAttendRecord","subMethod"));
+        this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("CheckAttendRecord", "subAddType"));
+        this.addDict(model, "checkStatus", paramService.getParamBySecondOrganize("CheckAttendRecord", "checkStatus"));
+        this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("CheckAttendRecord", "subMethod"));
         super.init(model, context);
     }
 
+
+    @Override
+    protected void doListBefore(CheckAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+        super.doListBefore(query, model, context);
+    }
+
     /**
      * 审核
+     *
      * @param entity
      * @return
      */

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +51,16 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckComplainRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +52,16 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +51,16 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +52,16 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java

 package com.mortals.xhx.module.check.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -50,6 +53,16 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(CheckReviewRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 审核
      * @param entity

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendAppealController.java

@@ -2,12 +2,14 @@ package com.mortals.xhx.module.perform.web;
 
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.common.code.EnabledEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +68,16 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         super.init(model, context);
     }
 
+
+    @Override
+    protected void doListBefore(PerformAttendAppealEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
+
     /**
      * 申诉统计
      */

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformAttendRecordController.java

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -48,5 +51,13 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformAttendRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        super.doListBefore(query, model, context);
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformEffectRecordController.java

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -49,5 +52,12 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformEffectRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformGoworkRecordController.java

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -48,5 +51,12 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformGoworkRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformOtherRecordController.java

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -49,5 +52,12 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformOtherRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformReviewRecordController.java

 package com.mortals.xhx.module.perform.web;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
@@ -50,5 +53,12 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
         super.init(model, context);
     }
 
-
+    @Override
+    protected void doListBefore(PerformReviewRecordEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (ObjectUtils.isEmpty(query.getOrderColList())) {
+            query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
+        } else {
+            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+        }
+    }
 }
\ No newline at end of file