smart.git - Gitblit

			@@ -115,483 +115,6 @@
			@Autowired
			private BladeRedis bladeRedis;

			private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
			String implMethodName = lambda.getImplMethodName();
			boolean z = true;
			switch (implMethodName.hashCode()) {
			case -2138899559:
			if (implMethodName.equals("getStartTime")) {
			z = true;
			break;
			}
			break;
			case -570382830:
			if (implMethodName.equals("getEndTime")) {
			z = true;
			break;
			}
			break;
			case -75622813:
			if (implMethodName.equals("getCode")) {
			z = true;
			break;
			}
			break;
			case -75106384:
			if (implMethodName.equals("getType")) {
			z = true;
			break;
			}
			break;
			case -74977101:
			if (implMethodName.equals("getYear")) {
			z = true;
			break;
			}
			break;
			case 98245393:
			if (implMethodName.equals("getId")) {
			z = true;
			break;
			}
			break;
			case 130933999:
			if (implMethodName.equals("getCalendarId")) {
			z = false;
			break;
			}
			break;
			case 771206363:
			if (implMethodName.equals("getTenantId")) {
			z = true;
			break;
			}
			break;
			case 803533544:
			if (implMethodName.equals("getStatus")) {
			z = true;
			break;
			}
			break;
			case 819871107:
			if (implMethodName.equals("getCalendarDayId")) {
			z = true;
			break;
			}
			break;
			case 883740710:
			if (implMethodName.equals("getShiftType")) {
			z = true;
			break;
			}
			break;
			case 1273356481:
			if (implMethodName.equals("getCalendarCode")) {
			z = true;
			break;
			}
			break;
			case 1273373314:
			if (implMethodName.equals("getCalendarDate")) {
			z = true;
			break;
			}
			break;
			case 1984111180:
			if (implMethodName.equals("getCalendarCodeWaiting")) {
			z = true;
			break;
			}
			break;
			}
			switch (z) {
			case false:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarId();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDay") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDate;")) {
			return (v0) -> {
			return v0.getCalendarDate();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCalendarCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCalendarCode();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getShiftType();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getId();
			};
			}
			break;
			case RegionCache.VILLAGE_LEVEL /* 5 */:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getStatus();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getStatus();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getStatus();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getStatus();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getTenantId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getTenantId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getTenantId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getTenantId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getTenantId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getTenantId();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getTenantId();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCalendarCodeWaiting();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCalendarCodeWaiting();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
			return (v0) -> {
			return v0.getEndTime();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getYear();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/Workstation") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
			return (v0) -> {
			return v0.getType();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
			return (v0) -> {
			return v0.getStartTime();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
			return (v0) -> {
			return v0.getStartTime();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
			return (v0) -> {
			return v0.getStartTime();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
			return (v0) -> {
			return v0.getStartTime();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
			return (v0) -> {
			return v0.getStartTime();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/time/LocalDateTime;")) {
			return (v0) -> {
			return v0.getStartTime();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendar") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
			return (v0) -> {
			return v0.getCode();
			};
			}
			break;
			case true:
			if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/cps/entity/ProductionCalendarDaytime") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
			return (v0) -> {
			return v0.getCalendarDayId();
			};
			}
			break;
			}
			throw new IllegalArgumentException("Invalid lambda deserialization");
			}

			@Override // org.springblade.modules.cps.service.ICalendarService
			@Transactional(rollbackFor = {Exception.class})
			public ProductionCalendar saveCalendar(CalendarSaveVO calendarSaveVO) {
			@@ -743,13 +266,20 @@
			}).distinct().collect(Collectors.toList());
			Map<Long, ShiftVO> shiftDetailMap = this.shiftModelService.getShiftDetail(modelIds);
			Snowflake snowflake = IdUtil.createSnowflake(1L, 1L);

			List<ProductionCalendarDaytime> todayDateTimeList = this.calendarDaytimeService.list(new QueryWrapper<ProductionCalendarDaytime>().lambda()
			.eq(ProductionCalendarDaytime::getCalendarDate, LocalDate.now())
			.eq(ProductionCalendarDaytime::getCalendarId, calendarId)
			.orderByAsc(ProductionCalendarDaytime::getStartTime));

			/*
			List<ProductionCalendarDaytime> todayDateTimeList = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarDate();
			}, LocalDate.now())).eq((v0) -> {
			return v0.getCalendarId();
			}, calendarId)).orderByAsc((v0) -> {
			return v0.getStartTime();
			}));
			}));*/
			List<ProductionCalendarDaytime> curProductionCalendarDayTimeList = new ArrayList<>();
			LocalDate lastDayOfYear = LocalDateTimeUtils.getLastDayOfYear(LocalDate.now());
			long difference = year.intValue() == LocalDate.now().getYear() ? LocalDateTimeUtils.getDifference(LocalDate.now(), lastDayOfYear).intValue() : LocalDateTimeUtils.getDayOfYear(year).intValue() - 1;
			@@ -832,6 +362,12 @@
			private void handleFirstDayOfYear(ProductionCalendar productionCalendar, List<ProductionCalendarDaytime> productionCalendarDaytimeList, LocalDate needHandleDate) {
			Integer year = productionCalendar.getYear();
			List<ProductionCalendarDaytime> lastYearDateTimeList = new ArrayList<>();

			ProductionCalendar item = (ProductionCalendar)(this.baseMapper.selectOne((new QueryWrapper<ProductionCalendar>()).lambda()
			.eq(ProductionCalendar::getStatus, ProductionTimeConstant.ENABLE)
			.eq(ProductionCalendar::getCode, productionCalendar.getCode())
			.eq(ProductionCalendar::getYear, Integer.valueOf(year.intValue() - 1))));
			/*
			ProductionCalendar item = (ProductionCalendar) this.baseMapper.selectOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getStatus();
			}, ProductionTimeConstant.ENABLE)).eq((v0) -> {
			@@ -839,14 +375,20 @@
			}, productionCalendar.getCode())).eq((v0) -> {
			return v0.getYear();
			}, Integer.valueOf(year.intValue() - 1)));
			*/
			if (Func.isNotEmpty(item)) {
			lastYearDateTimeList = this.calendarDaytimeService.list(new QueryWrapper<ProductionCalendarDaytime>().lambda()
			.eq(ProductionCalendarDaytime::getCalendarDate, LocalDate.of(productionCalendar.getYear().intValue() - 1, 12, 31))
			.eq(ProductionCalendarDaytime::getCalendarId, item.getId())
			.orderByAsc(ProductionCalendarDaytime::getStartTime));
			/*
			lastYearDateTimeList = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarDate();
			}, LocalDate.of(productionCalendar.getYear().intValue() - 1, 12, 31))).eq((v0) -> {
			return v0.getCalendarId();
			}, item.getId())).orderByAsc((v0) -> {
			return v0.getStartTime();
			}));
			}));*/
			}
			ProductionCalendarDaytime firstDateTime = productionCalendarDaytimeList.get(0);
			if (!Func.isNotEmpty(lastYearDateTimeList)) {
			@@ -907,6 +449,11 @@
			new ProductionCalendarDaytime();
			List<ProductionCalendarDaytime> nextYearDateTimeList = new ArrayList<>();
			if (i == 0) {
			ProductionCalendar item =this.baseMapper.selectOne(new QueryWrapper<ProductionCalendar>().lambda()
			.eq(ProductionCalendar::getStatus, ProductionTimeConstant.ENABLE)
			.eq(ProductionCalendar::getCode, code)
			.eq(ProductionCalendar::getYear, Integer.valueOf(year.intValue() + 1)));
			/*
			ProductionCalendar item = (ProductionCalendar) this.baseMapper.selectOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getStatus();
			}, ProductionTimeConstant.ENABLE)).eq((v0) -> {
			@@ -914,14 +461,20 @@
			}, code)).eq((v0) -> {
			return v0.getYear();
			}, Integer.valueOf(year.intValue() + 1)));
			*/
			if (Func.isNotEmpty(item)) {
			nextYearDateTimeList = this.calendarDaytimeService.list(new QueryWrapper<ProductionCalendarDaytime>().lambda()
			.eq(ProductionCalendarDaytime::getCalendarDate, LocalDate.of(year.intValue() + 1, 1, 1))
			.eq(ProductionCalendarDaytime::getCalendarId, item.getId())
			.orderByAsc(ProductionCalendarDaytime::getStartTime));
			/*
			nextYearDateTimeList = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarDate();
			}, LocalDate.of(year.intValue() + 1, 1, 1))).eq((v0) -> {
			return v0.getCalendarId();
			}, item.getId())).orderByAsc((v0) -> {
			return v0.getStartTime();
			}));
			}));*/
			}
			if (Func.isNotEmpty(nextYearDateTimeList)) {
			nextProductionDayTime = nextYearDateTimeList.get(0);
			@@ -1089,6 +642,16 @@
			CalendarVO calendarDetail = this.baseMapper.getCalendarDetail(calendarId);
			List<CalendarDayVO> otherCalendarDayVOList = new ArrayList<>();
			Integer year = calendarDetail.getYear();

			Optional.<ProductionCalendar>ofNullable(getOne(new QueryWrapper<ProductionCalendar>().lambda()
			.eq(ProductionCalendar::getCode, calendarDetail.getCode())
			.eq(ProductionCalendar::getYear, year+ 1)))
			.ifPresent(productionCalendar -> {
			List<ProductionCalendarDay> list = this.calendarDayService.list(new QueryWrapper<ProductionCalendarDay>().lambda().eq(ProductionCalendarDay::getCalendarId, productionCalendar.getId()).in(ProductionCalendarDay::getCalendarDate, new Object[] { LocalDate.of(year.intValue() + 1, 1, 1), LocalDate.of(year.intValue() + 1, 1, 2) }));
			entityToVo(otherCalendarDayVOList, list);
			});

			/*
			Optional.ofNullable(getOne((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCode();
			}, calendarDetail.getCode())).eq((v0) -> {
			@@ -1100,7 +663,17 @@
			return v0.getCalendarDate();
			}, new Object[]{LocalDate.of(year.intValue() + 1, 1, 1), LocalDate.of(year.intValue() + 1, 1, 2)}));
			entityToVo(otherCalendarDayVOList, list);
			});
			});*/

			Optional.<ProductionCalendar>ofNullable(getOne(new QueryWrapper<ProductionCalendar>().lambda()
			.eq(ProductionCalendar::getCode, calendarDetail.getCode())
			.eq(ProductionCalendar::getYear, year.intValue() - 1)))
			.ifPresent(productionCalendar -> {
			List<ProductionCalendarDay> list = this.calendarDayService.list(new QueryWrapper<ProductionCalendarDay>().lambda().eq(ProductionCalendarDay::getCalendarId, productionCalendar.getId()).in(ProductionCalendarDay::getCalendarDate, new Object[] { LocalDate.of(year.intValue() - 1, 12, 30), LocalDate.of(year.intValue() - 1, 12, 31) }));
			entityToVo(otherCalendarDayVOList, list);
			});

			/*
			Optional.ofNullable(getOne((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCode();
			}, calendarDetail.getCode())).eq((v0) -> {
			@@ -1113,6 +686,7 @@
			}, new Object[]{LocalDate.of(year.intValue() - 1, 12, 30), LocalDate.of(year.intValue() - 1, 12, 31)}));
			entityToVo(otherCalendarDayVOList, list);
			});
			*/
			calendarDetail.setOtherCalendarDayVOList(otherCalendarDayVOList);
			return calendarDetail;
			}
			@@ -1140,6 +714,11 @@
			}

			public void checkCalendar(CalendarSaveVO calendarSaveVO, String tenantId) {
			ProductionCalendar productionCalendar = getOne(Wrappers.<ProductionCalendar>lambdaQuery()
			.eq(ProductionCalendar::getCode, calendarSaveVO.getCode())
			.eq(ProductionCalendar::getYear, calendarSaveVO.getYear())
			.eq(ProductionCalendar::getTenantId, tenantId));
			/*
			ProductionCalendar productionCalendar = (ProductionCalendar) getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
			return v0.getCode();
			}, calendarSaveVO.getCode())).eq((v0) -> {
			@@ -1147,6 +726,7 @@
			}, calendarSaveVO.getYear())).eq((v0) -> {
			return v0.getTenantId();
			}, tenantId));
			*/
			Optional.ofNullable(productionCalendar).ifPresent(po -> {
			throw new ServiceException(MessageUtils.message("calendar.code.year.has.be.repeated", new Object[0]));
			});
			@@ -1218,6 +798,13 @@
			LocalDate targetDate = cacheBuildDTO.getTargetDate();
			Set<String> tenantIds = cacheBuildDTO.getTenantIds();
			String code = cacheBuildDTO.getCalendarCode();

			List<ProductionCalendar> list = list(new QueryWrapper<ProductionCalendar>().lambda()
			.in(ProductionCalendar::getTenantId, tenantIds)
			.eq(ProductionCalendar::getStatus, ProductionTimeConstant.ENABLE)
			.eq(StringUtils.isNotBlank(code), ProductionCalendar::getCode, code)
			.eq(ProductionCalendar::getYear, Integer.valueOf(targetDate.getYear())));
			/*
			List<ProductionCalendar> list = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().in((v0) -> {
			return v0.getTenantId();
			}, tenantIds)).eq((v0) -> {
			@@ -1226,10 +813,34 @@
			return v0.getCode();
			}, code).eq((v0) -> {
			return v0.getYear();
			}, Integer.valueOf(targetDate.getYear())));
			}, Integer.valueOf(targetDate.getYear())));*/
			LocalDateTime startTime = LocalDateTime.of(targetDate, LocalTime.MIN);
			LocalDateTime endTime = LocalDateTime.of(targetDate.plusDays(1L), LocalTime.of(0, 0));
			if (Func.isNotEmpty(list)) {
			return list.stream()
			.map(productionCalendar -> {

			TimestampToProductionTimeCacheDto timestampToProductionTimeCacheDto = TimestampToProductionTimeCacheDto.builder().TenantId(productionCalendar.getTenantId()).CalendarCode(productionCalendar.getCode()).NaturalDay(targetDate).build();

			List<ProductionCalendarDaytime> dayTimeList = this.calendarDaytimeService.list(new QueryWrapper<ProductionCalendarDaytime>().lambda()
			.eq(ProductionCalendarDaytime::getCalendarId, productionCalendar.getId())
			.or().and(i ->{
			i.between(ProductionCalendarDaytime::getStartTime, startTime, endTime).or().between(ProductionCalendarDaytime::getEndTime, startTime, endTime);
			//return i;
			})
			.orderByAsc(ProductionCalendarDaytime::getStartTime));
			dayTimeList = dayTimeList.stream().filter(productionCalendarDaytime -> {
			return (productionCalendarDaytime.getEndTime().equals(startTime) \|\| productionCalendarDaytime.getStartTime().equals(endTime)) ? false : true;
			}).collect(Collectors.toList());
			Map<Integer, CalendarShiftTimeSlicesDTO> timeSlicesMap = new HashMap<>(1919);
			for (int i = 0; i <= ProductionTimeConstant.MINUTE_STOP.intValue(); i++) {
			buildTimeSlicesMap(startTime, endTime, dayTimeList, timeSlicesMap, i, targetDate);
			}
			timestampToProductionTimeCacheDto.setTimeSlicesDTOMap(timeSlicesMap);
			return timestampToProductionTimeCacheDto;

			}).collect(Collectors.toList());
			/*
			return (List) list.stream().map(productionCalendar -> {
			TimestampToProductionTimeCacheDto timestampToProductionTimeCacheDto = TimestampToProductionTimeCacheDto.builder().TenantId(productionCalendar.getTenantId()).CalendarCode(productionCalendar.getCode()).NaturalDay(targetDate).build();
			List<ProductionCalendarDaytime> dayTimeList = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			@@ -1253,6 +864,7 @@
			timestampToProductionTimeCacheDto.setTimeSlicesDTOMap(timeSlicesMap);
			return timestampToProductionTimeCacheDto;
			}).collect(Collectors.toList());
			*/
			}
			return Lists.newArrayList();
			}
			@@ -1279,6 +891,15 @@

			@Override // org.springblade.modules.cps.service.ICalendarService
			public List<CalendarSimpleVO> getCalendarList(String tenantId) {
			return list(Wrappers.<ProductionCalendar>query().lambda()
			.eq(ProductionCalendar::getTenantId, tenantId))
			.stream()
			.map(productionCalendar -> {
			CalendarSimpleVO calendarSimpleVO = new CalendarSimpleVO();
			BeanUtils.copyProperties(productionCalendar, calendarSimpleVO);
			return calendarSimpleVO;
			}).collect(Collectors.toList());
			/*
			return (List) list((Wrapper) Wrappers.query().lambda().eq((v0) -> {
			return v0.getTenantId();
			}, tenantId)).stream().map(productionCalendar -> {
			@@ -1286,23 +907,17 @@
			BeanUtils.copyProperties(productionCalendar, calendarSimpleVO);
			return calendarSimpleVO;
			}).collect(Collectors.toList());
			*/
			}

			@Override // org.springblade.modules.cps.service.ICalendarService
			public List<CalendarShiftDetailDTO> getDaytimeList(String tenantId, String calendarCode, Integer year) {
			List<CalendarShiftDetailDTO> result = new ArrayList<>();
			Optional.ofNullable(getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCode();
			}, calendarCode)).eq((v0) -> {
			return v0.getTenantId();
			}, Long.valueOf(tenantId))).eq((v0) -> {
			return v0.getYear();
			}, year))).ifPresent(calendar -> {
			List<ProductionCalendarDaytime> list = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarId();
			}, calendar.getId())).eq((v0) -> {
			return v0.getCalendarDate();
			}, LocalDate.now()));
			Optional.ofNullable(getOne(new QueryWrapper<ProductionCalendar>().lambda()
			.eq(ProductionCalendar::getCode, calendarCode)
			.eq(ProductionCalendar::getTenantId, Long.valueOf(tenantId))
			.eq(ProductionCalendar::getYear, year))).ifPresent(calendar -> {
			List<ProductionCalendarDaytime> list = this.calendarDaytimeService.list(new QueryWrapper<ProductionCalendarDaytime>().lambda().eq(ProductionCalendarDaytime::getCalendarId, calendar.getId()).eq(ProductionCalendarDaytime::getCalendarDate, LocalDate.now()));
			if (Func.isNotEmpty(list)) {
			list.forEach(productionCalendarDaytime -> {
			CalendarShiftDetailDTO calendarShiftDetailDTO = new CalendarShiftDetailDTO();
			@@ -1327,28 +942,35 @@
			List<CalendarCacheDTO> calendarCacheDTOList = new LinkedList<>();
			LocalDate targetDate = cacheBuildDTO.getTargetDate();
			Set<String> tenantIds = cacheBuildDTO.getTenantIds();

			List<ProductionCalendar> list = list(new QueryWrapper<ProductionCalendar>().lambda()
			.in(ProductionCalendar::getTenantId, tenantIds)
			.eq(ProductionCalendar::getYear, targetDate.getYear()));
			/*
			List<ProductionCalendar> list = list((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().in((v0) -> {
			return v0.getTenantId();
			}, tenantIds)).eq((v0) -> {
			return v0.getYear();
			}, Integer.valueOf(targetDate.getYear())));
			*/
			if (Func.isNotEmpty(list)) {
			Map<String, List<ProductionCalendar>> collect = list.stream().collect(Collectors.groupingBy(ProductionCalendar::getTenantId));
			/*
			Map<String, List<ProductionCalendar>> collect = (Map) list.stream().collect(Collectors.groupingBy((v0) -> {
			return v0.getTenantId();
			}));
			collect.forEach(tenantId, productionList -> {
			}));*/

			collect.forEach((tenantId, productionList) -> {
			productionList.forEach(productionCalendar -> {
			log.info("处理的租户：{},处理的日历code:{}", tenantId, productionCalendar.getCode());
			List<ProductionCalendarDaytime> dayTimeList = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarId();
			}, productionCalendar.getId())).eq((v0) -> {
			return v0.getCalendarDate();
			}, targetDate)).orderByAsc((v0) -> {
			return v0.getStartTime();
			}));
			List<ProductionCalendarDaytime> dayTimeList = this.calendarDaytimeService.list(new QueryWrapper<ProductionCalendarDaytime>().lambda()
			.eq(ProductionCalendarDaytime::getCalendarId, productionCalendar.getId())
			.eq(ProductionCalendarDaytime::getCalendarDate, targetDate)
			.orderByAsc(ProductionCalendarDaytime::getStartTime));

			if (Func.isNotEmpty(dayTimeList)) {
			CalendarCacheDTO calendarCacheDTO = CalendarCacheDTO.builder().tenantId(tenantId).calendarCode(productionCalendar.getCode()).factoryDate(DateUtil.formatDate(targetDate)).factoryMonth(dayTimeList.get(0).getMonth()).factoryWeek(dayTimeList.get(0).getWeek()).factoryYear(dayTimeList.get(0).getYear()).build();
			List<ShiftCacheDTO> shiftCacheDTOList = (List) dayTimeList.stream().map(dayTime -> {
			List<ShiftCacheDTO> shiftCacheDTOList = dayTimeList.stream().map(dayTime -> {
			return ShiftCacheDTO.builder().shiftIndex(dayTime.getShiftIndex()).shiftTimeType(dayTime.getShiftType()).startTime(Long.valueOf(dayTime.getStartTime().toInstant(ZoneOffset.of("+8")).toEpochMilli())).endTime(Long.valueOf(dayTime.getEndTime().toInstant(ZoneOffset.of("+8")).toEpochMilli())).build();
			}).collect(Collectors.toList());
			calendarCacheDTO.setShiftCacheDTOS(shiftCacheDTOList);
			@@ -1362,23 +984,26 @@

			@Override // org.springblade.modules.cps.service.ICalendarService
			public List<CurShiftDTO> getCurShift(String tenantId, List<String> calendarCodeList) {
			List<ProductionCalendar> list = list(new QueryWrapper<ProductionCalendar>().lambda()
			.in(ProductionCalendar::getCode, calendarCodeList)
			.eq(ProductionCalendar::getYear, LocalDateTimeUtils.getYear(LocalDate.now()))
			.eq(ProductionCalendar::getTenantId, tenantId));
			/*
			List<ProductionCalendar> list = list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().in((v0) -> {
			return v0.getCode();
			}, calendarCodeList)).eq((v0) -> {
			return v0.getYear();
			}, LocalDateTimeUtils.getYear(LocalDate.now()))).eq((v0) -> {
			return v0.getTenantId();
			}, tenantId));
			}, tenantId));*/
			List<CurShiftDTO> curShiftDTOS = new ArrayList<>();
			if (Func.isNotEmpty(list)) {
			list.forEach(productionCalendar -> {
			CurShiftDTO curShiftDTO = new CurShiftDTO();
			CurShiftDTO curShiftDTO = new CurShiftDTO();//ProductionCalendarDay::getCalendarDate
			curShiftDTO.setCalendarCode(productionCalendar.getCode());
			ProductionCalendarDay one = (ProductionCalendarDay) this.calendarDayService.getOne((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarId();
			}, productionCalendar.getId())).eq((v0) -> {
			return v0.getCalendarDate();
			}, LocalDate.now()));
			ProductionCalendarDay one = this.calendarDayService.getOne(new QueryWrapper<ProductionCalendarDay>().lambda()
			.eq(ProductionCalendarDay::getCalendarId, productionCalendar.getId())
			.eq(ProductionCalendarDay::getCalendarDate, LocalDate.now()));
			if (Func.isNull(one)) {
			curShiftDTO.setShiftIndex(-1);
			} else {
			@@ -1410,7 +1035,7 @@
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DateConstant.PATTERN_DATE);
			String str = LocalDate.now().format(formatter);
			calendarCodeList.forEach(calendarCode -> {
			String redisKey = CommonUtil.getReallyCacheName(TimeSliceCache.CALENDAR_CACHE, TimeSliceCache.CALENDARS_CODE.concat(calendarCode).concat(SystemPropertyUtils.VALUE_SEPARATOR).concat(TimeSliceCache.MINUTE_POINT), str);
			String redisKey = CommonUtil.getReallyCacheName(TimeSliceCache.CALENDAR_CACHE, TimeSliceCache.CALENDARS_CODE.concat(calendarCode).concat(":").concat(TimeSliceCache.MINUTE_POINT), str);
			CalendarShiftTimeSlicesDTO calendarShiftTimeSlicesDTO = (CalendarShiftTimeSlicesDTO) this.bladeRedis.hGet(redisKey, minute);
			if (Func.isNotEmpty(calendarShiftTimeSlicesDTO)) {
			FactoryDayInfoDTO factoryDayInfoDTO = FactoryDayInfoDTO.builder().calendarCode(calendarCode).factoryDay(LocalDate.parse(calendarShiftTimeSlicesDTO.getFactoryDate(), formatter)).build();
			@@ -1418,8 +1043,15 @@
			}
			});
			if (Func.isEmpty(factoryDayInfoDTOList)) {
			return new HashMap(16);
			return new HashMap<>(16);
			}
			Map<String, Long> map = list(new QueryWrapper<ProductionCalendar>().lambda()
			.eq(ProductionCalendar::getYear, Integer.valueOf(date.getYear()))
			.in(ProductionCalendar::getCode, calendarCodeList)
			.eq(ProductionCalendar::getTenantId, tenantId))
			.stream()
			.collect(Collectors.toMap(ProductionCalendar::getCode, ProductionCalendar::getId));
			/*
			Map<String, Long> map = (Map) list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getYear();
			}, Integer.valueOf(date.getYear()))).in((v0) -> {
			@@ -1430,23 +1062,18 @@
			return v0.getCode();
			}, (v0) -> {
			return v0.getId();
			}));
			return (Map) factoryDayInfoDTOList.stream().peek(fac -> {
			Long id = (Long) map.get(fac.getCalendarCode());
			ProductionCalendarDay productionCalendarDay = (ProductionCalendarDay) this.calendarDayService.getOne((Wrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarDate();
			}, fac.getFactoryDay())).eq((v0) -> {
			return v0.getCalendarId();
			}, id));
			}));*/
			//ProductionCalendarDay::getCalendarId
			return factoryDayInfoDTOList.stream().peek(fac -> {
			Long id = map.get(fac.getCalendarCode());
			ProductionCalendarDay productionCalendarDay = this.calendarDayService.getOne(new QueryWrapper<ProductionCalendarDay>().lambda()
			.eq(ProductionCalendarDay::getCalendarDate, fac.getFactoryDay())
			.eq(ProductionCalendarDay::getCalendarId, id));
			if (Func.isNotEmpty(productionCalendarDay)) {
			fac.setStartTime(productionCalendarDay.getStartTime());
			fac.setEndTime(productionCalendarDay.getEndTime());
			}
			}).collect(Collectors.toMap((v0) -> {
			return v0.getCalendarCode();
			}, v -> {
			return v;
			}));
			}).collect(Collectors.toMap(FactoryDayInfoDTO::getCalendarCode, v -> v));
			}

			@Override // org.springblade.modules.cps.service.ICalendarService
			@@ -1489,28 +1116,34 @@

			@Override // org.springblade.modules.cps.service.ICalendarService
			public Long getShiftTimeWithoutRest(String calendarCode) {
			ProductionCalendar productionCalendar = getOne(Wrappers.<ProductionCalendar>lambdaQuery()
			.eq(ProductionCalendar::getCode, calendarCode)
			.eq(ProductionCalendar::getYear, Calendar.getInstance().get(1)));
			/*
			ProductionCalendar productionCalendar = (ProductionCalendar) getOne((Wrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
			return v0.getCode();
			}, calendarCode)).eq((v0) -> {
			return v0.getYear();
			}, Integer.valueOf(Calendar.getInstance().get(1))));
			*/
			if (Func.isEmpty(productionCalendar)) {
			return 0L;
			}
			List<ProductionCalendarDay> list = this.calendarDayService.list(Wrappers.<ProductionCalendarDay>lambdaQuery()
			.eq(ProductionCalendarDay::getCalendarId, productionCalendar.getId()));
			/*
			List<ProductionCalendarDay> list = this.calendarDayService.list((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
			return v0.getCalendarId();
			}, productionCalendar.getId()));
			List<Long> productionCalendarDayIds = (List) list.stream().map((v0) -> {
			}, productionCalendar.getId()));*/
			List<Long> productionCalendarDayIds = list.stream().map((v0) -> {
			return v0.getId();
			}).collect(Collectors.toList());

			LocalDate now = LocalDate.now();
			List<ProductionCalendarDaytime> productionCalendarDaytimeList = this.calendarDaytimeService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().in((v0) -> {
			return v0.getCalendarDayId();
			}, productionCalendarDayIds)).eq((v0) -> {
			return v0.getShiftType();
			}, ProductionTimeConstant.WORK_TIME)).eq((v0) -> {
			return v0.getCalendarDate();
			}, now));
			List<ProductionCalendarDaytime> productionCalendarDaytimeList = this.calendarDaytimeService.list(Wrappers.<ProductionCalendarDaytime>lambdaQuery()
			.in(ProductionCalendarDaytime::getCalendarDayId, productionCalendarDayIds)
			.eq(ProductionCalendarDaytime::getShiftType, ProductionTimeConstant.WORK_TIME)
			.eq(ProductionCalendarDaytime::getCalendarDate, now));
			return Long.valueOf(productionCalendarDaytimeList.stream().mapToLong(productionCalendarDaytime -> {
			return LocalDateTimeUtils.betweenTwoTime(productionCalendarDaytime.getStartTime(), productionCalendarDaytime.getEndTime(), ChronoUnit.SECONDS);
			}).sum());
			@@ -1542,24 +1175,17 @@
			@Override // org.springblade.modules.cps.service.ICalendarService
			@Transactional(rollbackFor = {Exception.class})
			public Boolean deleteCalendar(Long id) {
			//Workstation::getCalendarCodeWaiting
			Optional.ofNullable(getById(id)).ifPresent(calendar -> {
			List<Workstation> list = this.workstationService.list((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) new QueryWrapper().lambda().eq((v0) -> {
			return v0.getCalendarCode();
			}, calendar.getCode())).eq((v0) -> {
			return v0.getStatus();
			}, CommonConstant.ENABLE)).or()).eq((v0) -> {
			return v0.getCalendarCodeWaiting();
			}, calendar.getCode()));
			List<Workstation> list = this.workstationService.list(new QueryWrapper<Workstation>().lambda()
			.eq(Workstation::getCalendarCode, calendar.getCode()).eq(Workstation::getStatus, CommonConstant.ENABLE).or()
			.eq(Workstation::getCalendarCodeWaiting, calendar.getCode()));
			if (Func.isNotEmpty(list)) {
			throw new ServiceException(MessageUtils.message("calendar.has.be.used", new Object[0]));
			}
			removeById(id);
			this.calendarDayService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
			return v0.getCalendarId();
			}, id));
			this.calendarDaytimeService.remove((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
			return v0.getCalendarId();
			}, id));
			this.calendarDayService.remove(Wrappers.<ProductionCalendarDay>lambdaQuery().eq(ProductionCalendarDay::getCalendarId, id));
			this.calendarDaytimeService.remove(Wrappers.<ProductionCalendarDaytime>lambdaQuery().eq(ProductionCalendarDaytime::getCalendarId, id));
			});
			return true;
			}
			@@ -1571,28 +1197,57 @@

			@Override // org.springblade.modules.cps.service.ICalendarService
			public List<ShiftTimeDetailVO> getShiftDetailDates(String calendarCode, List<LocalDate> dates) {

			//ProductionCalendar
			QueryWrapper<Object> wrapper = Wrappers.<Object>query()
			.eq("bpc.is_deleted", 0)
			.eq("bpcd.is_deleted", 0)
			.eq("bpc.code", calendarCode)
			.nested(q -> q.in("bpcd.calendar_date", dates))
			.orderByAsc("calendar_date", "shift_index");
			return this.baseMapper.getShiftDetailDates(wrapper);
			/*
			return this.baseMapper.getShiftDetailDates((QueryWrapper) ((QueryWrapper) ((QueryWrapper) ((QueryWrapper) ((QueryWrapper) Wrappers.query().eq("bpc.is_deleted", 0)).eq("bpcd.is_deleted", 0)).eq("bpc.code", calendarCode)).nested(q -> {
			QueryWrapper queryWrapper = (QueryWrapper) q.in("bpcd.calendar_date", dates);
			})).orderByAsc("calendar_date", new String[]{"shift_index"}));
			})).orderByAsc("calendar_date", new String[]{"shift_index"}));*/
			}

			@Override // org.springblade.modules.cps.service.ICalendarService
			public List<CalendarShiftDTO> getTimeShiftAll(String calendarCode, Date startTime, Date endTime) {
			return this.baseMapper.getTimeShiftAll((QueryWrapper) ((QueryWrapper) ((QueryWrapper) ((QueryWrapper) ((QueryWrapper) ((QueryWrapper) Wrappers.query().eq("bpc.is_deleted", 0)).eq("bpcd.is_deleted", 0)).ne("bsd.shift_index", ProductionTimeConstant.OUT_OF_SHIFT_TIME)).nested(q -> {
			QueryWrapper queryWrapper = (QueryWrapper) q.between("bpcd.calendar_date", DateUtil.formatDate(DateUtil.minusDays(startTime, 1L)), DateUtil.formatDate(DateUtil.plusDays(endTime, 1L)));
			})).eq("bpc.code", calendarCode)).orderByAsc("calendar_date", new String[]{"shift_index"}));

			QueryWrapper<Object> wrapper = Wrappers.query().eq("bpc.is_deleted", 0)
			.eq("bpcd.is_deleted", 0)
			.ne("bsd.shift_index", ProductionTimeConstant.OUT_OF_SHIFT_TIME)
			.nested(q -> q.between("bpcd.calendar_date", DateUtil.formatDate(DateUtil.minusDays(startTime, 1L)), DateUtil.formatDate(DateUtil.plusDays(endTime, 1L)))
			.eq("bpc.code", calendarCode)).orderByAsc("calendar_date", "shift_index" );
			return this.baseMapper.getTimeShiftAll(wrapper);
			/*
			return this.baseMapper.getTimeShiftAll(Wrappers.query().eq("bpc.is_deleted", 0)
			.eq("bpcd.is_deleted", 0))
			.ne("bsd.shift_index", ProductionTimeConstant.OUT_OF_SHIFT_TIME)
			.nested(q -> {
			QueryWrapper queryWrapper = q.between("bpcd.calendar_date", DateUtil.formatDate(DateUtil.minusDays(startTime, 1L)), DateUtil.formatDate(DateUtil.plusDays(endTime, 1L)));
			})).eq("bpc.code", calendarCode)
			.orderByAsc("calendar_date", new String[]{"shift_index"}));
			*/
			}

			@Override // org.springblade.modules.cps.service.ICalendarService
			public List<ShiftIndexInfoDTO> getWorkstationShiftIndexListByDate(Long workstationId, LocalDate localDate) {
			List<ShiftIndexInfoDTO> result = Lists.newArrayList();

			Workstation workstation = (Workstation)this.workstationService.getOne(Wrappers.<Workstation>lambdaQuery()
			.eq(Workstation::getId, workstationId)
			.eq(Workstation::getType, WorkstationTypeEnum.MACHINE.getCode())
			.isNotNull(Workstation::getCalendarCode));
			/*
			Workstation workstation = (Workstation) this.workstationService.getOne((Wrapper) ((LambdaQueryWrapper) ((LambdaQueryWrapper) Wrappers.lambdaQuery().eq((v0) -> {
			return v0.getId();
			}, workstationId)).eq((v0) -> {
			return v0.getType();
			}, WorkstationTypeEnum.MACHINE.getCode())).isNotNull((v0) -> {
			return v0.getCalendarCode();
			}));
			}));*/
			if (Func.isNotEmpty(workstation)) {
			List<ShiftDetailInfoDTO> shiftIndexList = getWorkstationShiftIndexListByDate(workstation.getCalendarCode(), Integer.valueOf(localDate.getYear()), LocalDateTimeUtils.formatTimeLocalDate(localDate, DateConstant.PATTERN_DATE));
			shiftIndexList.forEach(x -> {
			@@ -1634,11 +1289,15 @@

			@Override // org.springblade.modules.cps.service.ICalendarService
			public Boolean associateWorkstation(CalendarAssociateWorkstationVO calendarAssociateWorkstationVO) {
			return this.workstationService.update(Wrappers.<Workstation>lambdaUpdate()
			.set(Workstation::getCalendarCodeWaiting, calendarAssociateWorkstationVO.getCalendarCode())
			.in(Workstation::getId, calendarAssociateWorkstationVO.getWorkstationIdList()));
			/*
			return Boolean.valueOf(this.workstationService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().set((v0) -> {
			return v0.getCalendarCodeWaiting();
			}, calendarAssociateWorkstationVO.getCalendarCode())).in((v0) -> {
			return v0.getId();
			}, calendarAssociateWorkstationVO.getWorkstationIdList())));
			}, calendarAssociateWorkstationVO.getWorkstationIdList())));*/
			}

			@Override // org.springblade.modules.cps.service.ICalendarService