Merge remote-tracking branch 'origin/qingpu_20180808' into qingpu_20180808

周勤
2 parents 8eccbe22 8285b7f5
Showing 4 changed files with 26 additions and 2 deletions
src/main/java/com/bsth/entity/Cars.java
src/main/java/com/bsth/entity/schedule/BEntity.java
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/edit.html
src/main/resources/static/pages/scheduleApp/module/basicInfo/busInfoManage/form.html
@@ -126,6 +126,8 @@ public class Cars extends BEntity implements Serializable {
     private String serviceNo;
     /** 是否电车（TODO：在原系统里没有，这里暂时留着） */
     private Boolean sfdc;
+    /** 是否混合动力（TODO：在原系统里没有，这里暂时留着） */
+    private Boolean sfmix;
     /** 备注/描述 */
     private String descriptions;
@@ -512,4 +514,12 @@ public class Cars extends BEntity implements Serializable {
     public void setCgsbm(String cgsbm) {
         this.cgsbm = cgsbm;
     }
+
+    public Boolean getSfmix() {
+        return sfmix;
+    }
+
+    public void setSfmix(Boolean sfmix) {
+        this.sfmix = sfmix;
+    }
 }
@@ -12,10 +12,10 @@ import java.util.Date;
 public class BEntity {
     /** 创建人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
     private SysUser createBy;
     /** 修改人 */
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.REFRESH)
     private SysUser updateBy;
     /** 创建日期 */
@@ -449,6 +449,13 @@
                 </div>
                 <div class="form-group">
+                    <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>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"
@@ -441,6 +441,13 @@
                 </div>
                 <div class="form-group">
+                    <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>
+                    </div>
+                </div>
+
+                <div class="form-group">
                     <label class="col-md-2 control-label">备注：</label>
                     <div class="col-md-10">
                         <textarea rows="3" class="form-control" name="descriptions"