添加申诉统计业务

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);

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformDeptConfController.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 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

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/web/PerformStaffConfController.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 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