修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffPerformSummaryController.java

 package com.mortals.xhx.module.staff.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 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 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.staff.model.StaffPerformSummaryEntity;
 import com.mortals.xhx.module.staff.service.StaffPerformSummaryService;
 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-05
-*/
+ * 员工绩效统计
+ *
+ * @author zxfei
+ * @date 2023-07-05
+ */
 @RestController
 @RequestMapping("staff/perform/summary")
-public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingController<StaffPerformSummaryService,StaffPerformSummaryEntity,Long> {
+public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingController<StaffPerformSummaryService, StaffPerformSummaryEntity, Long> {
 
     @Autowired
     private ParamService paramService;
@@ -42,19 +52,22 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
     private DeptService deptService;
 
 
-    public StaffPerformSummaryController(){
-        super.setModuleDesc( "员工绩效统计");
+    public StaffPerformSummaryController() {
+        super.setModuleDesc("员工绩效统计");
     }
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "month", paramService.getParamBySecondOrganize("StaffPerformSummary","month"));
+        this.addDict(model, "month", paramService.getParamBySecondOrganize("StaffPerformSummary", "month"));
         this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getDeptName(), (o, n) -> n)));
         super.init(model, context);
     }
 
     @Override
     protected void doListBefore(StaffPerformSummaryEntity query, Map<String, Object> model, Context context) throws AppException {
-
+        if (!ObjectUtils.isEmpty(query.getOrderColList())) {
+        query.getOrderColList().add(new OrderCol("year",OrderCol.DESCENDING));
+        query.getOrderColList().add(new OrderCol("month",OrderCol.DESCENDING));
+        }
     }
 }