修改cars实体，不删除nyType，删除sfmix字段

徐烜
1 parent 684f5e76
Showing 4 changed files with 37 additions and 14 deletions
src/main/java/com/bsth/entity/Cars.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/detail.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
@@ -126,8 +126,8 @@ public class Cars extends BEntity implements Serializable {
     private String serviceNo;
     /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
     private Boolean sfdc;
-    /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
-    private Boolean sfmix;
+    /** 能源类型（字典标识-nyType，0；全油，1：全电，2：油电混合） */
+    private Integer nyType;
     /** 备注/描述 */
     private String descriptions;
  
@@ -514,12 +514,12 @@ public class Cars extends BEntity implements Serializable {
     public void setCgsbm(String cgsbm) {
         this.cgsbm = cgsbm;
     }
-    
-    public Boolean getSfmix() {
-        return sfmix;
+
+    public Integer getNyType() {
+        return nyType;
     }
  
-    public void setSfmix(Boolean sfmix) {
-        this.sfmix = sfmix;
+    public void setNyType(Integer nyType) {
+        this.nyType = nyType;
     }
 }
@@ -284,9 +284,10 @@
                 </div>
  
                 <div class="form-group">
-                    <label class="col-md-2 control-label">是否混合电车：</label>
+                    <label class="col-md-2 control-label">能源类型：</label>
                     <div class="col-md-3">
-                        <sa-Radiogroup name="sfmix" model="ctrl.busInfoForDetail.sfmix" disabled="true" dicgroup="truefalseType"></sa-Radiogroup>
+                        <input type="text" class="form-control"
+                               name="nyType" ng-value="ctrl.busInfoForDetail.nyType | dict:'nyType':'未知'" readonly/>
                     </div>
                 </div>
  
@@ -448,9 +448,20 @@
                     </div>
                 </div>
                 <div class="form-group">
-                    <label class="col-md-2 control-label">是否混合电车：</label>
+                    <label class="col-md-2 control-label">能源类型：</label>
                     <div class="col-md-3">
-                        <sa-Radiogroup model="ctrl.busInfoForSave.sfmix" dicgroup="truefalseType" name="sfmix"></sa-Radiogroup>
+                        <sa-Select5 name="nyType"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'nyType': 'code'}"
+                                    dcname="nyType"
+                                    icname="code"
+                                    dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择能源类型..."
+                                    searchexp="this.name"
+                        >
+                        </sa-Select5>
                     </div>
                 </div>
  
@@ -439,11 +439,22 @@
                         <sa-Radiogroup model="ctrl.busInfoForSave.sfdc" dicgroup="truefalseType" name="sfdc"></sa-Radiogroup>
                     </div>
                 </div>
-                
+
                 <div class="form-group">
-                    <label class="col-md-2 control-label">是否混合电车：</label>
+                    <label class="col-md-2 control-label">能源类型：</label>
                     <div class="col-md-3">
-                        <sa-Radiogroup model="ctrl.busInfoForSave.sfmix" dicgroup="truefalseType" name="sfmix"></sa-Radiogroup>
+                        <sa-Select5 name="nyType"
+                                    model="ctrl.busInfoForSave"
+                                    cmaps="{'nyType': 'code'}"
+                                    dcname="nyType"
+                                    icname="code"
+                                    dsparams="{{ {type: 'dic', param: 'nyType' } | json }}"
+                                    iterobjname="item"
+                                    iterobjexp="item.name"
+                                    searchph="请选择能源类型..."
+                                    searchexp="this.name"
+                        >
+                        </sa-Select5>
                     </div>
                 </div>