Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/drawershow.vue

@@ -78,9 +78,7 @@
           <el-row>
             <el-col :span="8"
               >核查结果：{{
-                form.checkResult
-                  ? util_formatter("checkResult", form.checkResult)
-                  : "--"
+                form.checkResult ? form.checkResult : "--"
               }}</el-col
             >
             <el-col :span="8"

attendance-performance-manager/src/main/java/com/mortals/xhx/module/check/service/impl/CheckOtherRecordServiceImpl.java

@@ -193,6 +193,7 @@ public class CheckOtherRecordServiceImpl extends AbstractCRUDServiceImpl<CheckOt
         if (StringUtils.isEmpty(query.getCheckTimeStart()) || StringUtils.isEmpty(query.getCheckTimeStart())) {
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             Calendar calendar = Calendar.getInstance();
+            calendar.setTime(new Date());
             calendar.set(Calendar.DAY_OF_MONTH, 1);
             String startTime = format.format(calendar.getTime());
             calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));

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

@@ -6,6 +6,8 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.module.dept.model.DeptQuery;
 import com.mortals.xhx.module.dept.service.DeptService;
+import com.mortals.xhx.module.staff.model.StaffEntity;
+import com.mortals.xhx.module.staff.service.StaffService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -50,6 +52,8 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
     private ParamService paramService;
     @Autowired
     private DeptService deptService;
+    @Autowired
+    private StaffService staffService;
 
 
     public StaffPerformSummaryController() {
@@ -70,4 +74,14 @@ public class StaffPerformSummaryController extends BaseCRUDJsonBodyMappingContro
         query.getOrderColList().add(new OrderCol("month",OrderCol.DESCENDING));
         }
     }
+
+    @Override
+    protected int viewAfter(Long id, Map<String, Object> model, StaffPerformSummaryEntity entity, Context context) throws AppException {
+        StaffEntity staffEntity = staffService.get(entity.getStaffId());
+        if(staffEntity!=null){
+            entity.setWorkNum(staffEntity.getWorkNum());
+            entity.setPhoneNumber(staffEntity.getPhoneNumber());
+        }
+        return 1;
+    }
 }