添加申诉统计业务

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

@@ -40,6 +40,9 @@ public abstract class BaseReq implements Serializable {
      * 规则编码
      */
     private String ruleCode;
+
+    private Long ruleId;
+
     private String phone;
 
 

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

@@ -31,7 +31,7 @@ import java.util.Date;
 @RestController
 @Slf4j
 @RequestMapping("/api/v1/web/")
-public class                ApiWebPerformController extends AbstractBaseController<PerformReq> {
+public class ApiWebPerformController extends AbstractBaseController<PerformReq> {
 
     @Autowired
     private PerformAttendRecordService attendRecordService;
@@ -88,7 +88,7 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部评价新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-         try {
+        try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = review(req);
@@ -163,7 +163,7 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部效能新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-       try {
+        try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = effect(req);
@@ -188,7 +188,7 @@ public class                ApiWebPerformController extends AbstractBaseControll
 
         String busiDesc = "外部其它绩效新增";
         Rest rest = Rest.ok(busiDesc + "成功！");
-       try {
+        try {
             if (ObjectUtils.isEmpty(req.getPhone())) throw new AppException("手机号码不能为空！");
             if (ObjectUtils.isEmpty(req.getRuleCode())) throw new AppException("绩效规则编码不能为空！");
             boolean bool = other(req);

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

@@ -245,15 +245,14 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean attend(InspectSaveReq req) throws AppException {
         //考勤保存
-        //通过手机号码查询员工属性
-        PerformRulesEntity rule = getRule(req.getRuleCode());
-        StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
+        //StaffEntity staffEntity = getStaff(req.getPhone());
 
         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.setSubAddType(rule.getSubAddType());
@@ -274,15 +273,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean review(InspectSaveReq req) throws AppException {
         //评价保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformReviewRecordEntity recordEntity = new PerformReviewRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+      //  recordEntity.setStaffId(staffEntity.getId());
+     //   recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -299,15 +298,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean complain(InspectSaveReq req) throws AppException {
         //投诉保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformComplainRecordEntity recordEntity = new PerformComplainRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+       // recordEntity.setStaffId(staffEntity.getId());
+       // recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -324,15 +323,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean gowork(InspectSaveReq req) throws AppException {
         //办件保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformGoworkRecordEntity recordEntity = new PerformGoworkRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+       // recordEntity.setStaffId(staffEntity.getId());
+       // recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -349,15 +348,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
 
     private boolean effect(InspectSaveReq req) throws AppException {
         //效能保存
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+        //StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformEffectRecordEntity recordEntity = new PerformEffectRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+        //recordEntity.setStaffId(staffEntity.getId());
+        //recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -374,15 +373,15 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     private boolean other(InspectSaveReq req) throws AppException {
         //其它保存
 
-        StaffEntity staffEntity = getStaff(req.getPhone());
-        PerformRulesEntity rule = getRule(req.getRuleCode());
+       // StaffEntity staffEntity = getStaff(req.getPhone());
+        PerformRulesEntity rule = getRule(req.getRuleId().toString());
 
         PerformOtherRecordEntity recordEntity = new PerformOtherRecordEntity();
 
         recordEntity.initAttrValue();
         BeanUtils.copyProperties(req, recordEntity);
-        recordEntity.setStaffId(staffEntity.getId());
-        recordEntity.setStaffName(staffEntity.getName());
+        //recordEntity.setStaffId(staffEntity.getId());
+       // recordEntity.setStaffName(staffEntity.getName());
         recordEntity.setSubAddType(rule.getSubAddType());
         recordEntity.setScore(rule.getScore());
         recordEntity.setRuleId(rule.getId());
@@ -397,14 +396,16 @@ public class InspectApiController extends AbstractBaseController<PerformReq> {
     }
 
 
-    private PerformRulesEntity getRule(String ruleCode) {
-        PerformRulesEntity rule = rulesService.getCache(ruleCode);
+
+    private PerformRulesEntity getRule(String ruleId) {
+        PerformRulesEntity rule = rulesService.getCache(ruleId);
         if (ObjectUtils.isEmpty(rule))
-            throw new AppException(String.format("当前手机号码未找到匹配的员工！rule:%s", ruleCode));
+            throw new AppException(String.format("当前手机号码未找到匹配的员工！rule:%s", ruleId));
 
         return rule;
     }
 
+
     private StaffEntity getStaff(String phone) {
         StaffEntity staffEntity = staffService.selectOne(new StaffQuery().phoneNumber(phone));
         if (ObjectUtils.isEmpty(staffEntity))