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

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -157,7 +157,7 @@ public class AnnualInspectionController {
         AnnualInspection previousConfirm = annualInspectionService.findPreviousConfirm(entity.getLiftId(), entity.getMtCompanyId());
         if(Objects.nonNull(previousConfirm) && Objects.nonNull(previousConfirm.getPlanDate())){
             LocalDate deadline = previousConfirm.getPlanDate().plusDays(DateUtils.daysOfYear());
-            Validate.notTrue(deadline.isBefore(entity.getPlanDate()), String.format(ValuePool.INSPECTION_LAST_PLAN_DATE, previousConfirm.getPlanDate(), deadline));
+            Validate.notTrue(deadline.isBefore(entity.getPlanDate()), ValuePool.inspectionLastPlanDate(previousConfirm.getPlanDate(), deadline));
         }
 
         entity.setStatus(ValuePool.INSPECTION_STATUS_TO_DO);
@@ -198,7 +198,7 @@ public class AnnualInspectionController {
         AnnualInspection old = annualInspectionService.findByMtCompanyId(entity.getId(), entity.getMtCompanyId());
         Validate.notNull(old, ValuePool.INSPECTION_NOT_EXIST);
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 1);
-        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, String.format(ValuePool.INSPECTION_MUST_ON_STEP, "第一阶段"));
+        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionMustOnStage("第一阶段"));
         old.setIsCheckGoverner(entity.getIsCheckGoverner());
         old.setLoadInspectionSetting(entity.getLoadInspectionSetting());
 
@@ -220,9 +220,9 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 1);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 2);
         Integer stepStatus = entity.getStepStatus();
-        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, String.format(ValuePool.INSPECTION_STEP_TO_NEXT, "确认操作", "第一阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM, ValuePool.INSPECTION_STAGE_SELFCHECK, String.format(ValuePool.INSPECTION_CURRENT_STEP_STATUS_ILLEGAL, oldStepStatus, "第一阶段"));
-        Validate.equals(stepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, String.format(ValuePool.INSPECTION_NEW_STEP_STATUS_ILLEGAL, stepStatus, "第一阶段"));
+        Validate.equals(oldStepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionStepToNext("确认操作", "第一阶段"));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.inspectionCurrentStepStatusIllegal( oldStepStatus, "第一阶段"));
+        Validate.equals(stepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.inspectionNewStepStatusIllegal(stepStatus, "第一阶段"));
 
         old.setSelfcheckReportImg(entity.getSelfcheckReportImg());
         old.setSelfcheckDate(entity.getSelfcheckDate());
@@ -245,8 +245,8 @@ public class AnnualInspectionController {
         Validate.notNull(old, ValuePool.INSPECTION_NOT_EXIST);
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 2);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 2);
-        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_ONE,ValuePool.INSPECTION_STEP_TWO, String.format(ValuePool.INSPECTION_STEP_TO_NEXT, "第一阶段", "第二阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, String.format(ValuePool.INSPECTION_CURRENT_STEP_STATUS_ILLEGAL, oldStepStatus, "第二阶段"));
+        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_ONE,ValuePool.INSPECTION_STEP_TWO, ValuePool.inspectionStepToNext("第一阶段", "第二阶段"));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_SELFCHECK, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, "第二阶段"));
 
         old.setCheckDate(entity.getCheckDate());
         old.setInspector(entity.getInspector());
@@ -294,13 +294,13 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 2);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 3);
         Integer stepStatus = entity.getStepStatus();
