Update

徐烜
1 parent 448de2e9
Showing 8 changed files with 71 additions and 7 deletions
src/main/java/com/bsth/entity/schedule/SchedulePlanInfo.java
src/main/java/com/bsth/entity/schedule/rule/RerunRule.java
src/main/java/com/bsth/service/schedule/rules/ScheduleRuleServiceImpl.java
src/main/java/com/bsth/service/schedule/rules/rerun/RerunRule_input.java
src/main/resources/rules/rerun.drl
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/edit.html
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/form.html
src/main/resources/static/pages/scheduleApp/module/core/rerunManage/module.js
@@ -178,10 +178,21 @@ public class SchedulePlanInfo {
     }
     // 对应路牌套跑
-    public void setRerunInfoDylp(CarConfigInfo cc, EmployeeConfigInfo ec, String useType) {
+    public void setRerunInfoDylp(CarConfigInfo cc, List ec, String useType, String useHrType) {
         if ("hr".equals(useType)) {
             // 关联的驾驶员
-            EmployeeConfigInfo employeeConfigInfo = ec;
+            EmployeeConfigInfo employeeConfigInfo = null;
+            if ("all".equals(useHrType)) {
+                employeeConfigInfo = (EmployeeConfigInfo) ec.get(0);
+            } else if ("zb".equals(useHrType)) {
+                employeeConfigInfo = (EmployeeConfigInfo) ec.get(0);
+            } else if ("wb".equals(useHrType)) {
+                if (ec.size() > 1) {
+                    employeeConfigInfo = (EmployeeConfigInfo) ec.get(1);
+                } else {
+                    employeeConfigInfo = (EmployeeConfigInfo) ec.get(0);
+                }
+            }
             this.j = employeeConfigInfo.getJsy().getId();
 //        this.jGh = employeeConfigInfo.getJsy().getJobCode();
@@ -219,7 +230,18 @@ public class SchedulePlanInfo {
             this.clZbh = cc.getCl().getInsideCode(); // 自编号/内部编号
             // 关联的驾驶员
-            EmployeeConfigInfo employeeConfigInfo = ec;
+            EmployeeConfigInfo employeeConfigInfo = null;
+            if ("all".equals(useHrType)) {
+                employeeConfigInfo = (EmployeeConfigInfo) ec.get(0);
+            } else if ("zb".equals(useHrType)) {
+                employeeConfigInfo = (EmployeeConfigInfo) ec.get(0);
+            } else if ("wb".equals(useHrType)) {
+                if (ec.size() > 1) {
+                    employeeConfigInfo = (EmployeeConfigInfo) ec.get(1);
+                } else {
+                    employeeConfigInfo = (EmployeeConfigInfo) ec.get(0);
+                }
+            }
             this.j = employeeConfigInfo.getJsy().getId();
 //        this.jGh = employeeConfigInfo.getJsy().getJobCode();
@@ -70,6 +70,8 @@ public class RerunRule extends BEntity {
     private GuideboardInfo useLp;
     /** 对应路牌替换类型，hr；换人，hc：换车，all：换人换车 */
     private String useType;
+    /** 使用换人类型（zb：早班的人，wb：晚班的人，all：不分早晚班） */
+    private String useHrtype;
     //--------- 对应班车 ----------/
     /** 车辆配置 */
@@ -261,4 +263,12 @@ public class RerunRule extends BEntity {
     public void setUseType(String useType) {
         this.useType = useType;
     }
+
+    public String getUseHrtype() {
+        return useHrtype;
+    }
+
+    public void setUseHrtype(String useHrtype) {
+        this.useHrtype = useHrtype;
+    }
 }
@@ -45,6 +45,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                 ", use_xl as s_dylp_xl " +
                 ", use_lp as s_dylp_lp " +
                 ", use_type as s_dylp_type " +
+                ", use_hrtype as s_dylp_hrtype " +
                 ", cl as s_dybc_cl " +
                 ", cl_zbh as s_dybc_clzbh " +
                 ", j as s_dybc_j " +
@@ -76,6 +77,7 @@ public class ScheduleRuleServiceImpl implements ScheduleRuleService {
                         rerunRule_input.setS_xl(String.valueOf(resultSet.getInt("s_dylp_xl")));
                         rerunRule_input.setS_lp(String.valueOf(resultSet.getLong("s_dylp_lp")));
                         rerunRule_input.setUsetype(resultSet.getString("s_dylp_type"));
+                        rerunRule_input.setUserhrtype(resultSet.getString("s_dylp_hrtype"));
                     } else if ("dybc".equals(resultSet.getString("type"))) {
                         rerunRule_input.setCl(resultSet.getInt("s_dybc_cl"));
                         rerunRule_input.setZbh(resultSet.getString("s_dybc_clzbh"));
@@ -13,6 +13,7 @@ public class RerunRule_input {
     private String s_xl; // 对应路牌，线路Id
     private String s_lp; // 对应路牌，路牌Id
     private String usetype; // 对应路牌替换类型
+    private String userhrtype; // 对应路牌换人类型
     private Integer cl; // 对应班车，车辆Id
     private String zbh; // 对应班车，车辆自编号
@@ -150,4 +151,12 @@ public class RerunRule_input {
     public void setUsetype(String usetype) {
         this.usetype = usetype;
     }
+
+    public String getUserhrtype() {
+        return userhrtype;
+    }
+
+    public void setUserhrtype(String userhrtype) {
+        this.userhrtype = userhrtype;
+    }
 }
@@ -100,7 +100,7 @@ declare Dylp_ScheduleResult_output_wrap
     sd: DateTime // 日期
     lp: String // 路牌
     cc: CarConfigInfo // 使用的车辆配置
-    ec: EmployeeConfigInfo // 使用的人员配置
+    ec: List // 使用的人员配置 List<EmployeeConfigInfo>
 end
 rule "calcu_Dylp_ScheduleResult_output_wrap"
@@ -116,7 +116,13 @@ rule &quot;calcu_Dylp_ScheduleResult_output_wrap&quot;
         wrap.setSd($sr.getSd());
         wrap.setLp($sr.getGuideboardId());
         wrap.setCc((CarConfigInfo) $ccmap.get($sr.getCarConfigId()));
-        wrap.setEc((EmployeeConfigInfo) $ecmap.get($sr.getEmployeeConfigId()));
+
+        List ecs = new ArrayList();
+        String[] ecids = $sr.getEmployeeConfigId().split("-"); // 分班的人
+        for (int i = 0; i < ecids.length; i++) {
+            ecs.add($ecmap.get(ecids[i]));
+        }
+        wrap.setEc(ecs);
 //        log.info("xlid = {}", $xlId);
@@ -135,7 +141,7 @@ rule &quot;calcu_Dylp_rerun_update_dylp&quot;
             ttinfo == $ttinfo.toString(),
             lp == $lp.toString(),
             fcsj == $fcsj,
-            $sxl: s_xl, $slp: s_lp, $type: usetype
+            $sxl: s_xl, $slp: s_lp, $type: usetype, $hrtype: userhrtype
         )
         $dsro: Dylp_ScheduleResult_output_wrap(
             xlId == $sxl,
@@ -145,7 +151,7 @@ rule &quot;calcu_Dylp_rerun_update_dylp&quot;
     then
 //        log.info("TODO：测试 {}", $fcsj);
-        $spi.setRerunInfoDylp($dsro.getCc(), $dsro.getEc(), $type);
+        $spi.setRerunInfoDylp($dsro.getCc(), $dsro.getEc(), $type, $hrtype);
 end
@@ -182,6 +182,13 @@
                         <sa-Radiogroup model="ctrl.rerunManageForSave.useType" dicgroup="dylptype" name="useType"></sa-Radiogroup>
                     </div>
                 </div>
+                <div class="form-group has-success has-feedback"
+                     ng-if="ctrl.rerunManageForSave.rerunType == 'dylp' && (ctrl.rerunManageForSave.useType == 'all' || ctrl.rerunManageForSave.useType == 'hr')">
+                    <label class="col-md-2 control-label">换人类型：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.rerunManageForSave.useHrtype" dicgroup="dylphrtype" name="useHrype"></sa-Radiogroup>
+                    </div>
+                </div>
                 <div class="form-group has-success has-feedback" ng-if="ctrl.rerunManageForSave.rerunType == 'dybc'">
@@ -182,6 +182,13 @@
                         <sa-Radiogroup model="ctrl.rerunManageForSave.useType" dicgroup="dylptype" name="useType"></sa-Radiogroup>
                     </div>
                 </div>
+                <div class="form-group has-success has-feedback"
+                     ng-if="ctrl.rerunManageForSave.rerunType == 'dylp' && (ctrl.rerunManageForSave.useType == 'all' || ctrl.rerunManageForSave.useType == 'hr')">
+                    <label class="col-md-2 control-label">换人类型：</label>
+                    <div class="col-md-3">
+                        <sa-Radiogroup model="ctrl.rerunManageForSave.useHrtype" dicgroup="dylphrtype" name="useHrype"></sa-Radiogroup>
+                    </div>
+                </div>
                 <div class="form-group has-success has-feedback" ng-if="ctrl.rerunManageForSave.rerunType == 'dybc'">
@@ -170,6 +170,7 @@ angular.module(&#39;ScheduleApp&#39;).controller(
                 // 初始表单，从查询条件中获取线路id
                 self.rerunManageForSave.rerunXl.id = service.getSearchCondition()['rerunXl.id_eq'];
                 self.rerunManageForSave.useType = "all";
+                self.rerunManageForSave.useHrtype = "all";
             }
             // 提交方法