Pārlūkot izejas kodu

解决流程日期问题

wanxl 1 gadu atpakaļ
vecāks
revīzija
7b1976b733

+ 4 - 2
src/main/java/com/template/controller/ApplicationProcedureTemporaryController.java

@@ -91,8 +91,8 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
         if (!list.isEmpty()) {
             int aa =0;
             for (ApplicationProcedureTemporary apt : list) {
-                if (apt.getEndTime().equals(endDto)
-                        || apt.getStartTime().equals(startDto)) {
+                if (apt.getEndTime().substring(0,10).equals(endDto.substring(0,10))
+                        || apt.getStartTime().substring(0,10).equals(startDto.substring(0,10))) {
                     return CommonResult.fail("相同日期已有待审批申请,请勿重复申请");
                 }
                  aa=this.checkWeek(apt.getStartTime(),apt.getEndTime())+aa;
@@ -103,7 +103,9 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 
                 try {
                     boolean a = TimeExchange.CompareDate(apt.getEndTime(), startDto, "yyyy-MM-dd");
+                    a= apt.getEndTime().substring(0, 10).equals(startDto.substring(0,10)) || a;
                     boolean b = TimeExchange.CompareDate(endDto, apt.getStartTime(), "yyyy-MM-dd");
+                    b= apt.getStartTime().substring(0, 10).equals(endDto.substring(0,10)) || b;
                     if (!(a || b)) {
                         return CommonResult.fail("日期范围内已有待审批申请");
                     }