添加申诉统计业务

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/BaseReq.java

@@ -52,4 +52,7 @@ public abstract class BaseReq implements Serializable {
     private String performType;
 
 
+    private Long staffId;
+
+
 }

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/ApiWebPerformController.java

@@ -279,6 +279,8 @@ public class ApiWebPerformController extends AbstractBaseController<PerformReq>
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
 
+        recordEntity.setDeductTime(new Date());
+
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         PerformComplainRecordEntity save = complainRecordService.save(recordEntity);

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/AppealApiController.java

@@ -176,6 +176,9 @@ public class AppealApiController extends AbstractBaseController<PerformReq> {
         Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
         Context context = this.getContext();
         try {
+            if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+                throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+            }
             //根据状态 查询 当前是否已经存在正在进行的申诉
             if (ObjectUtils.isEmpty(req.getId())) throw new AppException("核查记录Id不能为空！");
             if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("绩效类型不能为空！");

attendance-performance-manager/src/main/java/com/mortals/xhx/busiz/web/InspectApiController.java

@@ -216,8 +216,14 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         log.info("【{}】【请求体】--> {}", busiDesc, JSONObject.toJSONString(req));
         Rest<PerformAttendAppealEntity> rest = Rest.ok(busiDesc + " 【成功】");
         Context context = this.getContext();
+
+
+        req.setStaffId(context.getUser().getCustomerId());
         try {
             //根据状态 查询 当前是否已经存在正在进行的申诉
+            if (ObjectUtils.isEmpty(context) || ObjectUtils.isEmpty(context.getUser())) {
+                throw new AppException(ERROR_TOKEN_EXPIRED, ERROR_TOKEN_EXPIRED_CONTENT);
+            }
             if (ObjectUtils.isEmpty(req.getPerformType())) throw new AppException("绩效类型不能为空！");
 
             if (PerformTypeEnum.考勤绩效.getValue().equals(req.getPerformType())) {
@@ -257,13 +263,16 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     private boolean attend(InspectSaveReq req) throws AppException {
         //考勤保存
         PerformRulesEntity rule = getRule(req.getRuleId().toString());
-        //StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
 
         PerformAttendRecordEntity recordEntity = new PerformAttendRecordEntity();
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-      //  recordEntity.setStaffId(staffEntity.getId());
-      //  recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setStaffId(staffEntity.getId());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
 
 
         recordEntity.setSubAddType(rule.getSubAddType());
@@ -284,7 +293,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean review(InspectSaveReq req) throws AppException {
         //评价保存
-       // StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
         PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformReviewRecordEntity recordEntity = new PerformReviewRecordEntity();
@@ -292,7 +301,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
       //  recordEntity.setStaffId(staffEntity.getId());
-     //   recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -309,7 +321,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean complain(InspectSaveReq req) throws AppException {
         //投诉保存
-       // StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
         PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformComplainRecordEntity recordEntity = new PerformComplainRecordEntity();
@@ -317,7 +329,11 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
        // recordEntity.setStaffId(staffEntity.getId());
-       // recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
+
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -325,6 +341,8 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.setCategoryId(rule.getCategoryId());
         recordEntity.setCategoryName(rule.getCategoryName());
 
+        recordEntity.setDeductTime(new Date());
+
         recordEntity.setCreateUserId(1L);
         recordEntity.setCreateTime(new Date());
         PerformComplainRecordEntity save = complainRecordService.save(recordEntity);
@@ -334,7 +352,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean gowork(InspectSaveReq req) throws AppException {
         //办件保存
-       // StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
         PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformGoworkRecordEntity recordEntity = new PerformGoworkRecordEntity();
@@ -342,7 +360,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
        // recordEntity.setStaffId(staffEntity.getId());
-       // recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -359,7 +380,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean effect(InspectSaveReq req) throws AppException {
         //效能保存
-        //StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
         PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
@@ -367,7 +388,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
         //recordEntity.setStaffId(staffEntity.getId());
-        //recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -384,7 +408,7 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     private boolean other(InspectSaveReq req) throws AppException {
         //其它保存
 
-       // StaffEntity staffEntity = getStaff(req.getPhone());
+        StaffEntity staffEntity = getStaff(req.getStaffId().toString());
         PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformOtherRecordEntity recordEntity = new PerformOtherRecordEntity();
@@ -392,7 +416,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
         //recordEntity.setStaffId(staffEntity.getId());
-       // recordEntity.setStaffName(staffEntity.getName());
+        recordEntity.setStaffName(staffEntity.getName());
+
+        recordEntity.setDeptId(staffEntity.getDeptId());
+        recordEntity.setDeptName(staffEntity.getDeptName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -460,10 +487,10 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     }
 
 
-    private StaffEntity getStaff(String phone) {
-        StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(phone));
+    private StaffEntity getStaff(String staffId) {
+        StaffEntity staffEntity = staffService.getCache(staffId);
         if (ObjectUtils.isEmpty(staffEntity))
-            throw new AppException(String.format("当前手机号码未找到匹配的员工！phone:%s", phone));
+            throw new AppException(String.format("当前id未找到匹配的员工！staffId:%s", staffId));
 
         return staffEntity;
     }