修改用户等

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordHikEntity.java

@@ -38,6 +38,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
     /**
      * 所属部门名称
      */
+    @Excel(name = "所属部门")
     private String deptName;
     /**
      * 职位ID
@@ -46,7 +47,6 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
     /**
      * 职位名称
      */
-    @Excel(name = "职位名称")
     private String positionName;
     /**
      * 所属考勤组ID

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/vo/AttendanceRecordHikVo.java

@@ -15,7 +15,6 @@ import java.util.List;
 @Data
 public class AttendanceRecordHikVo extends BaseEntityLong {
 
-    @Excel(name = "所属组织")
     private String orgName;
 
     /** 开始 考勤日期 */

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

@@ -192,22 +192,22 @@ public class AttendanceRecordController extends BaseCRUDJsonBodyMappingControlle
                         //生成上班  结果  下班 结果 4个map
                         Map<String, Object> map = new HashMap<>();
                         map.put("name", String.format("上班打卡时间%d", i + 1));
-                        map.put("value", DateUtil.formatDateTime(detailEntity.getGoWorkDate()));
+                        map.put("value", detailEntity.getGoWorkDate()==null?"--":DateUtil.formatDateTime(detailEntity.getGoWorkDate()));
                         mapList.add(map);
 
                         map = new HashMap<>();
                         map.put("name", String.format("上班打卡结果%d", i + 1));
-                        map.put("value", GoWorkResultEnum.getByValue(detailEntity.getGoWorkResult()).getDesc());
+                        map.put("value", detailEntity.getGoWorkResult()==null?"--":GoWorkResultEnum.getByValue(detailEntity.getGoWorkResult()).getDesc());
                         mapList.add(map);
 
                         map = new HashMap<>();
                         map.put("name", String.format("下班打卡时间%d", i + 1));
-                        map.put("value", DateUtil.formatDateTime(detailEntity.getOffWorkDate()));
+                        map.put("value", detailEntity.getOffWorkDate()==null?"--":DateUtil.formatDateTime(detailEntity.getOffWorkDate()));
                         mapList.add(map);
 
                         map = new HashMap<>();
                         map.put("name", String.format("下班打卡结果%d", i + 1));
-                        map.put("value", OffWorkResultEnum.getByValue(detailEntity.getOffWorkResult()).getDesc());
+                        map.put("value",detailEntity.getOffWorkResult()==null?"--":OffWorkResultEnum.getByValue(detailEntity.getOffWorkResult()).getDesc());
                         mapList.add(map);
                     } else {
                         Map<String, Object> map = new HashMap<>();

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

@@ -71,7 +71,7 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
     private ICacheService cacheService;
 
     public AttendanceRecordHikController() {
-        super.setModuleDesc("海康考勤打卡记录汇总信息");
+        super.setModuleDesc("考勤打卡记录汇总信息");
     }
 
     @Override
@@ -84,7 +84,6 @@ public class AttendanceRecordHikController extends BaseCRUDJsonBodyMappingContro
     @Transactional(rollbackFor = Exception.class)
     public void doImportDataBefore(List<AttendanceRecordHikEntity> list, boolean updateSupport, Context context) throws AppException {
 
-
         list.forEach(item -> {
             String orgName = item.getOrgName();
             //todo split orgName to deptId and deptName