潘钊 / bsth_control · Commits

Commit 404e0e2f1ee9786e0d883e170308a3d071bbd2e8

Authored by 徐烜
1 parent 1d7c777b
build: skipped

PSM-26

Inline Side-by-side
Showing 13 changed files with 33 additions and 18 deletions
src/main/java/com/bsth/controller/schedule/core/CarConfigInfoController.java
  View file @404e0e2
@@ -44,6 +44,7 @@ public class CarConfigInfoController extends BController<CarConfigInfo, Long> { @@ -44,6 +44,7 @@ public class CarConfigInfoController extends BController<CarConfigInfo, Long> {
44 try { 44 try {
45 // 车辆重复配置验证 45 // 车辆重复配置验证
46 CarConfigInfo carConfigInfo = new CarConfigInfo( 46 CarConfigInfo carConfigInfo = new CarConfigInfo(
  47 + param.get("id_eq"),
47 param.get("xl.id_eq"), 48 param.get("xl.id_eq"),
48 param.get("xl.name_eq"), 49 param.get("xl.name_eq"),
49 param.get("cl.id_eq") 50 param.get("cl.id_eq")
src/main/java/com/bsth/controller/schedule/core/EmployeeConfigInfoController.java
  View file @404e0e2
@@ -44,6 +44,7 @@ public class EmployeeConfigInfoController extends BController<EmployeeConfigInfo @@ -44,6 +44,7 @@ public class EmployeeConfigInfoController extends BController<EmployeeConfigInfo
44 Map<String, Object> rtn = new HashMap<>(); 44 Map<String, Object> rtn = new HashMap<>();
45 try { 45 try {
46 EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo( 46 EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
  47 + param.get("id_eq"),
47 param.get("xl.id_eq"), 48 param.get("xl.id_eq"),
48 param.get("xl.name_eq"), 49 param.get("xl.name_eq"),
49 param.get("jsy.id_eq"), 50 param.get("jsy.id_eq"),
@@ -64,6 +65,7 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo @@ -64,6 +65,7 @@ public class EmployeeConfigInfoController extends BController&lt;EmployeeConfigInfo
64 Map<String, Object> rtn = new HashMap<>(); 65 Map<String, Object> rtn = new HashMap<>();
65 try { 66 try {
66 EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo( 67 EmployeeConfigInfo employeeConfigInfo = new EmployeeConfigInfo(
  68 + param.get("id_eq"),
67 param.get("xl.id_eq"), 69 param.get("xl.id_eq"),
68 param.get("xl.name_eq"), 70 param.get("xl.name_eq"),
69 null, 71 null,
src/main/java/com/bsth/controller/schedule/core/GuideboardInfoController.java
  View file @404e0e2
@@ -54,6 +54,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; @@ -54,6 +54,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt;
54 try { 54 try {
55 // 路牌编号验证 55 // 路牌编号验证
56 GuideboardInfo guideboardInfo = new GuideboardInfo( 56 GuideboardInfo guideboardInfo = new GuideboardInfo(
  57 + param.get("id_eq"),
57 param.get("xl.id_eq"), 58 param.get("xl.id_eq"),
58 param.get("lpNo_eq"), 59 param.get("lpNo_eq"),
59 null 60 null
@@ -73,6 +74,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt; @@ -73,6 +74,7 @@ public class GuideboardInfoController extends BController&lt;GuideboardInfo, Long&gt;
73 try { 74 try {
74 // 路牌名称验证 75 // 路牌名称验证
75 GuideboardInfo guideboardInfo = new GuideboardInfo( 76 GuideboardInfo guideboardInfo = new GuideboardInfo(
  77 + param.get("id_eq"),
76 param.get("xl.id_eq"), 78 param.get("xl.id_eq"),
77 null, 79 null,
78 param.get("lpName_eq") 80 param.get("lpName_eq")
src/main/java/com/bsth/entity/schedule/CarConfigInfo.java
  View file @404e0e2
@@ -74,7 +74,10 @@ public class CarConfigInfo implements Serializable { @@ -74,7 +74,10 @@ public class CarConfigInfo implements Serializable {
74 private Date updateDate; 74 private Date updateDate;
75 75
76 public CarConfigInfo() {} 76 public CarConfigInfo() {}
77 - public CarConfigInfo(Object xlid, Object xlname, Object clid) { 77 + public CarConfigInfo(Object id, Object xlid, Object xlname, Object clid) {
  78 + if (id != null) {
  79 + this.id = Long.parseLong(id.toString());
  80 + }
78 if (xlid != null && xlname != null) { 81 if (xlid != null && xlname != null) {
79 Line line = new Line(); 82 Line line = new Line();
80 line.setId(Integer.valueOf(xlid.toString())); 83 line.setId(Integer.valueOf(xlid.toString()));
src/main/java/com/bsth/entity/schedule/EmployeeConfigInfo.java
  View file @404e0e2
@@ -71,7 +71,10 @@ public class EmployeeConfigInfo { @@ -71,7 +71,10 @@ public class EmployeeConfigInfo {
71 71
72 public EmployeeConfigInfo() {} 72 public EmployeeConfigInfo() {}
73 73
74 - public EmployeeConfigInfo(Object xlid, Object xlname, Object jsyid, Object spyid) { 74 + public EmployeeConfigInfo(Object id, Object xlid, Object xlname, Object jsyid, Object spyid) {
  75 + if (id != null) {
  76 + this.id = Long.parseLong(id.toString());
  77 + }
75 if (xlid != null && xlname != null) { 78 if (xlid != null && xlname != null) {
76 Line line = new Line(); 79 Line line = new Line();
77 line.setId(Integer.valueOf(xlid.toString())); 80 line.setId(Integer.valueOf(xlid.toString()));
src/main/java/com/bsth/entity/schedule/GuideboardInfo.java
  View file @404e0e2
@@ -60,7 +60,11 @@ public class GuideboardInfo { @@ -60,7 +60,11 @@ public class GuideboardInfo {
60 60
61 public GuideboardInfo() {} 61 public GuideboardInfo() {}
62 62
63 - public GuideboardInfo(Object xlid, Object lpNo, Object lpName) { 63 + public GuideboardInfo(Object id, Object xlid, Object lpNo, Object lpName) {
  64 + if (id != null) {
  65 + this.id = Long.parseLong(id.toString());
  66 + }
  67 +
64 Integer xlid_ = xlid == null ? null : Integer.valueOf(xlid.toString()); 68 Integer xlid_ = xlid == null ? null : Integer.valueOf(xlid.toString());
65 Integer lpNo_ = lpNo == null ? null : Integer.valueOf(lpNo.toString()); 69 Integer lpNo_ = lpNo == null ? null : Integer.valueOf(lpNo.toString());
66 String lpName_ = lpName == null ? null : String.valueOf(lpName); 70 String lpName_ = lpName == null ? null : String.valueOf(lpName);
@@ -75,11 +79,11 @@ public class GuideboardInfo { @@ -75,11 +79,11 @@ public class GuideboardInfo {
75 this.lpName = lpName_; 79 this.lpName = lpName_;
76 } 80 }
77 81
78 - public GuideboardInfo(Integer xlid, Integer lpNo) {  
79 - this(xlid, lpNo, null); 82 + public GuideboardInfo(Object id, Integer xlid, Integer lpNo) {
  83 + this(id, xlid, lpNo, null);
80 } 84 }
81 - public GuideboardInfo(Integer xlid, String lpName) {  
82 - this(xlid, null, lpName); 85 + public GuideboardInfo(Object id, Integer xlid, String lpName) {
  86 + this(id, xlid, null, lpName);
83 } 87 }
84 88
85 public Long getId() { 89 public Long getId() {
src/main/resources/static/pages/scheduleApp/module/common/dts1/validation/remoteValidation.js
  View file @404e0e2
@@ -37,7 +37,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidation&#39;, [ @@ -37,7 +37,7 @@ angular.module(&#39;ScheduleApp&#39;).directive(&#39;remoteValidation&#39;, [
37 // 判定如果参数对象不全，没有完全和模版参数里对应上，则不验证 37 // 判定如果参数对象不全，没有完全和模版参数里对应上，则不验证
38 var isParamAll = true; 38 var isParamAll = true;
39 for (var key in paramTemplate) { 39 for (var key in paramTemplate) {
40 - if (!$watch_rvparam_obj[key]) { 40 + if (key != "id" && !$watch_rvparam_obj[key]) { // id去掉
41 isParamAll = false; 41 isParamAll = false;
42 break; 42 break;
43 } 43 }
src/main/resources/static/pages/scheduleApp/module/core/busConfig/edit.html
  View file @404e0e2
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 <input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id" 79 <input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id"
80 remote-Validation 80 remote-Validation
81 remotevtype="cc_cars" 81 remotevtype="cc_cars"
82 - remotevparam="{{ {'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}" 82 + remotevparam="{{ {'id_eq': ctrl.busConfigForSave.id, 'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"
83 /> 83 />
84 </div> 84 </div>
85 <!-- 隐藏块，显示验证信息 --> 85 <!-- 隐藏块，显示验证信息 -->
src/main/resources/static/pages/scheduleApp/module/core/busConfig/form.html
  View file @404e0e2
@@ -79,7 +79,7 @@ @@ -79,7 +79,7 @@
79 <input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id" 79 <input type="hidden" name="cl_h" ng-model="ctrl.busConfigForSave.cl.id"
80 remote-Validation 80 remote-Validation
81 remotevtype="cc_cars" 81 remotevtype="cc_cars"
82 - remotevparam="{{ {'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}" 82 + remotevparam="{{ {'id_eq': ctrl.busConfigForSave.id, 'xl.id_eq': ctrl.busConfigForSave.xl.id, 'xl.name_eq': ctrl.busConfigForSave.xl.name, 'cl.id_eq': ctrl.busConfigForSave.cl.id} | json}}"
83 /> 83 />
84 </div> 84 </div>
85 <!-- 隐藏块，显示验证信息 --> 85 <!-- 隐藏块，显示验证信息 -->
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/edit.html
  View file @404e0e2
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id" 92 <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
93 remote-Validation 93 remote-Validation
94 remotevtype="ec_jsy" 94 remotevtype="ec_jsy"
95 - remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}" 95 + remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"
96 /> 96 />
97 </div> 97 </div>
98 <!-- 隐藏块，显示验证信息 --> 98 <!-- 隐藏块，显示验证信息 -->
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id" 122 <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
123 remote-Validation 123 remote-Validation
124 remotevtype="ec_jsy" 124 remotevtype="ec_jsy"
125 - remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}" 125 + remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
126 /> 126 />
127 </div> 127 </div>
128 <!-- 隐藏块，显示验证信息 --> 128 <!-- 隐藏块，显示验证信息 -->
src/main/resources/static/pages/scheduleApp/module/core/employeeConfig/form.html
  View file @404e0e2
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
92 <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id" 92 <input type="hidden" name="jsy_h" ng-model="ctrl.employeeConfigForSave.jsy.id"
93 remote-Validation 93 remote-Validation
94 remotevtype="ec_jsy" 94 remotevtype="ec_jsy"
95 - remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}" 95 + remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'jsy.id_eq': ctrl.employeeConfigForSave.jsy.id} | json}}"
96 /> 96 />
97 </div> 97 </div>
98 <!-- 隐藏块，显示验证信息 --> 98 <!-- 隐藏块，显示验证信息 -->
@@ -122,7 +122,7 @@ @@ -122,7 +122,7 @@
122 <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id" 122 <input type="hidden" name="spy_h" ng-model="ctrl.employeeConfigForSave.spy.id"
123 remote-Validation 123 remote-Validation
124 remotevtype="ec_spy" 124 remotevtype="ec_spy"
125 - remotevparam="{{ {'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}" 125 + remotevparam="{{ {'id_eq': ctrl.employeeConfigForSave.id, 'xl.id_eq': ctrl.employeeConfigForSave.xl.id, 'xl.name_eq': ctrl.employeeConfigForSave.xl.name, 'spy.id_eq': ctrl.employeeConfigForSave.spy.id} | json}}"
126 /> 126 />
127 </div> 127 </div>
128 <!-- 隐藏块，显示验证信息 --> 128 <!-- 隐藏块，显示验证信息 -->
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/edit.html
  View file @404e0e2
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 name="lpNo" placeholder="请输入路牌编号..." min="1" required 63 name="lpNo" placeholder="请输入路牌编号..." min="1" required
64 remote-Validation 64 remote-Validation
65 remotevtype="gbv1" 65 remotevtype="gbv1"
66 - remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}" 66 + remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
67 67
68 /> 68 />
69 </div> 69 </div>
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 name="lpName" placeholder="请输入路牌名字..." required 85 name="lpName" placeholder="请输入路牌名字..." required
86 remote-Validation 86 remote-Validation
87 remotevtype="gbv2" 87 remotevtype="gbv2"
88 - remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}" 88 + remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
89 89
90 /> 90 />
91 </div> 91 </div>
src/main/resources/static/pages/scheduleApp/module/core/guideboardManage/form.html
  View file @404e0e2
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 name="lpNo" placeholder="请输入路牌编号..." min="1" required 63 name="lpNo" placeholder="请输入路牌编号..." min="1" required
64 remote-Validation 64 remote-Validation
65 remotevtype="gbv1" 65 remotevtype="gbv1"
66 - remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}" 66 + remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpNo_eq': ctrl.guideboardManageForForm.lpNo} | json}}"
67 67
68 /> 68 />
69 </div> 69 </div>
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 name="lpName" placeholder="请输入路牌名字..." required 85 name="lpName" placeholder="请输入路牌名字..." required
86 remote-Validation 86 remote-Validation
87 remotevtype="gbv2" 87 remotevtype="gbv2"
88 - remotevparam="{{ {'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}" 88 + remotevparam="{{ {'id_eq': ctrl.guideboardManageForForm.id, 'xl.id_eq': ctrl.guideboardManageForForm.xl.id, 'lpName_eq': ctrl.guideboardManageForForm.lpName} | json}}"
89 89
90 /> 90 />
91 </div> 91 </div>