潘钊 / bsth_control · Commits

Commit fce30c31d5d8e7bcff902135be037d6ded583ebf

Authored by 徐烜
1 parent 44bac07f
build: skipped

PSM-12

Inline Side-by-side
Showing 3 changed files with 40 additions and 41 deletions
src/main/java/com/bsth/service/schedule/SchedulePlanServiceImpl.java
  View file @fce30c3
@@ -64,7 +64,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long> @@ -64,7 +64,8 @@ public class SchedulePlanServiceImpl extends BaseServiceImpl<SchedulePlan, Long>
64 // 创建session，内部配置的是stateful 64 // 创建session，内部配置的是stateful
65 KieSession session = kieBase.newKieSession(); 65 KieSession session = kieBase.newKieSession();
66 // 设置gloable对象，在drl中通过别名使用 66 // 设置gloable对象，在drl中通过别名使用
67 - session.setGlobal("scheduleResult", scheduleResults_output); 67 +// session.setGlobal("scheduleResult", scheduleResults_output);
  68 +
68 // 载入数据 69 // 载入数据
69 session.insert(scheduleCalcuParam_input); 70 session.insert(scheduleCalcuParam_input);
70 for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) { 71 for (ScheduleRule_input scheduleRule_input : scheduleRule_inputs) {
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
  View file @fce30c3
@@ -76,19 +76,18 @@ @@ -76,19 +76,18 @@
76 <div class="form-group has-success has-feedback"> 76 <div class="form-group has-success has-feedback">
77 <label class="col-md-2 control-label">驾驶员*：</label> 77 <label class="col-md-2 control-label">驾驶员*：</label>
78 <div class="col-md-3"> 78 <div class="col-md-3">
79 - <sa-Select3 model="ctrl.employeeConfigForSave"  
80 - name="jsy"  
81 - placeholder="请输拼音..."  
82 - dcvalue="{{ctrl.employeeConfigForSave.jsy.id}}" 79 + <sa-Select5 name="jsy"
  80 + model="ctrl.employeeConfigForSave"
  81 + cmaps="{'jsy.id' : 'id'}"
83 dcname="jsy.id" 82 dcname="jsy.id"
84 icname="id" 83 icname="id"
85 - icnames="personnelName"  
86 - datatype="ry"  
87 - dataassociate="true"  
88 - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"  
89 - mlp="true" 84 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  85 + iterobjname="item"
  86 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  87 + searchph="请输拼音..."
  88 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
90 required > 89 required >
91 - </sa-Select3> 90 + </sa-Select5>
92 </div> 91 </div>
93 <!-- 隐藏块，显示验证信息 --> 92 <!-- 隐藏块，显示验证信息 -->
94 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required"> 93 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
@@ -99,18 +98,18 @@ @@ -99,18 +98,18 @@
99 <div class="form-group"> 98 <div class="form-group">
100 <label class="col-md-2 control-label">售票员：</label> 99 <label class="col-md-2 control-label">售票员：</label>
101 <div class="col-md-3"> 100 <div class="col-md-3">
102 - <sa-Select3 model="ctrl.employeeConfigForSave"  
103 - name="spy"  
104 - placeholder="请输拼音..."  
105 - dcvalue="{{ctrl.employeeConfigForSave.spy.id}}" 101 + <sa-Select5 name="spy"
  102 + model="ctrl.employeeConfigForSave"
  103 + cmaps="{'spy.id' : 'id'}"
106 dcname="spy.id" 104 dcname="spy.id"
107 icname="id" 105 icname="id"
108 - icnames="personnelName"  
109 - datatype="ry"  
110 - dataassociate="true"  
111 - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"  
112 - mlp="true" >  
113 - </sa-Select3> 106 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  107 + iterobjname="item"
  108 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  109 + searchph="请输拼音..."
  110 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
  111 + >
  112 + </sa-Select5>
114 </div> 113 </div>
115 </div> 114 </div>
116 115
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html
  View file @fce30c3
@@ -78,19 +78,18 @@ @@ -78,19 +78,18 @@
78 <div class="form-group has-success has-feedback"> 78 <div class="form-group has-success has-feedback">
79 <label class="col-md-2 control-label">驾驶员*：</label> 79 <label class="col-md-2 control-label">驾驶员*：</label>
80 <div class="col-md-3"> 80 <div class="col-md-3">
81 - <sa-Select3 model="ctrl.employeeConfigForSave"  
82 - name="jsy"  
83 - placeholder="请输拼音..."  
84 - dcvalue="{{ctrl.employeeConfigForSave.jsy.id}}" 81 + <sa-Select5 name="jsy"
  82 + model="ctrl.employeeConfigForSave"
  83 + cmaps="{'jsy.id' : 'id'}"
85 dcname="jsy.id" 84 dcname="jsy.id"
86 icname="id" 85 icname="id"
87 - icnames="personnelName"  
88 - datatype="ry"  
89 - dataassociate="true"  
90 - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"  
91 - mlp="true" 86 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  87 + iterobjname="item"
  88 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  89 + searchph="请输拼音..."
  90 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
92 required > 91 required >
93 - </sa-Select3> 92 + </sa-Select5>
94 </div> 93 </div>
95 <!-- 隐藏块，显示验证信息 --> 94 <!-- 隐藏块，显示验证信息 -->
96 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required"> 95 <div class="alert alert-danger well-sm" ng-show="myForm.jsy.$error.required">
@@ -101,18 +100,18 @@ @@ -101,18 +100,18 @@
101 <div class="form-group"> 100 <div class="form-group">
102 <label class="col-md-2 control-label">售票员：</label> 101 <label class="col-md-2 control-label">售票员：</label>
103 <div class="col-md-3"> 102 <div class="col-md-3">
104 - <sa-Select3 model="ctrl.employeeConfigForSave"  
105 - name="spy"  
106 - placeholder="请输拼音..."  
107 - dcvalue="{{ctrl.employeeConfigForSave.spy.id}}" 103 + <sa-Select5 name="spy"
  104 + model="ctrl.employeeConfigForSave"
  105 + cmaps="{'spy.id' : 'id'}"
108 dcname="spy.id" 106 dcname="spy.id"
109 icname="id" 107 icname="id"
110 - icnames="personnelName"  
111 - datatype="ry"  
112 - dataassociate="true"  
113 - dataparam="{{ {'companyCode_eq': ctrl.employeeConfigForSave.xl.company} | json }}"  
114 - mlp="true" >  
115 - </sa-Select3> 108 + dsparams="{{ {type: 'ajax', param:{'type': 'all'}, atype:'ry' } | json }}"
  109 + iterobjname="item"
  110 + iterobjexp="item.personnelName + '<' + item.jobCode + '>'"
  111 + searchph="请输拼音..."
  112 + searchexp="this.personnelName + '<' + this.jobCode + '>'"
  113 + >
  114 + </sa-Select5>
116 </div> 115 </div>
117 </div> 116 </div>
118 117