绩效管理查询列表时间条件修改

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

@@ -13,10 +13,11 @@ import java.util.Date;
 @Data
 public class PerformAttendAppealVo extends BaseEntityLong {
 
-    /**
-     * 时间
-     */
+    /** 开始 申诉时间 */
     private String appealTimeStart;
+
+    /** 结束 申诉时间 */
+    private String appealTimeEnd;
     /**
      * 统计类型(1.申诉次数部门排名,2.申诉次数个人排名,3.申诉次数规则排名)
      */

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

@@ -35,6 +35,7 @@ import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
 import org.apache.commons.lang3.ArrayUtils;
 import com.mortals.framework.util.StringUtils;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -100,13 +101,15 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
     @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)));
+            query.setOrderColList(Arrays.asList(new OrderCol("appealTime", OrderCol.DESCENDING)));
         } else {
-            query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
+            query.getOrderColList().add(new OrderCol("appealTime", OrderCol.DESCENDING));
         }
-        if (!ObjectUtils.isEmpty(query.getCreateTime())) {
-            query.setCreateTimeStart(DateUtil.formatDate(query.getCreateTime()));
-            query.setCreateTimeEnd(DateUtil.formatDate(query.getCreateTime()));
+        if(ObjectUtils.isEmpty(query.getAppealTimeStart())){
+            LocalDateTime currentDate = LocalDateTime.now();
+            LocalDateTime firstDayOfMonth = currentDate.withDayOfMonth(1);
+            query.setAppealTimeStart(DateUtil.format(firstDayOfMonth,"yyyy-MM-dd"));
+            //query.setAppealTimeEnd(DateUtil.formatDate(query.getCreateTime()));
         }
     }