修改自动考核

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue

@@ -56,7 +56,7 @@
             >
             <el-col :span="5"
               >加分/扣分方式：{{
-                form.subMethod ? form.subMethod : "--"
+                form.subAddType ? form.subAddType : "--"
               }}</el-col
             >
           </el-row>
@@ -148,7 +148,8 @@
             >
             <el-col :span="8"
               >处理人员：{{
-                form.updateUserId ? form.updateUserId : "--"
+                dict['updateUserId'][form.updateUserId] ? dict['updateUserId'][form.updateUserId] : "--"
+
               }}</el-col
             >
             <el-col :span="8"
@@ -482,13 +483,14 @@ export default {
       // 是否显示弹出层
       open: false,
       direction: "rtl",
-      toString: ["subMethod", "subAddType", "processStatus", "appealResult"],
+      toString: ["subMethod", "subAddType", "processStatus", "appealResult", "updateUserId"],
       toDate: [
         "attendanceDate",
         "errorTime",
         "actualAttendTime",
         "checkTime",
         "appealTime",
+
       ],
       // 表单校验
       rules: {

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue

@@ -174,7 +174,7 @@ export default {
           { label: "违规类型", prop: "irregularOtherType" },
           { label: "绩效规则", prop: "ruleName" },
 
-          { label: "加分/扣分方式", prop: "subMethod", formatter: this.formatter },
+          { label: "加分/扣分方式", prop: "subAddType", formatter: this.formatter },
 
           {
             label: "加分/扣分时间",

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

@@ -8,8 +8,11 @@ import com.mortals.framework.model.PageInfo;
 import com.mortals.framework.model.Result;
 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.EnabledEnum;
 import com.mortals.xhx.common.code.IrregularTypeEnum;
+import com.mortals.xhx.common.code.ProcessStatusEnum;
 import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.perform.model.vo.AppealInfo;
 import com.mortals.xhx.module.perform.model.vo.AppealSummaryQuery;
@@ -42,6 +45,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import static com.mortals.framework.ap.SysConstains.*;
+import static java.util.stream.Collectors.toMap;
 
 /**
  * 绩效记录申诉信息
@@ -55,6 +59,9 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
+
 
     public PerformAttendAppealController() {
         super.setModuleDesc("绩效记录申诉信息");
@@ -62,9 +69,12 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
+
+        this.addDict(model, "updateUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
+
         this.addDict(model, "subMethod", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subMethod"));
         this.addDict(model, "subAddType", paramService.getParamBySecondOrganize("PerformAttendAppeal", "subAddType"));
-        this.addDict(model, "processStatus", paramService.getParamBySecondOrganize("PerformAttendAppeal", "processStatus"));
+        this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
         this.addDict(model, "appealResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "appealResult"));
         this.addDict(model, "reviewResult", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewResult"));
         this.addDict(model, "reviewSource", paramService.getParamBySecondOrganize("PerformAttendAppeal", "reviewSource"));