-        Validate.between(oldStepName,ValuePool.INSPECTION_STEP_TWO, ValuePool.INSPECTION_STEP_THREE, String.format(ValuePool.INSPECTION_STEP_TO_NEXT, "第二阶段", "第三阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, String.format(ValuePool.INSPECTION_CURRENT_STEP_STATUS_ILLEGAL, oldStepStatus, "第三阶段"));
-        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, String.format(ValuePool.INSPECTION_NEW_STEP_STATUS_ILLEGAL, stepStatus, "第三阶段"));
+        Validate.between(oldStepName,ValuePool.INSPECTION_STEP_TWO, ValuePool.INSPECTION_STEP_THREE, ValuePool.inspectionStepToNext("第二阶段", "第三阶段"));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CONFIRM_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, "第三阶段"));
+        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CHECK, ValuePool.INSPECTION_STAGE_CHECK_UNQUALIFIED, ValuePool.inspectionNewStepStatusIllegal(stepStatus, "第三阶段"));
         LocalDate oldPlanDate = old.getPlanDate();
         if(Objects.nonNull(oldPlanDate)){
             LocalDate deadline = oldPlanDate.plusDays(DateUtils.daysOfYear());
-            Validate.notTrue(deadline.isBefore(entity.getNextInspectionTime()), String.format(ValuePool.INSPECTION_LAST_PLAN_DATE, oldPlanDate, deadline));
+            Validate.notTrue(deadline.isBefore(entity.getNextInspectionTime()), ValuePool.inspectionLastPlanDate(oldPlanDate, deadline));
         }
 
         old.setStepStatus(entity.getStepStatus());
@@ -332,9 +332,9 @@ public class AnnualInspectionController {
         Integer oldStepName = ValuePool.nullable(old.getStepName(), 3);
         Integer oldStepStatus = ValuePool.nullable(old.getStepStatus(), 5);
         Integer stepStatus = entity.getStepStatus();
-        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.INSPECTION_STEP_FOUR, String.format(ValuePool.INSPECTION_STEP_TO_NEXT, "第三阶段", "第四阶段"));
-        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CHECK_QUALIFIED, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, String.format(ValuePool.INSPECTION_CURRENT_STEP_STATUS_ILLEGAL, oldStepStatus, "第四阶段"));
-        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CERT_REPORT, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, String.format(ValuePool.INSPECTION_NEW_STEP_STATUS_ILLEGAL, stepStatus, "第四阶段"));
+        Validate.between(oldStepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.INSPECTION_STEP_FOUR, ValuePool.inspectionStepToNext("第三阶段", "第四阶段"));
+        Validate.between(oldStepStatus, ValuePool.INSPECTION_STAGE_CHECK_QUALIFIED, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, ValuePool.inspectionCurrentStepStatusIllegal(oldStepStatus, "第四阶段"));
+        Validate.between(stepStatus, ValuePool.INSPECTION_STAGE_UPLOAD_CERT_REPORT, ValuePool.INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED, ValuePool.inspectionNewStepStatusIllegal(stepStatus, "第四阶段"));
 
         old.setStepStatus(entity.getStepStatus());
         old.setAnnualInspectionImg(entity.getAnnualInspectionImg());
