潘钊 / bsth_control · Commits

Commit 684f5e76c9245fea8e863766d74ce1ee9e08a137

Authored by 徐烜
1 parent 278c7ef6
build: skipped

修改cars实体，删除能源类型字段

Inline Side-by-side
Showing 4 changed files with 2 additions and 50 deletions
src/main/java/com/bsth/entity/Cars.java
  View file @684f5e7
@@ -126,8 +126,6 @@ public class Cars extends BEntity implements Serializable { @@ -126,8 +126,6 @@ public class Cars extends BEntity implements Serializable {
126 private String serviceNo; 126 private String serviceNo;
127 /** 是否电车（TODO：在原系统里没有，这里暂时留着） */ 127 /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
128 private Boolean sfdc; 128 private Boolean sfdc;
129 - /** 能源类型（字典标识-nyType，0；全油，1：全电，2：油电混合） */  
130 - private Integer nyType;  
131 /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */ 129 /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
132 private Boolean sfmix; 130 private Boolean sfmix;
133 /** 备注/描述 */ 131 /** 备注/描述 */
@@ -516,14 +514,6 @@ public class Cars extends BEntity implements Serializable { @@ -516,14 +514,6 @@ public class Cars extends BEntity implements Serializable {
516 public void setCgsbm(String cgsbm) { 514 public void setCgsbm(String cgsbm) {
517 this.cgsbm = cgsbm; 515 this.cgsbm = cgsbm;
518 } 516 }
519 -  
520 - public Integer getNyType() {  
521 - return nyType;  
522 - }  
523 -  
524 - public void setNyType(Integer nyType) {  
525 - this.nyType = nyType;  
526 - }  
527 517
528 public Boolean getSfmix() { 518 public Boolean getSfmix() {
529 return sfmix; 519 return sfmix;
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html
  View file @684f5e7
@@ -284,14 +284,12 @@ @@ -284,14 +284,12 @@
284 </div> 284 </div>
285 285
286 <div class="form-group"> 286 <div class="form-group">
287 - <label class="col-md-2 control-label">能源类型：</label> 287 + <label class="col-md-2 control-label">是否混合电车：</label>
288 <div class="col-md-3"> 288 <div class="col-md-3">
289 - <input type="text" class="form-control"  
290 - name="nyType" ng-value="ctrl.busInfoForDetail.nyType | dict:'nyType':'未知'" readonly/> 289 + <sa-Radiogroup name="sfmix" model="ctrl.busInfoForDetail.sfmix" disabled="true" dicgroup="truefalseType"></sa-Radiogroup>
291 </div> 290 </div>
292 </div> 291 </div>
293 292
294 -  
295 <div class="form-group"> 293 <div class="form-group">
296 <label class="col-md-2 control-label">备注：</label> 294 <label class="col-md-2 control-label">备注：</label>
297 <div class="col-md-10"> 295 <div class="col-md-10">
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
  View file @684f5e7
@@ -447,24 +447,6 @@ @@ -447,24 +447,6 @@
447 <sa-Radiogroup model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup> 447 <sa-Radiogroup model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
448 </div> 448 </div>
449 </div> 449 </div>
450 -  
451 - <div class="form-group">  
452 - <label class="col-md-2 control-label">能源类型：</label>  
453 - <div class="col-md-3">  
454 - <sa-Select5 name="nyType"  
455 - model="ctrl.busInfoForSave"  
456 - cmaps="{'nyType': 'code'}"  
457 - dcname="nyType"  
458 - icname="code"  
459 - dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"  
460 - iterobjname="item"  
461 - iterobjexp="item.name"  
462 - searchph="请选择能源类型..."  
463 - searchexp="this.name"  
464 - >  
465 - </sa-Select5>  
466 - </div>  
467 - </div>  
468 <div class="form-group"> 450 <div class="form-group">
469 <label class="col-md-2 control-label">是否混合电车：</label> 451 <label class="col-md-2 control-label">是否混合电车：</label>
470 <div class="col-md-3"> 452 <div class="col-md-3">
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
  View file @684f5e7
@@ -439,24 +439,6 @@ @@ -439,24 +439,6 @@
439 <sa-Radiogroup model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup> 439 <sa-Radiogroup model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
440 </div> 440 </div>
441 </div> 441 </div>
442 -  
443 - <div class="form-group">  
444 - <label class="col-md-2 control-label">能源类型：</label>  
445 - <div class="col-md-3">  
446 - <sa-Select5 name="nyType"  
447 - model="ctrl.busInfoForSave"  
448 - cmaps="{'nyType': 'code'}"  
449 - dcname="nyType"  
450 - icname="code"  
451 - dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"  
452 - iterobjname="item"  
453 - iterobjexp="item.name"  
454 - searchph="请选择能源类型..."  
455 - searchexp="this.name"  
456 - >  
457 - </sa-Select5>  
458 - </div>  
459 - </div>  
460 442
461 <div class="form-group"> 443 <div class="form-group">
462 <label class="col-md-2 control-label">是否混合电车：</label> 444 <label class="col-md-2 control-label">是否混合电车：</label>