order pay

src/main/java/com/gogirl/application/store/store/impl/TakeLeaveEventCmdServiceImpl.java

@@ -87,8 +87,11 @@ public class TakeLeaveEventCmdServiceImpl implements TakeLeaveEventCmdService {
                     .collect(Collectors.toList());
 
             //检查总调休时间
-            if (!takeLeaveEvent.getTimeLength().toString()
-                    .equals(overTimeRecordLogList.stream().map(OverTimeRecordLog::getLengthTime).reduce(BigDecimal.ZERO, BigDecimal::add).toString())) {
+            if (takeLeaveEvent.getTimeLength()
+                    .compareTo(overTimeRecordLogList.stream().map(OverTimeRecordLog::getLengthTime).reduce(BigDecimal.ZERO, BigDecimal::add)) != 0) {
+
+                log.info("申请时间:{}", takeLeaveEvent.getTimeLength());
+                log.info("选择的时间{},", overTimeRecordLogList.stream().map(OverTimeRecordLog::getLengthTime).reduce(BigDecimal.ZERO, BigDecimal::add));
                 throw new RRException(500, "调休时间有误");
             }
 

src/main/java/com/gogirl/dto/admin/GetTechnicianPageRequest.java

+package com.gogirl.dto.admin;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class GetTechnicianPageRequest {
+
+    private Integer status;
+    private String title;
+
+    private Integer page;
+    private Integer rows;
+
+    private String sidx;
+    private String sort;
+
+    private List<Date> date_utc;
+}