Commit 1c7adc53 by zhangshaowu

排班信息

1 parent b7d1d463
......@@ -42,7 +42,7 @@ public class RosteringController {
return ResultGenerator.genSuccessResult(rosteringService.findAllStaff());
}
@GetMapping(value = "export")
@RequestMapping(value = "export")
public void listStaff(String datas, String date, HttpServletResponse response) {
List<RosteringExportModel> rosteringModels = JSONObject.parseArray(datas, RosteringExportModel.class);
Workbook workbook = rosteringService.export(rosteringModels);
......
......@@ -20,6 +20,11 @@ public interface RosteringService {
Workbook export(List<RosteringExportModel> rosteringModels);
void createStaff(RosteringStaff rosteringStaff);
void deleteStaff(Integer id);
void updateStaff(RosteringStaff rosteringStaff);
List<RosteringStaff> findAllStaff();
......
......@@ -83,7 +83,7 @@ public class RosteringServiceImpl implements RosteringService {
List<String> dates = rosteringModels.stream().map(e -> {
String dateStr = DateUtil.format(e.getDate(), "yyyy/MM/dd");
return dateStr + e.getWeek();
}).collect(Collectors.toList());
}).distinct().collect(Collectors.toList());
for (int i = 0; i < dates.size(); i++) {
int orderNum = i + 5;
String name = dates.get(i);
......@@ -110,8 +110,8 @@ public class RosteringServiceImpl implements RosteringService {
String dateStr = DateUtil.format(e.getDate(), "yyyy/MM/dd");
String date = dateStr + e.getWeek();
map.put(date, e.getShift());
datas.add(map);
});
datas.add(map);
});
return ExcelExportUtil.exportExcel(new ExportParams(), colList, datas);
}
......
spring:
profiles:
active: dev
active: prod
# 日志
logging:
file:
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!