Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -149,7 +149,13 @@ export default {
                   ? "审核中"
                   : row.auditResult == 1
                   ? "通过"
-                  : "不通过"
+                  : row.auditResult == 2
+                  ? "不通过"
+                  : row.auditResult == 3
+                  ? "撤销审批中"
+                  : row.auditResult == 4
+                  ? "撤销审批完成"
+                  : "--"
                 : "--";
             },
           },

attendance-performance-manager-ui/admin/src/views/check/attend/record/list.vue

@@ -219,8 +219,8 @@ export default {
 
           {
             label: "上下班时间",
+            width: 100,
             prop: "goOffTimeStr",
-            formatter: this.formatterDate,
           },
 
           {

attendance-performance-manager-ui/admin/src/views/perform/attend/record/list.vue

@@ -226,8 +226,8 @@ export default {
 
           {
             label: "上下班时间",
+            width: 100,
             prop: "goOffTimeStr",
-            formatter: this.formatterDate,
           },
 
           {

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

@@ -445,30 +445,47 @@ public class PerformApiController extends AbstractBaseController<PerformReq> {
             PerformDetailInfo performDetailInfo = new PerformDetailInfo();
             if (PerformTypeEnum.考勤绩效.getValue().equals(performReq.getPerformType())) {
                 CheckAttendRecordEntity checkEntity = checkAttendRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.评价差评绩效.getValue().equals(performReq.getPerformType())) {
                 CheckReviewRecordEntity checkEntity = checkReviewRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.评价投诉绩效.getValue().equals(performReq.getPerformType())) {
                 CheckComplainRecordEntity checkEntity = checkComplainRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.办件绩效.getValue().equals(performReq.getPerformType())) {
                 CheckGoworkRecordEntity checkEntity = checkGoworkRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.效能绩效.getValue().equals(performReq.getPerformType())) {
                 CheckEffectRecordEntity checkEntity = checkEffectRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else if (PerformTypeEnum.其它绩效.getValue().equals(performReq.getPerformType())) {
                 CheckOtherRecordEntity checkEntity = checkOtherRecordService.get(performReq.getId(), context);
+                if(checkEntity == null){
+                    throw new AppException("绩效核查信息id不正确,查不到相应数据");
+                }
                 BeanUtils.copyProperties(checkEntity, performDetailInfo, BeanUtil.getNullPropertyNames(checkEntity));
             } else {
                 throw new AppException("不支持当前绩效类型");
             }
 
             PerformAttendAppealEntity entity = appealService.selectOne(new PerformAttendAppealQuery().checkRecordId(performDetailInfo.getId()).performType(performReq.getPerformType()));
-            log.info("entity:{}", JSONObject.toJSONString(entity));
-
             if (!ObjectUtils.isEmpty(entity)) {
+                log.info("entity:{}", JSONObject.toJSONString(entity));
                 Boolean bool = entity.newEntity();
                 if (bool) {
                     performDetailInfo.setAppealStatus(AppealStatusEnum.未申诉.getValue());

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

@@ -2,6 +2,8 @@ package com.mortals.xhx.module.attendance.web;
 import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.base.system.user.model.UserQuery;
+import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.code.AppealResultEnum;
 import com.mortals.xhx.common.code.ProcessStatusEnum;
 import com.mortals.xhx.module.attendance.model.AttendanceLeaveRecordEntity;
@@ -17,6 +19,8 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.toMap;
+
 /**
 *
 * 请假记录信息
@@ -34,6 +38,8 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
     private DeptService deptService;
     @Autowired
     private WorkmanService workmanService;
+    @Autowired
+    private UserService userService;
 
     public AttendanceLeaveRecordController(){
         super.setModuleDesc( "请假记录信息");
@@ -41,12 +47,12 @@ public class AttendanceLeaveRecordController extends BaseCRUDJsonBodyMappingCont
 
     @Override
     protected void init(Map<String, Object> model, Context context) {
-        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
-        this.addDict(model, "approverId", workmanService.find(new WorkmanQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(), y->y.getName(),(o, n)->n)));
+        this.addDict(model, "deptId", deptService.find(new DeptQuery()).stream().collect(toMap(x->x.getId().toString(), y->y.getDeptName(),(o, n)->n)));
+        this.addDict(model, "approverId", workmanService.find(new WorkmanQuery()).stream().collect(toMap(x->x.getId().toString(), y->y.getName(),(o, n)->n)));
         this.addDict(model, "leaveType", paramService.getParamBySecondOrganize("AttendanceLeaveRecord","leaveType"));
         this.addDict(model, "auditResult", AppealResultEnum.getEnumMap());
         this.addDict(model, "processStatus", ProcessStatusEnum.getEnumMap());
-
+        this.addDict(model, "createUserId", userService.find(new UserQuery()).stream().collect(toMap(x -> x.getId().toString(), y -> y.getRealName(), (o, n) -> n)));
 
 
         super.init(model, context);