添加照片海康下载

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

@@ -221,4 +221,14 @@ public class PerformDetailInfo {
      * 申诉状态(0.未申诉,1.申诉中,2.申诉拒绝,3.申诉通过)
      */
     private Integer appealStatus;
+
+    private String ruleDesc;
+
+    private String deductPerson;
+
+    private Date deductTime;
+
+
+
+
 }

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

@@ -86,6 +86,8 @@ public class FeedbackApiController extends AbstractBaseController<FeedbackReq> {
                 feedbackQuery.setIdList(feedbackIdList);
 
                 Result<FeedbackEntity> result = feedbackService.find(feedbackQuery, pageAllInfo, null);
+
+
                 model.put(PAGEINFO_KEY, result.getPageInfo());
                 model.put(KEY_RESULT_DATA, result.getList());
                 parsePageInfo(model, result.getPageInfo());

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

@@ -24,7 +24,9 @@ import com.mortals.xhx.module.check.model.vo.CheckAllRecordVo;
 import com.mortals.xhx.module.check.service.*;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealEntity;
 import com.mortals.xhx.module.perform.model.PerformAttendAppealQuery;
+import com.mortals.xhx.module.perform.model.PerformRulesEntity;
 import com.mortals.xhx.module.perform.service.PerformAttendAppealService;
+import com.mortals.xhx.module.perform.service.PerformRulesService;
 import com.mortals.xhx.module.staff.model.StaffPerformStatEntity;
 import com.mortals.xhx.module.staff.model.StaffPerformStatQuery;
 import com.mortals.xhx.module.staff.service.StaffPerformStatService;
@@ -78,6 +80,8 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
     private CheckAllRecordDao checkAllRecordDao;
     @Autowired
     private StaffPerformStatService staffPerformStatService;
+    @Autowired
+    private PerformRulesService rulesService;
 
     /**
      * 个人当天绩效统计
@@ -201,7 +205,6 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                     return performInfo;
                 }).collect(Collectors.toList());
 
-
                 model.put(KEY_RESULT_DATA, collect);
                 model.put(PAGEINFO_KEY, result.getPageInfo());
                 parsePageInfo(model, result.getPageInfo());
@@ -412,6 +415,11 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
                 }
             }
 
+            PerformRulesEntity rulesEntity = rulesService.getCache(performDetailInfo.getRuleId().toString());
+
+            performDetailInfo.setRuleDesc(rulesEntity.getContent());
+
+
             rest.setData(performDetailInfo);
             log.info("rspperformDetailInfo:{}", JSON.toJSONString(performDetailInfo));