Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformAttendAppealServiceImpl.java

@@ -74,7 +74,8 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
 
 
     private void sendCheckDingTalk(PerformAttendAppealEntity entity) {
-        String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.getByValue(entity.getPerformType()).getDesc(), entity.getCategoryName(), entity.getRuleName());
+       // String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.getByValue(entity.getPerformType()).getDesc(), entity.getCategoryName(), entity.getRuleName());
+        String ruleStr = String.format("%s/%s/%s", PerformTypeEnum.考勤绩效.getDesc(), entity.getCategoryName(), entity.getRuleName());
         //绩效核查通知
         StaffEntity staffCache = staffService.getCache(entity.getStaffId().toString());
         if (!ObjectUtils.isEmpty(staffCache)) {
@@ -121,7 +122,7 @@ public class PerformAttendAppealServiceImpl extends AbstractCRUDServiceImpl<Perf
         }
         String appealMsg = "申诉成功，返回所扣分数，申诉ID:" + appeal.getId().toString();
         sendCheckDingTalk(appealEntity);
-log.info(appealMsg);
+        log.info(appealMsg);
 
         if (appeal.getAppealResult() == AppealResultEnum.通过.getValue()) {
             if (appeal.getSubAddType() == SubAddTypeEnum.扣除.getValue()) {

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

@@ -137,6 +137,7 @@ public class PerformAttendAppealController extends BaseCRUDJsonBodyMappingContro
             }
             recordSysLog(request, busiDesc + " 【成功】");
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
+            jsonObject.put(KEY_RESULT_MSG, busiDesc+ "成功!");
         } catch (Exception e) {
             log.error("申诉审核", e);
             jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);