diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java
index 4585bc4561024367bb865499e22e03bc781e8630..8b77c243e367ca8acd0f5e96adb7bcf47ba9ac2e 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformStaffConfServiceImpl.java
@@ -41,6 +41,7 @@ public class PerformStaffConfServiceImpl extends AbstractCRUDServiceImpl<Perform
private PerformRulesCategoryService performRulesCategoryService;
+
@Override
protected void saveBefore(PerformStaffConfEntity entity, Context context) throws AppException {
super.saveBefore(entity,context);
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformDeptConfController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformDeptConfController.java
index 8856a2e44f50aba1cccf69d4b11b89e416d34902..b77cb3ebd3b453cb688fcca27849ba7ac7dfea81 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformDeptConfController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformDeptConfController.java
@@ -1,9 +1,14 @@
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 com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.EnableEnum;
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.*;
@@ -37,6 +42,8 @@ public class PerformDeptConfController extends BaseCRUDJsonBodyMappingController
@Autowired
private ParamService paramService;
+ @Autowired
+ private UserService userService;
public PerformDeptConfController(){
super.setModuleDesc( "閮ㄩ棬鑷姩鑰冩牳淇℃伅");
@@ -46,8 +53,20 @@ public class PerformDeptConfController extends BaseCRUDJsonBodyMappingController
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "type", CheckTypeEnum.getEnumMap());
this.addDict(model, "enable", EnableEnum.getEnumMap());
+
+ Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+ .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+ this.addDict(model, "updateUserId", collect);
+
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(PerformDeptConfEntity 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
diff --git a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformStaffConfController.java b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformStaffConfController.java
index 20f3ac50bb9ad8ab140fcc28a2ff5fb8f49f3467..e06523b71ad8587bc924ad55718df497d7485fe3 100644
--- a/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformStaffConfController.java
+++ b/attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformStaffConfController.java
@@ -1,53 +1,81 @@
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 com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.code.CheckTypeEnum;
import com.mortals.xhx.common.code.EnableEnum;
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.perform.model.PerformStaffConfEntity;
import com.mortals.xhx.module.perform.service.PerformStaffConfService;
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-05-16
-*/
+ * 浜哄憳鑷姩鑰冩牳淇℃伅
+ *
+ * @author zxfei
+ * @date 2023-05-16
+ */
@RestController
@RequestMapping("perform/staff/conf")
-public class PerformStaffConfController extends BaseCRUDJsonBodyMappingController<PerformStaffConfService,PerformStaffConfEntity,Long> {
+public class PerformStaffConfController extends BaseCRUDJsonBodyMappingController<PerformStaffConfService, PerformStaffConfEntity, Long> {
@Autowired
private ParamService paramService;
+ @Autowired
+ private UserService userService;
- public PerformStaffConfController(){
- super.setModuleDesc( "浜哄憳鑷姩鑰冩牳淇℃伅");
+ public PerformStaffConfController() {
+ super.setModuleDesc("浜哄憳鑷姩鑰冩牳淇℃伅");
}
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "type", CheckTypeEnum.getEnumMap());
this.addDict(model, "enable", EnableEnum.getEnumMap());
+
+ Map<String, String> collect = userService.find(new UserQuery(), getContext()).stream()
+ .collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n));
+
+ this.addDict(model, "updateUserId", collect);
+
super.init(model, context);
}
-
+ @Override
+ protected void doListBefore(PerformStaffConfEntity 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