Browse Source

排版信息功能:新增:增加多选具体日期新增方式

java8
赵宏斌 6 months ago
parent
commit
85181f9d72
  1. 1
      src/main/java/com/xujie/sys/modules/scheduling/controller/SchedulingController.java
  2. 4
      src/main/java/com/xujie/sys/modules/scheduling/entity/SchedulingData.java
  3. 25
      src/main/java/com/xujie/sys/modules/scheduling/service/impl/SchedulingServiceImpl.java

1
src/main/java/com/xujie/sys/modules/scheduling/controller/SchedulingController.java

@ -68,7 +68,6 @@ public class SchedulingController {
@PostMapping(value="/saveSchedulingHeader")
@ResponseBody
public R saveSchedulingHeader(@RequestBody SchedulingData data){
System.out.println(data.toString());
R r = schedulingService.saveSchedulingHeader(data);
return r;
}

4
src/main/java/com/xujie/sys/modules/scheduling/entity/SchedulingData.java

@ -35,5 +35,9 @@ public class SchedulingData {
private Object checkbox2;
@TableField(exist = false)
private List<EamAdminData> peopleList;
@TableField(exist = false)
private String insertType;
@TableField(exist = false)
private List<Date> selectedDates;
}

25
src/main/java/com/xujie/sys/modules/scheduling/service/impl/SchedulingServiceImpl.java

@ -83,6 +83,7 @@ public class SchedulingServiceImpl implements SchedulingService {
} else {
throw new RuntimeException("工厂和部门有误!");
}
if ("true".equals(data.getInsertType())){
Date startDate = data.getStartDate();
Date endDate = data.getEndDate();
String checkbox1 = Objects.toString(data.getCheckbox1());
@ -105,7 +106,7 @@ public class SchedulingServiceImpl implements SchedulingService {
//新增主表信息
schedulingMapper.saveSchedulingHeader(data);
}catch (Exception e){
return R.error("保存失败,请检查是否存在重复的班次编码和日期");
throw new RuntimeException("保存失败,请检查是否存在重复的班次编码和日期");
}
//设置子表参数
SchedulingRecordData schedulingRecordData = new SchedulingRecordData();
@ -119,6 +120,28 @@ public class SchedulingServiceImpl implements SchedulingService {
}
cal.add(Calendar.DATE, 1);
}
}else {
List<Date> selectedDates = data.getSelectedDates();
selectedDates.forEach(date1 -> {
data.setDate(date1);
try {
//新增主表信息
schedulingMapper.saveSchedulingHeader(data);
}catch (Exception e){
throw new RuntimeException("保存失败,请检查是否存在重复的班次编码和日期");
}
//设置子表参数
SchedulingRecordData schedulingRecordData = new SchedulingRecordData();
schedulingRecordData.setHeadId(data.getId());
schedulingRecordData.setIsHoliday("N");
List<EamAdminData> peopleList = data.getPeopleList();
for (int i = 0;i<peopleList.size();i++){
schedulingRecordData.setAdminId(peopleList.get(i).getAdminID());
schedulingRecordData.setAdminName(peopleList.get(i).getAdminName());
schedulingMapper.saveSchedulingRecord(schedulingRecordData);
}
});
}
return R.ok();
}

Loading…
Cancel
Save