|
@@ -643,6 +643,30 @@ public class ServicePlanServiceImpl extends BaseServiceImpl<ServicePlanMapper, S
|
|
plan.setPlanEndTime(LocalDate.parse(endDate));
|
|
plan.setPlanEndTime(LocalDate.parse(endDate));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ if(dataInfo.containsKey("key_42__3_4")){
|
|
|
|
+ Object o = dataInfo.get("key_42__3_4");
|
|
|
|
+ String startDate = null;
|
|
|
|
+ String endDate = null;
|
|
|
|
+ if (o instanceof List<?>) {
|
|
|
|
+ List<?> list = (List<?>) o;
|
|
|
|
+ if (list.size() >= 2 && list.get(0) instanceof String && list.get(1) instanceof String) {
|
|
|
|
+ startDate = formatDate((String) list.get(0));
|
|
|
|
+ endDate = formatDate((String) list.get(1));
|
|
|
|
+ }
|
|
|
|
+ } else if (o != null && o.getClass().isArray()) {
|
|
|
|
+ Object[] array = (Object[]) o;
|
|
|
|
+ if (array.length >= 2 && array[0] instanceof String && array[1] instanceof String) {
|
|
|
|
+ startDate = formatDate((String) array[0]);
|
|
|
|
+ endDate = formatDate((String) array[1]);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (startDate != null) {
|
|
|
|
+ plan.setPlanStartTime(LocalDate.parse(startDate));
|
|
|
|
+ }
|
|
|
|
+ if (endDate != null) {
|
|
|
|
+ plan.setPlanEndTime(LocalDate.parse(endDate));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
if(groupId1 != null){
|
|
if(groupId1 != null){
|
|
plan.setId(groupId1);
|
|
plan.setId(groupId1);
|
|
ServicePlan plan1 = this.getById(plan.getId());
|
|
ServicePlan plan1 = this.getById(plan.getId());
|