修改考勤汇总

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckAttendRecordController.java

@@ -4,6 +4,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -47,6 +49,8 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public CheckAttendRecordController() {
         super.setModuleDesc("考勤绩效记录核查信息");
@@ -62,6 +66,10 @@ public class CheckAttendRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.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, "createUserId", collect);
         super.init(model, context);
     }
 

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckComplainRecordController.java

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -39,6 +41,8 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public CheckComplainRecordController(){
         super.setModuleDesc( "评价绩效投诉核查信息");
@@ -54,6 +58,12 @@ public class CheckComplainRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
         this.addDict(model, "complainSource", ReviewSourceEnum.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, "createUserId", collect);
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckEffectRecordController.java

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -40,6 +42,9 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private UserService userService;
+
     public CheckEffectRecordController(){
         super.setModuleDesc( "效能绩效核查信息");
     }
@@ -54,6 +59,12 @@ public class CheckEffectRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.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, "createUserId", collect);
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckGoworkRecordController.java

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -40,6 +42,9 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private UserService userService;
+
     public CheckGoworkRecordController(){
         super.setModuleDesc( "办件绩效核查信息");
     }
@@ -54,6 +59,12 @@ public class CheckGoworkRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.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, "createUserId", collect);
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckOtherRecordController.java

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -40,6 +42,9 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private UserService userService;
+
     public CheckOtherRecordController(){
         super.setModuleDesc( "其它绩效核查信息");
     }
@@ -54,6 +59,12 @@ public class CheckOtherRecordController extends BaseCRUDJsonBodyMappingControlle
         this.addDict(model, "checkResult", CheckResultEnum.getEnumMap());
         this.addDict(model, "checkResultAdd", CheckResultAddEnum.getEnumMap());
         this.addDict(model, "checkResultSub", CheckResultSubEnum.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, "createUserId", collect);
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/web/CheckReviewRecordController.java

@@ -4,6 +4,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -48,6 +50,9 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
     @Autowired
     private ParamService paramService;
 
+    @Autowired
+    private UserService userService;
+
     public CheckReviewRecordController() {
         super.setModuleDesc("评价差评绩效核查信息");
     }
@@ -67,6 +72,12 @@ public class CheckReviewRecordController extends BaseCRUDJsonBodyMappingControll
         this.addDict(model, "checkResultSub", CheckResultSubEnum.getEnumMap());
 
         this.addDict(model, "reviewSource", ReviewSourceEnum.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, "createUserId", collect);
     }
 
     @Override

attendance-performance-manager/src/main/java/com/mortals/xhx/module/feedback/web/FeedbackAnswerController.java

 package com.mortals.xhx.module.feedback.web;
 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 org.springframework.beans.factory.annotation.Autowired;
 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.jws.soap.SOAPBinding;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
@@ -36,6 +40,7 @@ public class FeedbackAnswerController extends BaseCRUDJsonBodyMappingController<
     @Autowired
     private ParamService paramService;
 
+
     public FeedbackAnswerController(){
         super.setModuleDesc( "绩效问题回答");
     }
@@ -43,6 +48,7 @@ public class FeedbackAnswerController extends BaseCRUDJsonBodyMappingController<
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "questionType", paramService.getParamBySecondOrganize("FeedbackAnswer","questionType"));
+
         super.init(model, context);
     }
 

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

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -39,6 +41,8 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PerformAttendRecordController(){
         super.setModuleDesc( "考勤绩效记录信息");
@@ -52,6 +56,10 @@ public class PerformAttendRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.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, "createUserId", collect);
         super.init(model, context);
     }
 

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

@@ -2,6 +2,8 @@ package com.mortals.xhx.module.perform.web;
 
 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +13,7 @@ import com.mortals.xhx.module.perform.model.PerformComplainRecordEntity;
 import com.mortals.xhx.module.perform.service.PerformComplainRecordService;
 
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 评价绩效投诉记录信息
@@ -24,6 +27,8 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PerformComplainRecordController() {
         super.setModuleDesc("评价绩效投诉记录信息");
@@ -39,7 +44,10 @@ public class PerformComplainRecordController extends BaseCRUDJsonBodyMappingCont
 
         this.addDict(model, "complainSource", ReviewSourceEnum.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, "createUserId", collect);
         super.init(model, context);
     }
 

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

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -39,6 +41,8 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PerformEffectRecordController(){
         super.setModuleDesc( "效能绩效记录信息");
@@ -53,6 +57,10 @@ public class PerformEffectRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.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, "createUserId", collect);
         super.init(model, context);
     }
 

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

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -39,6 +41,8 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PerformGoworkRecordController(){
         super.setModuleDesc( "办件绩效记录信息");
@@ -52,6 +56,10 @@ public class PerformGoworkRecordController extends BaseCRUDJsonBodyMappingContro
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.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, "createUserId", collect);
 
         super.init(model, context);
     }

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

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -39,6 +41,8 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PerformOtherRecordController(){
         super.setModuleDesc( "其它绩效记录信息");
@@ -53,6 +57,10 @@ public class PerformOtherRecordController extends BaseCRUDJsonBodyMappingControl
         this.addDict(model, "subAddType", SubAddTypeEnum.getEnumMap());
         this.addDict(model, "checkType", CheckTypeEnum.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, "createUserId", collect);
 
         super.init(model, context);
     }

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

@@ -3,6 +3,8 @@ 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.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
@@ -39,6 +41,8 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
 
     @Autowired
     private ParamService paramService;
+    @Autowired
+    private UserService userService;
 
     public PerformReviewRecordController(){
         super.setModuleDesc( "评价差评绩效记录信息");
@@ -56,6 +60,10 @@ public class PerformReviewRecordController extends BaseCRUDJsonBodyMappingContro
 
         this.addDict(model, "reviewSource", ReviewSourceEnum.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, "createUserId", collect);
         super.init(model, context);
     }