添加申诉统计业务

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

@@ -217,4 +217,8 @@ public class PerformDetailInfo {
     private Integer irregularOtherType;
 
 
+    /**
+     * 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
+     */
+    private Integer appealStatus;
 }

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

@@ -167,9 +167,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.考勤绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
-                    if(!ObjectUtils.isEmpty(entity)) {
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -195,8 +197,9 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
-
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -219,6 +222,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
                     return performInfo;
                 }).collect(Collectors.toList());
@@ -242,6 +247,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
                     }
 
                     return performInfo;
@@ -262,8 +269,12 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.效能绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -282,8 +293,13 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     performInfo.setPerformType(PerformTypeEnum.其它绩效.getValue());
                     //判断是否存在申诉
                     PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(item.getId()));
+
+                    if (!ObjectUtils.isEmpty(entity)) {
                         Boolean bool = entity.newEntity();
                         updateAppealStatus(performInfo, bool, entity.getProcessStatus(), entity.getAppealResult());
+                    } else {
+                        performInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+                    }
                     return performInfo;
                 }).collect(Collectors.toList());
                 model.put(KEY_RESULT_DATA, collect);
@@ -337,6 +353,7 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
                 CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
+
             } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
                 CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
@@ -356,6 +373,21 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 throw new AppException("不支持当前绩效类型");
             }
 
+            PerformAttendAppealEntity appealEntity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()));
+            if (ObjectUtils.isEmpty(appealEntity)) {
+                performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());
+            } else {
+                if (ProcessStatusEnum.未处理.getValue() == appealEntity.getProcessStatus()) {
+                    performDetailInfo.setAppealStatus(AppealStatusEnum.申诉中.getValue());
+                } else {
+                    if (AppealResultEnum.通过.getValue() == appealEntity.getProcessStatus()) {
+                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉通过.getValue());
+                    } else if (AppealResultEnum.不通过.getValue() == appealEntity.getProcessStatus()) {
+                        performDetailInfo.setAppealStatus(AppealStatusEnum.申诉拒绝.getValue());
+                    }
+                }
+            }
+
             rest.setData(performDetailInfo);
             recordSysLog(request, busiDesc + " 【成功】");
         } catch (Exception e) {