@@ -383,7 +383,7 @@ public class AnnualInspectionController {
 
     /**
      * 上传自检报告，传递年检id，传递自检报告图片路径
-     *
+     * stepName = 1
      * @param request InspectionRequest
      * @return RestResponse
      */
@@ -393,6 +393,9 @@ public class AnnualInspectionController {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Validate.notNull(entity, ValuePool.INSPECTION_NOT_EXIST);
 
+        Integer stepName = ValuePool.nullable(entity.getStepName(), 1);
+        Validate.equals(stepName, ValuePool.INSPECTION_STEP_ONE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传自检报告"));
+
         entity.setSelfcheckDate(request.getSelfcheckDate());
         entity.setSelfcheckReportImg(request.getSelfcheckReportImg());
         entity.setStepStatus(ValuePool.INSPECTION_STAGE_SELFCHECK);
@@ -404,7 +407,7 @@ public class AnnualInspectionController {
 
     /**
      * 上传检验结果，传递年检id，传递检验报告图片路径
-     *
+     *  stepName = 3
      * @param request InspectionRequest
      * @return RestResponse
      */
@@ -414,6 +417,9 @@ public class AnnualInspectionController {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Validate.notNull(entity, ValuePool.INSPECTION_NOT_EXIST);
 
+        Integer stepName = ValuePool.nullable(entity.getStepName(), 3);
+        Validate.equals(stepName, ValuePool.INSPECTION_STEP_THREE, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传检验结果"));
+
         entity.setCheckDate(request.getCheckDate());
         entity.setCheckResultImg(request.getCheckResultImg());
         entity.setStepStatus(ValuePool.INSPECTION_STAGE_UPLOAD_CHECK);
@@ -425,7 +431,7 @@ public class AnnualInspectionController {
 
     /**
      * 上传年检报告和合格证，传递年检id，传递年检报告和合格证图片路径
-     *
+     *  stepName = 4
      * @param request InspectionRequest
      * @return RestResponse
      */
@@ -435,6 +441,9 @@ public class AnnualInspectionController {
         AnnualInspection entity = annualInspectionService.getById(request.getId());
         Validate.notNull(entity, ValuePool.INSPECTION_NOT_EXIST);
 
+        Integer stepName = ValuePool.nullable(entity.getStepName(), 4);
+        Validate.equals(stepName, ValuePool.INSPECTION_STEP_FOUR, ValuePool.inspectionCurrentStepStatusIllegal(stepName, "上传年检报告和合格证"));
+
         entity.setCertificateImgUrl(request.getCertificateImgUrl());
         entity.setAnnualInspectionImg(request.getAnnualInspectionImg());
         entity.setStepStatus(ValuePool.INSPECTION_STAGE_UPLOAD_CERT_REPORT);

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -48,9 +48,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -222,19 +220,20 @@ public class EmergencyRepairController {
     }
 
     private RestResponse pageByCondition(RepairRequest request) {
-        LocalDate repairBegin = request.getRepairBegin();
-        LocalDate repairEnd = request.getRepairEnd();
-        if (Objects.nonNull(repairBegin) && Objects.nonNull(repairEnd)) {
-            long until = repairEnd.until(repairBegin, ChronoUnit.DAYS);
-            Validate.notTrue(until > DateUtils.daysOfYear(), "最多只允许查询间隔" + DateUtils.daysOfYear() + "天的记录");
-        } else if (Objects.nonNull(repairBegin) && Objects.isNull(repairEnd)) {
-            request.setRepairEnd(repairBegin.plusDays(DateUtils.daysOfYear()));
-        } else if (Objects.isNull(repairBegin) && Objects.nonNull(repairEnd)) {
-            request.setRepairBegin(repairEnd.plusDays(0 - DateUtils.daysOfYear()));
-        } else {
-            request.setRepairBegin(LocalDate.now().plusDays(0 - DateUtils.daysOfYear()));
-            request.setRepairEnd(LocalDate.now());
-        }
+        //不做查询时间区间检查
+//        LocalDate repairBegin = request.getRepairBegin();
+//        LocalDate repairEnd = request.getRepairEnd();
+//        if (Objects.nonNull(repairBegin) && Objects.nonNull(repairEnd)) {
+//            long until = repairEnd.until(repairBegin, ChronoUnit.DAYS);
+//            Validate.notTrue(until > DateUtils.daysOfYear(), "最多只允许查询间隔" + DateUtils.daysOfYear() + "天的记录");
+//        } else if (Objects.nonNull(repairBegin) && Objects.isNull(repairEnd)) {
+//            request.setRepairEnd(repairBegin.plusDays(DateUtils.daysOfYear()));
+//        } else if (Objects.isNull(repairBegin) && Objects.nonNull(repairEnd)) {
+//            request.setRepairBegin(repairEnd.plusDays(0 - DateUtils.daysOfYear()));
+//        } else {
+//            request.setRepairBegin(LocalDate.now().plusDays(0 - DateUtils.daysOfYear()));
+//            request.setRepairEnd(LocalDate.now());
+//        }
         IPage<RepairResponse> pages = emergencyRepairService.pageByCondition(request);
         long count = emergencyRepairService.countByCondition(request);
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -381,7 +380,7 @@ public class EmergencyRepairController {
         LocalDateTime assignTime = entity.getAssignTime();
         LocalDateTime takingTime = request.getTakingTime();
         if(Objects.nonNull(assignTime)){
-            Validate.isTrue(assignTime.isBefore(takingTime), String.format(ValuePool.EMERGENCY_PROCESS_TIME_ILLEGAL,"派单时间", assignTime, assignTime));
+            Validate.isTrue(assignTime.isBefore(takingTime), ValuePool.emergencyProcessTimeIllegal("派单时间", assignTime));
         }
         entity.setTakingTime(takingTime);
         //todo:修改电梯的业务状态为急修中,如果存在维保中，要修改
@@ -425,7 +424,7 @@ public class EmergencyRepairController {
         LocalDateTime takingTime = entity.getTakingTime();
         LocalDateTime arriveTime = request.getArriveTime();
         if(Objects.nonNull(takingTime)){
-            Validate.isTrue(takingTime.isBefore(arriveTime), String.format(ValuePool.EMERGENCY_PROCESS_TIME_ILLEGAL,"接单时间", takingTime, takingTime));
+            Validate.isTrue(takingTime.isBefore(arriveTime), ValuePool.emergencyProcessTimeIllegal("接单时间", takingTime));
         }
         entity.setArriveTime(arriveTime);
         entity.setPosition(request.getPosition());
@@ -469,7 +468,7 @@ public class EmergencyRepairController {
         LocalDateTime arriveTime = entity.getArriveTime();
         LocalDateTime stopDate = request.getStopDate();
         if(Objects.nonNull(arriveTime)){
-            Validate.isTrue(arriveTime.isBefore(stopDate), String.format(ValuePool.EMERGENCY_PROCESS_TIME_ILLEGAL,"到达时间", arriveTime, arriveTime));
+            Validate.isTrue(arriveTime.isBefore(stopDate), ValuePool.emergencyProcessTimeIllegal("到达时间", arriveTime));
         }
         entity.setStopDate(stopDate);
         entity.setSafetyConfirm(request.getSafetyConfirm());
@@ -661,7 +660,7 @@ public class EmergencyRepairController {
         LocalDateTime stopDate = entity.getStopDate();
         LocalDateTime recoveryDate = request.getRecoveryDate();
         if(Objects.nonNull(stopDate)){
-            Validate.isTrue(stopDate.isBefore(recoveryDate), String.format(ValuePool.EMERGENCY_PROCESS_TIME_ILLEGAL,"停梯时间", stopDate, stopDate));
+            Validate.isTrue(stopDate.isBefore(recoveryDate), ValuePool.emergencyProcessTimeIllegal("停梯时间", stopDate));
         }
         List<ErRecordImg> erRecordImgs = new ArrayList<>();
         List<String> erRecordImg = request.getErRecordImg();

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -120,6 +120,12 @@
             <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
                 AND er.mt_company_id = #{cond.mtCompanyId}
             </if>
+            <if test="cond.repairBegin != null">
+                AND date(er.caller_date) &gt;= #{cond.repairBegin}
+            </if>
+            <if test="cond.repairEnd != null">
+                AND date(er.caller_date) &lt;= #{cond.repairEnd}
+            </if>
         </where>
     </select>
 

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

@@ -1,5 +1,8 @@
 package cn.com.ty.lift.common.utils;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Objects;
 
 /**
@@ -185,11 +188,21 @@ public interface ValuePool {
      */
     int      INSPECTION_STAGE_CERT_REPORT_UNQUALIFIED = 10;
     String   INSPECTION_NOT_EXIST                     = "年检不存在，请确认年检计划";
-    String   INSPECTION_STEP_TO_NEXT                  = "请先完成%s再进行%s操作";
-    String   INSPECTION_CURRENT_STEP_STATUS_ILLEGAL   = "年检当前状态(%s)，不能进行%s操作";
-    String   INSPECTION_NEW_STEP_STATUS_ILLEGAL       = "年检新状态(%s)，不能进行%s操作";
-    String   INSPECTION_LAST_PLAN_DATE                = "上次年检时间%tF，下次年检设置%tF之前有效";
-    String   INSPECTION_MUST_ON_STEP                  = "年检必须在%s才能操作";
+    static String inspectionStepToNext(String previous, String current){
+        return String.format("请先完成%s再进行%s操作", previous, current);
+    }
+    static String inspectionCurrentStepStatusIllegal(int currentStepStatus, String step){
+        return String.format("年检当前状态(%s)，不能进行%s操作", currentStepStatus, step);
+    }
+    static String inspectionNewStepStatusIllegal(int newStepStatus, String step){
+        return String.format("年检新状态(%s)，不能进行%s操作", newStepStatus, step);
+    }
+    static String inspectionLastPlanDate(LocalDate previous, LocalDate deadline){
+        return String.format("上次年检时间%tF，下次年检设置%tF之前有效", previous, deadline);
+    }
+    static String inspectionMustOnStage(String stage){
+        return String.format("年检必须在%s才能操作", stage);
+    }
     String   INSPECTION_EXIST_SAME                    = "年检计划已存在。";
     //===================急修相关状态值和判断方法======================================
     /**
@@ -223,7 +236,9 @@ public interface ValuePool {
     String   EMERGENCY_HAD_EVALUATE                   = "急修已经评价了";
     String   EMERGENCY_COST_INCORRECT_AMOUNT          = "急修收费项金额有误";
     String   EMERGENCY_LIFT_IS_IN_INSPECTION          = "电梯正在年检中,无法创建急修";
-    String   EMERGENCY_PROCESS_TIME_ILLEGAL           = "急修处理时间不能早于上次操作时间(%s: %tF %tT)";
+    static String emergencyProcessTimeIllegal(String options, LocalDateTime optionsTime){
+        return String.format("急修处理时间不能早于上次操作时间(%s: %tF %tT)", options, optionsTime, optionsTime);
+    }
     //===================上传相关状态值和判断方法======================================
     /**
      * 图片上传最大大小10M * 1024 * 1024
@@ -266,9 +281,15 @@ public interface ValuePool {
     String   ATTEND_SET_AM_TIME                       = "请设置上午的上/下班时间";
     String   ATTEND_SET_PM_TIME                       = "请设置下午的上/下班时间";
     String   ATTEND_SET_OT_TIME                       = "请设置加班的上/下班时间";
-    String   ATTEND_INVALID_AM_TIME                   = "上午的上(%tT)/下班(%tT)时间有误";
-    String   ATTEND_INVALID_PM_TIME                   = "下午的上(%tT)/下班(%tT)时间有误";
-    String   ATTEND_INVALID_OT_TIME                   = "加班的上(%tT)/下班(%tT)时间有误";
+    static String attendInvalidAmTime(LocalTime topTime, LocalTime downTime){
+        return String.format("上午的上(%tT)/下班(%tT)时间有误", topTime, downTime);
+    }
+    static String attendInvalidPmTime(LocalTime topTimePm, LocalTime downTimePm){
+        return String.format("下午的上(%tT)/下班(%tT)时间有误", topTimePm, downTimePm);
+    }
+    static String attendInvalidOtTime(LocalTime topTimeOt, LocalTime downTimeOt){
+        return String.format("加班的上(%tT)/下班(%tT)时间有误", topTimeOt, downTimeOt);
+    }
     String   ATTEND_AM_TOP_CLOCK                      = "上午上班打卡";
     String   ATTEND_AM_DOWN_CLOCK                     = "上午下班打卡";
     String   ATTEND_PM_TOP_CLOCK                      = "下午上班打卡";
@@ -277,8 +298,12 @@ public interface ValuePool {
     String   ATTEND_OT_DOWN_CLOCK                     = "加班下班打卡";
     String   ATTEND_HAD_CLOCK                         = "打卡记录已存在。";
     String   ATTEND_MISSING_TIME                      = "请至少设置一组打卡时间";
-    String   ATTEND_AM_DOWN_PM_TOP                    = "下午的上班(%tT)时间不得早于上午的下班(%tT)时间";
-    String   ATTEND_PM_DOWN_OT_TOP                    = "加班的上班(%tT)时间不得早于下午的下班(%tT)时间";
+    static String attendAmDownPmTop(LocalTime downTime, LocalTime topTimePm){
+        return String.format("下午的上班(%tT)时间不得早于上午的下班(%tT)时间", topTimePm, downTime);
+    }
+    static String attendPmDownOtTop(LocalTime downTimePm, LocalTime topTimeOt){
+        return String.format("加班的上班(%tT)时间不得早于下午的下班(%tT)时间", topTimeOt, downTimePm);
+    }
     String   ATTEND_MAINTAIN_COMPANY_MISSING          = "维保公司不存在，请核查";
     String   ATTEND_MISSING                           = "打卡记录不存在，请核查";
     String   ATTEND_UNKNOWN_TYPE                      = "打卡类型未知，请核查";

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

@@ -95,10 +95,10 @@ public class AttendanceController {
     public RestResponse list(@Val @RequestBody AttendanceRequest request) {
         //签到管理: 按日期和打卡时间由近及远排序
         request.addDesc("create_date");
-        if (Objects.isNull(request.getClockTime())) {
-            request.setBegin(LocalDate.now().plusDays(0 - DateUtils.daysOfYear()));
-            request.setEnd(LocalDate.now());
-        }
+//        if (Objects.isNull(request.getClockTime())) {
+//            request.setBegin(LocalDate.now().plusDays(0 - DateUtils.daysOfYear()));
+//            request.setEnd(LocalDate.now());
+//        }
         IPage<AttendanceResponse> pages = attendanceService.pageByCondition(request);
         long count = attendanceService.countByMtCompany(request.getMtCompanyId());
         return RestResponse.success(CountPage.getCountPage(count, pages));
@@ -121,7 +121,7 @@ public class AttendanceController {
         //上下班时间成对设置
         Validate.notTrue(top ^ down, ValuePool.ATTEND_SET_AM_TIME);
         if (am) {
-            Validate.notTrue(topTime.isAfter(downTime), String.format(ValuePool.ATTEND_INVALID_AM_TIME, topTime, downTime));
+            Validate.notTrue(topTime.isAfter(downTime), ValuePool.attendInvalidAmTime(topTime, downTime));
         }
 
         LocalTime topTimePm = request.getTopTimePm();
@@ -131,11 +131,11 @@ public class AttendanceController {
         boolean pm = topPm && downPm;
         Validate.notTrue(topPm ^ downPm, ValuePool.ATTEND_SET_PM_TIME);
         if (pm) {
-            Validate.notTrue(topTimePm.isAfter(downTimePm), String.format(ValuePool.ATTEND_INVALID_PM_TIME, topTimePm, downTimePm));
+            Validate.notTrue(topTimePm.isAfter(downTimePm), ValuePool.attendInvalidPmTime(topTimePm, downTimePm));
         }
         //上午下班 < 下午上班
         if (down && topPm) {
-            Validate.notTrue(downTime.isAfter(topTimePm), String.format(ValuePool.ATTEND_AM_DOWN_PM_TOP, topTimePm, downTime));
+            Validate.notTrue(downTime.isAfter(topTimePm), ValuePool.attendAmDownPmTop(downTime, topTimePm));
         }
 
         LocalTime topTimeOt = request.getTopTimeOt();
@@ -145,11 +145,11 @@ public class AttendanceController {
         boolean ot = topOt && downOt;
         Validate.notTrue(topOt ^ downOt, ValuePool.ATTEND_SET_OT_TIME);
         if (ot) {
-            Validate.notTrue(topTimeOt.isAfter(downTimeOt), String.format(ValuePool.ATTEND_INVALID_OT_TIME, topTimeOt, downTimeOt));
+            Validate.notTrue(topTimeOt.isAfter(downTimeOt), ValuePool.attendInvalidOtTime(topTimeOt, downTimeOt));
         }
         // 下午下班 < 加班上班
         if (downPm && topOt) {
-            Validate.notTrue(downTimePm.isAfter(topTimeOt), String.format(ValuePool.ATTEND_PM_DOWN_OT_TOP, topTimeOt, downTimePm));
+            Validate.notTrue(downTimePm.isAfter(topTimeOt), ValuePool.attendPmDownOtTop(downTimePm, topTimeOt));
         }
         //三组时间至少设置一组
         Validate.isTrue(am || pm || ot, ValuePool.ATTEND_MISSING_TIME);

lift-enterprise-service/src/main/resources/mapper/oa/AttendanceMapper.xml

@@ -97,10 +97,10 @@
 				AND date(att.create_date) = #{cond.clockTime}
 			</if>
 			<if test="cond.begin != null">
-				AND att.create_date &gt; #{cond.begin}
+				AND date(att.create_date) &gt; #{cond.begin}
 			</if>
 			<if test="cond.end != null">
-				AND att.create_date &lt; #{cond.end}
+				AND date(att.create_date) &lt; #{cond.end}
 			</if>
 		</where>
 	</select>