修改考勤汇总

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

@@ -335,7 +335,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             Boolean bool = entity.newEntity();
             if (bool) {
                 performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
-            }else {
+            } else {
                 if (AppealResultEnum.通过.getValue() == entity.getAppealResult()) {
                     performInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
                 } else if (AppealResultEnum.不通过.getValue() == entity.getAppealResult()) {
@@ -406,11 +406,16 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
 
             PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()).performType(performReq.getPerformType()));
 
+            log.info("entity:{}", JSONObject.toJSONString(entity));
+
             if (!ObjectUtils.isEmpty(entity)) {
                 Boolean bool = entity.newEntity();
                 if (bool) {
                     performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
-                }else {
+                } else {
+                    if (ObjectUtils.isEmpty(entity.getAppealResult())) {
+                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
+                    } else {
                         if (AppealResultEnum.通过.getValue() == entity.getAppealResult()) {
                             performDetailInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
                         } else if (AppealResultEnum.不通过.getValue() == entity.getAppealResult()) {
@@ -419,6 +424,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                             performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
                         }
                     }
+                }
             } else {
                 performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
             }