update

徐烜
1 parent 639ba4ae
Showing 2 changed files with 34 additions and 6 deletions
src/main/java/com/bsth/controller/schedule/ScheduleRule1FlatController.java
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1Flat.java
@@ -55,11 +55,14 @@ public class ScheduleRule1FlatController extends BaseController&lt;ScheduleRule1Fla
         for (int i = 0; i < lpNames.length; i++) {
             param1.put("lpName_eq", lpNames[i]);
             Iterable<GuideboardInfo> guideboardInfos = guideboardInfoService.list(param1);
+            if (!guideboardInfos.iterator().hasNext()) {
+                throw new RuntimeException("路牌：" + lpNames[i] + "没有找到！");
+            }
             lpIds[i] = guideboardInfos.iterator().next().getId().toString();
         }
         t.setLpIds(StringUtils.join(lpIds, ","));
-        // 2、查找人员配置id
+        // 2、查找人员配置id（这里要考虑分班的情况，先用-隔开，在用,隔开）
         Map<String, Object> param2 = new HashMap<>();
         param2.put("xl.id_eq", t.getXl().getId());
         param2.put("dbbm_eq", null);
@@ -67,9 +70,34 @@ public class ScheduleRule1FlatController extends BaseController&lt;ScheduleRule1Fla
         String[] ryDbbms = t.getRyDbbms().split(",");
         String[] ryIds = new String[ryDbbms.length];
         for (int j = 0; j < ryDbbms.length; j++) {
-            param2.put("dbbm_eq", ryDbbms[j]);
-            Iterable<EmployeeConfigInfo> employeeConfigInfos = employeeConfigInfoService.list(param2);
-            ryIds[j] = employeeConfigInfos.iterator().next().getId().toString();
+            if (ryDbbms[j].indexOf("-") == -1) {
+                param2.put("dbbm_eq", ryDbbms[j]);
+                Iterable<EmployeeConfigInfo> employeeConfigInfos = employeeConfigInfoService.list(param2);
+                if (!employeeConfigInfos.iterator().hasNext()) {
+                    throw new RuntimeException("搭班编码：：" + ryDbbms[j] + "没有找到！");
+                }
+                ryIds[j] = employeeConfigInfos.iterator().next().getId().toString();
+            } else {
+                String[] fbRyDbbms = ryDbbms[j].split("-");
+                if (fbRyDbbms.length != 2) {
+                    throw new RuntimeException("搭班编码：" + ryDbbms[j] + "错误！");
+                }
+                String[] fbRyIds = new String[2];
+                param2.put("dbbm_eq", fbRyDbbms[0]);
+                Iterable<EmployeeConfigInfo> employeeConfigInfos = employeeConfigInfoService.list(param2);
+                if (!employeeConfigInfos.iterator().hasNext()) {
+                    throw new RuntimeException("搭班编码：：" + fbRyDbbms[0] + "没有找到！");
+                }
+                fbRyIds[0] = employeeConfigInfos.iterator().next().getId().toString();
+                param2.put("dbbm_eq", fbRyDbbms[1]);
+                employeeConfigInfos = employeeConfigInfoService.list(param2);
+                if (!employeeConfigInfos.iterator().hasNext()) {
+                    throw new RuntimeException("搭班编码：：" + fbRyDbbms[1] + "没有找到！");
+                }
+                fbRyIds[1] = employeeConfigInfos.iterator().next().getId().toString();
+                ryIds[j] = StringUtils.join(fbRyIds, "-");
+            }
+
         }
         t.setRyConfigIds(StringUtils.join(ryIds, ","));
@@ -61,10 +61,10 @@ public class ScheduleRule1Flat {
     /** 起始路牌（从0开始） */
     @NotNull
     private Integer lpStart;
-    /** 人员搭班编码s（用逗号隔开） */
+    /** 人员搭班编码s（用逗号隔开，如果分班，就先-隔开再逗号隔开） */
     @NotNull
     private String ryDbbms;
-    /** 对应的人员配置ids（用逗号隔开） */
+    /** 对应的人员配置ids（用逗号隔开，如果分班，就先-隔开再逗号隔开） */
     @NotNull
     private String ryConfigIds;
     /** 起始人员（从0开始） */