排班信息

src/main/java/com/pipihelper/project/controller/RosteringController.java

@@ -42,7 +42,7 @@ public class RosteringController {
         return ResultGenerator.genSuccessResult(rosteringService.findAllStaff());
         return ResultGenerator.genSuccessResult(rosteringService.findAllStaff());
     }
     }
 
 
-    @GetMapping(value = "export")
+    @RequestMapping(value = "export")
     public void listStaff(String datas, String date, HttpServletResponse response) {
     public void listStaff(String datas, String date, HttpServletResponse response) {
         List<RosteringExportModel> rosteringModels = JSONObject.parseArray(datas, RosteringExportModel.class);
         List<RosteringExportModel> rosteringModels = JSONObject.parseArray(datas, RosteringExportModel.class);
         Workbook workbook = rosteringService.export(rosteringModels);
         Workbook workbook = rosteringService.export(rosteringModels);

src/main/java/com/pipihelper/project/rostering/service/RosteringService.java

@@ -20,6 +20,11 @@ public interface RosteringService {
 
 
     Workbook export(List<RosteringExportModel> rosteringModels);
     Workbook export(List<RosteringExportModel> rosteringModels);
 
 
+    void createStaff(RosteringStaff rosteringStaff);
+
+    void deleteStaff(Integer id);
+
+    void updateStaff(RosteringStaff rosteringStaff);
 
 
     List<RosteringStaff> findAllStaff();
     List<RosteringStaff> findAllStaff();
 
 

src/main/java/com/pipihelper/project/rostering/service/impl/RosteringServiceImpl.java

@@ -83,7 +83,7 @@ public class RosteringServiceImpl implements RosteringService {
         List<String> dates = rosteringModels.stream().map(e -> {
         List<String> dates = rosteringModels.stream().map(e -> {
             String dateStr = DateUtil.format(e.getDate(), "yyyy/MM/dd");
             String dateStr = DateUtil.format(e.getDate(), "yyyy/MM/dd");
             return dateStr + e.getWeek();
             return dateStr + e.getWeek();
-        }).collect(Collectors.toList());
+        }).distinct().collect(Collectors.toList());
         for (int i = 0; i < dates.size(); i++) {
         for (int i = 0; i < dates.size(); i++) {
             int orderNum = i + 5;
             int orderNum = i + 5;
             String name = dates.get(i);
             String name = dates.get(i);
@@ -110,8 +110,8 @@ public class RosteringServiceImpl implements RosteringService {
                 String dateStr = DateUtil.format(e.getDate(), "yyyy/MM/dd");
                 String dateStr = DateUtil.format(e.getDate(), "yyyy/MM/dd");
                 String date = dateStr + e.getWeek();
                 String date = dateStr + e.getWeek();
                 map.put(date, e.getShift());
                 map.put(date, e.getShift());
-                datas.add(map);
             });
             });
+            datas.add(map);
         });
         });
         return ExcelExportUtil.exportExcel(new ExportParams(), colList, datas);
         return ExcelExportUtil.exportExcel(new ExportParams(), colList, datas);
     }
     }

src/main/resources/application.yml

 spring:
 spring:
   profiles:
   profiles:
-    active: dev
+    active: prod
 # 日志
 # 日志
 logging:
 logging:
   file:
   file: