优化 停车场

WebService/src/main/resources/components/menuPackage/add-menu/addMenu.js

@@ -97,7 +97,7 @@ description:'',
                     return ;
                 }
 
-                vc.component.addMenuInfo.communityId = vc.getCurrentCommunity().communityId;
+                //vc.component.addMenuInfo.communityId = vc.getCurrentCommunity().communityId;
                 //不提交数据将数据 回调给侦听处理
                 if(vc.notNull($props.callBackListener)){
                     vc.emit($props.callBackListener,$props.callBackFunction,vc.component.addMenuInfo);

WebService/src/main/resources/components/menuPackage/delete-menu/deleteMenu.js

@@ -19,7 +19,7 @@
         },
         methods:{
             deleteMenu:function(){
-                vc.component.deleteMenuInfo.communityId=vc.getCurrentCommunity().communityId;
+                //vc.component.deleteMenuInfo.communityId=vc.getCurrentCommunity().communityId;
                 vc.http.post(
                     'deleteMenu',
                     'delete',

WebService/src/main/resources/components/parkingAreaPackage/add-parkingArea/addParkingArea.html

@@ -1,4 +1,5 @@
-<div id = "addParkingAreaModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="addParkingAreaModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -20,30 +21,36 @@
                             </div>-->
 
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">停车场编号</label>
-         <div class="col-sm-10">
-           <input v-model="addParkingAreaInfo.num"                   type="text" placeholder="必填，请填写停车场编号" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">停车场类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="addParkingAreaInfo.typeCd">
-         <option selected  disabled value="">必填，请选择停车场类型</option>
-         <option  value="1001">地上停车场</option>
-<option  value="2001">地下停车场</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">备注</label>
-         <div class="col-sm-10">
-           <input v-model="addParkingAreaInfo.remark"                   type="text" placeholder="必填，请填写备注" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">停车场编号</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addParkingAreaInfo.num" type="text" placeholder="必填，请填写停车场编号"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">停车场类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="addParkingAreaInfo.typeCd">
+                                        <option selected disabled value="">必填，请选择停车场类型</option>
+                                        <option value="1001">地上停车场</option>
+                                        <option value="2001">地下停车场</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10">
+                                    <input v-model="addParkingAreaInfo.remark" type="text" placeholder="可选，请填写备注"
+                                           class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="saveParkingAreaInfo()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="saveParkingAreaInfo()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/parkingAreaPackage/edit-parkingArea/editParkingArea.html

@@ -1,4 +1,5 @@
-<div id = "editParkingAreaModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true" >
+<div id="editParkingAreaModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
+     aria-hidden="true">
     <div class="modal-dialog modal-lg">
         <div class="modal-content">
             <div class="modal-body">
@@ -7,30 +8,36 @@
                     <div>
                         <div>
                             <div class="form-group row">
-         <label class="col-sm-2 col-form-label">停车场编号</label>
-         <div class="col-sm-10">
-           <input v-model="editParkingAreaInfo.num"                   type="text" placeholder="必填，请填写停车场编号" class="form-control">
-         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">停车场类型</label>
-         <div class="col-sm-10">
-<select class="custom-select" v-model="editParkingAreaInfo.typeCd">
-         <option selected  disabled value="">必填，请选择停车场类型</option>
-         <option  value="1001">地上停车场</option>
-<option  value="2001">地下停车场</option>
-  </select>         </div>
-</div>
-<div class="form-group row">
-         <label class="col-sm-2 col-form-label">备注</label>
-         <div class="col-sm-10">
-           <input v-model="editParkingAreaInfo.remark"                   type="text" placeholder="必填，请填写备注" class="form-control">
-         </div>
-</div>
+                                <label class="col-sm-2 col-form-label">停车场编号</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editParkingAreaInfo.num" type="text" placeholder="必填，请填写停车场编号"
+                                           class="form-control">
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">停车场类型</label>
+                                <div class="col-sm-10">
+                                    <select class="custom-select" v-model="editParkingAreaInfo.typeCd">
+                                        <option selected disabled value="">必填，请选择停车场类型</option>
+                                        <option value="1001">地上停车场</option>
+                                        <option value="2001">地下停车场</option>
+                                    </select></div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-sm-2 col-form-label">备注</label>
+                                <div class="col-sm-10">
+                                    <input v-model="editParkingAreaInfo.remark" type="text" placeholder="可填，请填写备注"
+                                           class="form-control">
+                                </div>
+                            </div>
 
                             <div class="ibox-content">
-                                <button class="btn btn-primary float-right" type="button" v-on:click="editParkingArea()" ><i class="fa fa-check"></i>&nbsp;保存</button>
-                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;" data-dismiss="modal">取消</button>
+                                <button class="btn btn-primary float-right" type="button"
+                                        v-on:click="editParkingArea()"><i class="fa fa-check"></i>&nbsp;保存
+                                </button>
+                                <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
+                                        data-dismiss="modal">取消
+                                </button>
                             </div>
                         </div>
                     </div>

WebService/src/main/resources/components/parkingAreaPackage/parkingArea-manage/parkingAreaManage.html

@@ -5,27 +5,35 @@
                 <div class="ibox-title">
                     <h5>查询条件</h5>
                     <div class="ibox-tools" style="top:10px;">
-                        
+
                     </div>
                 </div>
                 <div class="ibox-content">
                     <div class="row">
-<div class="col-sm-4" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入停车场编号" v-model="parkingAreaManageInfo.conditions.num" class=" form-control">
-                            </div>                        </div><div class="col-sm-4" >
-<select class="custom-select" v-model="parkingAreaManageInfo.conditions.typeCd">
-         <option selected  value="">请选择停车场类型</option>
-         <option  value="1001">地上停车场</option>
-<option  value="2001">地下停车场</option>
-  </select>                        </div><div class="col-sm-3" >
-<div class="form-group">
-                                <input type="text" placeholder="请输入停车场ID" v-model="parkingAreaManageInfo.conditions.paId" class=" form-control">
-                            </div>                        </div><div class="col-sm-1">
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入停车场编号" v-model="parkingAreaManageInfo.conditions.num"
+                                       class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-4">
+                            <select class="custom-select" v-model="parkingAreaManageInfo.conditions.typeCd">
+                                <option selected value="">请选择停车场类型</option>
+                                <option value="1001">地上停车场</option>
+                                <option value="2001">地下停车场</option>
+                            </select></div>
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <input type="text" placeholder="请输入停车场ID"
+                                       v-model="parkingAreaManageInfo.conditions.paId" class=" form-control">
+                            </div>
+                        </div>
+                        <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryParkingAreaMethod()">
-                                    <i class="glyphicon glyphicon-search"></i> 查询
+                                <i class="glyphicon glyphicon-search"></i> 查询
                             </button>
-                        </div></div>
+                        </div>
+                    </div>
 
 
                 </div>
@@ -40,7 +48,7 @@
                     <div class="ibox-tools" style="top:10px;">
                         <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddParkingAreaModal()">
                             <i class="glyphicon glyphicon-plus"></i>
-                            添加停车场
+                            添加
                         </button>
                     </div>
                 </div>
@@ -51,25 +59,31 @@
                     >
                         <thead>
                         <tr>
-                                                        <th class="text-center">停车场ID</th>
+                            <th class="text-center">停车场ID</th>
                             <th class="text-center">停车场编号</th>
                             <th class="text-center">停车场类型</th>
+                            <th class="text-center">创建时间</th>
                             <th class="text-center">操作</th>
-
-
                         </tr>
                         </thead>
                         <tbody>
                         <tr v-for="parkingArea in parkingAreaManageInfo.parkingAreas">
-                                                        <td class="text-center">{{parkingArea.paId}}</td>
+                            <td class="text-center">{{parkingArea.paId}}</td>
                             <td class="text-center">{{parkingArea.num}}</td>
                             <td class="text-center">{{parkingArea.typeCd}}</td>
-                            <td class="text-center"><div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openEditParkingAreaModel(parkingArea)">修改</button>
+                            <td class="text-center">{{parkingArea.createTime}}</td>
+                            <td class="text-center">
+                                <div class="btn-group">
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openEditParkingAreaModel(parkingArea)">修改
+                                    </button>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn-white btn btn-xs" v-on:click="_openDeleteParkingAreaModel(parkingArea)">删除</button>
-                                </div></td>
+                                    <button class="btn-white btn btn-xs"
+                                            v-on:click="_openDeleteParkingAreaModel(parkingArea)">删除
+                                    </button>
+                                </div>
+                            </td>
 
                         </tr>
                         </tbody>
@@ -88,7 +102,6 @@
         </div>
     </div>
 
-    
 
     <vc:create name="addParkingArea"
                callBackListener=""

java110-bean/src/main/java/com/java110/dto/parking/ParkingAreaDto.java

@@ -22,7 +22,7 @@ public class ParkingAreaDto extends PageDto implements Serializable {
     private String communityId;
 
 
-    private Date createTime;
+    private String createTime;
 
     private String statusCd = "0";
 
@@ -67,12 +67,11 @@ public class ParkingAreaDto extends PageDto implements Serializable {
         this.communityId = communityId;
     }
 
-
-    public Date getCreateTime() {
+    public String getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(Date createTime) {
+    public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
 

java110-bean/src/main/java/com/java110/vo/api/parkingArea/ApiParkingAreaDataVo.java

@@ -6,34 +6,49 @@ import java.util.Date;
 public class ApiParkingAreaDataVo implements Serializable {
 
     private String paId;
-private String num;
-private String typeCd;
-private String remark;
-public String getPaId() {
+    private String num;
+    private String typeCd;
+    private String remark;
+
+    private String createTime;
+
+    public String getPaId() {
         return paId;
     }
-public void setPaId(String paId) {
+
+    public void setPaId(String paId) {
         this.paId = paId;
     }
-public String getNum() {
+
+    public String getNum() {
         return num;
     }
-public void setNum(String num) {
+
+    public void setNum(String num) {
         this.num = num;
     }
-public String getTypeCd() {
+
+    public String getTypeCd() {
         return typeCd;
     }
-public void setTypeCd(String typeCd) {
+
+    public void setTypeCd(String typeCd) {
         this.typeCd = typeCd;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
 
+    public String getCreateTime() {
+        return createTime;
+    }
 
-
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
 }

java110-db/src/main/resources/mapper/community/ParkingAreaServiceDaoImplMapper.xml

@@ -5,167 +5,164 @@
 <mapper namespace="parkingAreaServiceDaoImpl">
 
     <!-- 保存停车场信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessParkingAreaInfo" parameterType="Map">
-           insert into business_parking_area(
-operate,type_cd,num,pa_id,remark,community_id,b_id
-) values (
-#{operate},#{typeCd},#{num},#{paId},#{remark},#{communityId},#{bId}
-)
-       </insert>
-
-
-       <!-- 查询停车场信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessParkingAreaInfo" parameterType="Map" resultType="Map">
-           select  t.operate,t.type_cd,t.type_cd typeCd,t.num,t.pa_id,t.pa_id paId,t.remark,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
-from business_parking_area t 
-where 1 =1 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="num !=null and num != ''">
-   and t.num= #{num}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-
-       </select>
+    <insert id="saveBusinessParkingAreaInfo" parameterType="Map">
+        insert into business_parking_area(
+        operate,type_cd,num,pa_id,remark,community_id,b_id
+        ) values (
+        #{operate},#{typeCd},#{num},#{paId},#{remark},#{communityId},#{bId}
+        )
+    </insert>
 
 
+    <!-- 查询停车场信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessParkingAreaInfo" parameterType="Map" resultType="Map">
+        select t.operate,t.type_cd,t.type_cd typeCd,t.num,t.pa_id,t.pa_id paId,t.remark,t.community_id,t.community_id
+        communityId,t.b_id,t.b_id bId
+        from business_parking_area t
+        where 1 =1
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="num !=null and num != ''">
+            and t.num= #{num}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
+    </select>
 
 
     <!-- 保存停车场信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveParkingAreaInfoInstance" parameterType="Map">
         insert into parking_area(
-type_cd,num,pa_id,remark,status_cd,community_id,b_id
-) select t.type_cd,t.num,t.pa_id,t.remark,'0',t.community_id,t.b_id from business_parking_area t where 1=1
-   and t.operate= 'ADD'
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="num !=null and num != ''">
-   and t.num= #{num}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
+        type_cd,num,pa_id,remark,status_cd,community_id,b_id
+        ) select t.type_cd,t.num,t.pa_id,t.remark,'0',t.community_id,t.b_id from business_parking_area t where 1=1
+        and t.operate= 'ADD'
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="num !=null and num != ''">
+            and t.num= #{num}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询停车场信息 add by wuxw 2018-07-03 -->
     <select id="getParkingAreaInfo" parameterType="Map" resultType="Map">
-        select  t.type_cd,t.type_cd typeCd,t.num,t.pa_id,t.pa_id paId,t.remark,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId 
-from parking_area t 
-where 1 =1 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="num !=null and num != ''">
-   and t.num= #{num}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.type_cd,t.type_cd typeCd,t.num,t.pa_id,t.pa_id paId,t.remark,t.status_cd,t.status_cd
+        statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.create_time createTime
+        from parking_area t
+        where 1 =1
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="num !=null and num != ''">
+            and t.num= #{num}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改停车场信息 add by wuxw 2018-07-03 -->
     <update id="updateParkingAreaInfoInstance" parameterType="Map">
-        update  parking_area t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="typeCd !=null and typeCd != ''">
-, t.type_cd= #{typeCd}
-</if> 
-<if test="num !=null and num != ''">
-, t.num= #{num}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
- where 1=1 <if test="paId !=null and paId != ''">
-and t.pa_id= #{paId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        update parking_area t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="typeCd !=null and typeCd != ''">
+            , t.type_cd= #{typeCd}
+        </if>
+        <if test="num !=null and num != ''">
+            , t.num= #{num}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        where 1=1
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>
 
     <!-- 查询停车场数量 add by wuxw 2018-07-03 -->
-     <select id="queryParkingAreasCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from parking_area t 
-where 1 =1 
-<if test="typeCd !=null and typeCd != ''">
-   and t.type_cd= #{typeCd}
-</if> 
-<if test="num !=null and num != ''">
-   and t.num= #{num}
-</if> 
-<if test="paId !=null and paId != ''">
-   and t.pa_id= #{paId}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-
-
-     </select>
+    <select id="queryParkingAreasCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from parking_area t
+        where 1 =1
+        <if test="typeCd !=null and typeCd != ''">
+            and t.type_cd= #{typeCd}
+        </if>
+        <if test="num !=null and num != ''">
+            and t.num= #{num}
+        </if>
+        <if test="paId !=null and paId != ''">
+            and t.pa_id= #{paId}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+
+
+    </select>
 
 </mapper>