修改考勤汇总

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

 package com.mortals.xhx.module.check.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -80,6 +81,11 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

 package com.mortals.xhx.module.check.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -91,6 +92,11 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

 package com.mortals.xhx.module.check.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -79,6 +80,11 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
+
     }
 
     /**

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

 package com.mortals.xhx.module.check.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -79,6 +80,11 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

 package com.mortals.xhx.module.check.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -92,6 +93,11 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendAppealVo.java

@@ -26,4 +26,10 @@ public class PerformAttendAppealVo extends BaseEntityLong {
 
     private String performTypeStr;
 
+    /** 开始 创建时间 */
+    private String createTimeStart;
+
+    /** 结束 创建时间 */
+    private String createTimeEnd;
+
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformAttendRecordVo.java

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformAttendRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformComplainRecordVo.java

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformComplainRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformEffectRecordVo.java

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformEffectRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformGoworkRecordVo.java

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformGoworkRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformOtherRecordVo.java

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformOtherRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/model/vo/PerformReviewRecordVo.java

@@ -15,5 +15,9 @@ import java.util.Date;
 */
 @Data
 public class PerformReviewRecordVo extends BaseEntityLong {
+    /** 开始 创建时间 */
+    private String createTimeStart;
 
+    /** 结束 创建时间 */
+    private String createTimeEnd;
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
 
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
@@ -95,6 +96,10 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 
     /**

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

 package com.mortals.xhx.module.perform.web;
+import cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -77,5 +78,10 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file

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

 package com.mortals.xhx.module.perform.web;
 
+import cn.hutool.core.date.DateUtil;
+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.base.system.user.model.UserQuery;
@@ -8,12 +11,14 @@ import com.mortals.xhx.common.code.*;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
 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 com.mortals.framework.model.Context;
 import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -58,5 +63,18 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
         super.init(model, context);
     }
 
+    @Override
+    protected void doListBefore(PerformComplainRecordEntity 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));
+        }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
 
+    }
 }
\ 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 cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -76,5 +77,10 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ 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 cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -76,5 +77,10 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ 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 cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -77,5 +78,10 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ 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 cn.hutool.core.date.DateUtil;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.OrderCol;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -79,5 +80,11 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
         } else {
             query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
         }
+
+
+        if(!ObjectUtils.isEmpty(query.getCreateTime())){
+            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
+            query.setCreateTimeEnd(DateUtil.formatDateTime(query.getCreateTime()));
+        }
     }
 }
\ No newline at end of file