值班导入导出优化：未排班补全休班

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -89,7 +89,7 @@ public class ExcelController extends BaseController {
     @Autowired
     IDutyPersonService iDutyPersonService;
 
-    private static final String NOT_DUTY = "休";
+    private static final String NOT_DUTY = "休班";
 
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -677,20 +677,8 @@ public class ExcelController extends BaseController {
                 list.add(o.getPostTypeName());
 
                 List<DutyPersonShiftDto> dutyShift = o.getDutyShift();
+                initDutyShift(dayByMonth, dutyShift, list);
 
-                HashMap<String, String> dutyShiftMap = new HashMap<>();
-                SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-                dutyShift.forEach(item -> dutyShiftMap.put(format.format(item.getDutyDate()), item.getShiftName()));
-
-                if (!dutyShift.isEmpty()) {
-                    for (int i = 0; i < dayByMonth.size(); i++) {
-                        if (dutyShiftMap.containsKey(dayByMonth.get(i))) {
-                            list.add(dutyShiftMap.get(dayByMonth.get(i)));
-                        } else {
-                            list.add(NOT_DUTY);
-                        }
-                    }
-                }
                 data.add(list);
             });
         }
@@ -713,12 +701,19 @@ public class ExcelController extends BaseController {
                 list.add(o.getCarName());
 
                 List<DutyPersonShiftDto> dutyShift = o.getDutyShift();
+                initDutyShift(dayByMonth, dutyShift, list);
 
+                data.add(list);
+            });
+        }
+        return data;
+    }
+
+    private void initDutyShift(List<String> dayByMonth, List<DutyPersonShiftDto> dutyShift, ArrayList<Object> list) {
         HashMap<String, String> dutyShiftMap = new HashMap<>();
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         dutyShift.forEach(item -> dutyShiftMap.put(format.format(item.getDutyDate()), item.getShiftName()));
 
-                if (!dutyShift.isEmpty()) {
         for (int i = 0; i < dayByMonth.size(); i++) {
             if (dutyShiftMap.containsKey(dayByMonth.get(i))) {
                 list.add(dutyShiftMap.get(dayByMonth.get(i)));
@@ -727,11 +722,6 @@ public class ExcelController extends BaseController {
             }
         }
     }
-                data.add(list);
-            });
-        }
-        return data;
-    }
 
     private void exportDutyTemplate(HttpServletResponse response, String classUrl, List<String> dayByMonth,
                                     ExcelDto excelDto, List<? extends Object> data, Boolean flag) {