Merge branch 'feature-wcz' of lift-manager/lift-server into develop

lift-common/src/main/java/cn.com.ty.lift.common/utils/ValuePool.java

@@ -280,6 +280,7 @@ public interface ValuePool {
     String   ATTEND_PM_DOWN_OT_TOP                    = "加班的上班(%tT)时间不得早于下午的下班(%tT)时间";
     String   ATTEND_MAINTAIN_COMPANY_MISSING          = "维保公司不存在，请核查";
     String   ATTEND_MISSING                           = "打卡记录不存在，请核查";
+    String   ATTEND_UNKNOWN_TYPE                      = "打卡类型未知，请核查";
     //===================导入相关======================================
     String   EXCEL_IMPORT_DATA_MISSING                = "未解析到有效数据";
     String   EXCEL_IMPORT_FORMAT_SUPPORT              = "文件格式不支持，暂时只支持xls,xlsx";

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/controller/AttendanceController.java

@@ -184,7 +184,7 @@ public class AttendanceController {
         Attendance same = attendanceService.sameByUserAndType(mtCompanyId, userId, type);
         if(Objects.nonNull(same)){
             LocalDateTime createDate = same.getCreateDate();
-            String message = Objects.isNull(createDate) ? "" : "(打卡时间：" + createDate + ")";
+            String message = Objects.isNull(createDate) ? "" : String.format("(打卡时间：%tF %tT)", createDate, createDate);
             return RestResponse.fail(ValuePool.ATTEND_HAD_CLOCK + message);
         }
         MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyId);
@@ -232,7 +232,7 @@ public class AttendanceController {
                 entity.setRemarks(ValuePool.ATTEND_OT_DOWN_CLOCK);
                 break;
             default:
-                return RestResponse.fail("打卡类型未知，请核查");
+                return RestResponse.fail(ValuePool.ATTEND_UNKNOWN_TYPE);
         }
         boolean result = attendanceService.save(entity);
         return RestResponse.success(result);