优化第一次提交

Api/src/main/java/com/java110/api/listener/room/SaveRoomListener.java

@@ -125,9 +125,9 @@ public class SaveRoomListener extends AbstractServiceApiDataFlowListener {
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
         Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
 
-        if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
+        /*if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");
-        }
+        }*/
 
         if (!"2001".equals(reqJson.getString("state"))
                 && !"2002".equals(reqJson.getString("state"))

Api/src/main/java/com/java110/api/listener/room/UpdateRoomListener.java

@@ -115,19 +115,19 @@ public class UpdateRoomListener extends AbstractServiceApiDataFlowListener {
         Assert.jsonObjectHaveKey(paramIn, "unitId", "请求报文中未包含unitId节点");
         Assert.jsonObjectHaveKey(paramIn, "roomNum", "请求报文中未包含roomNum节点");
         Assert.jsonObjectHaveKey(paramIn, "layer", "请求报文中未包含layer节点");
-        Assert.jsonObjectHaveKey(paramIn, "section", "请求报文中未包含section节点");
+        /*Assert.jsonObjectHaveKey(paramIn, "section", "请求报文中未包含section节点");*/
         Assert.jsonObjectHaveKey(paramIn, "apartment", "请求报文中未包含apartment节点");
         Assert.jsonObjectHaveKey(paramIn, "builtUpArea", "请求报文中未包含builtUpArea节点");
         Assert.jsonObjectHaveKey(paramIn, "state", "请求报文中未包含state节点");
-        Assert.jsonObjectHaveKey(paramIn, "unitPrice", "请求报文中未包含unitPrice节点");
+       /* Assert.jsonObjectHaveKey(paramIn, "unitPrice", "请求报文中未包含unitPrice节点");*/
         JSONObject reqJson = JSONObject.parseObject(paramIn);
         Assert.isInteger(reqJson.getString("section"), "房间数不是有效数字");
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
         Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
 
-        if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
+        /*if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");
-        }
+        }*/
 
         if (!"2001".equals(reqJson.getString("state"))
                 && !"2002".equals(reqJson.getString("state"))

WebService/src/main/java/com/java110/web/smo/addRoomBinding/impl/AddRoomBindingBindingSMOImpl.java

@@ -33,10 +33,10 @@ public class AddRoomBindingBindingSMOImpl extends AbstractComponentSMO implement
         //Assert.hasKeyAndValue(paramIn, "xxx", "xxx");
         Assert.hasKeyByFlowData(infos, "addRoomView", "roomNum", "必填，请填写房屋编号");
         Assert.hasKeyByFlowData(infos, "addRoomView", "layer", "必填，请填写房屋楼层");
-        Assert.hasKeyByFlowData(infos, "addRoomView", "section", "必填，请填写房屋楼层");
+        /*Assert.hasKeyByFlowData(infos, "addRoomView", "section", "必填，请填写房屋楼层");*/
         Assert.hasKeyByFlowData(infos, "addRoomView", "apartment", "必填，请选择房屋户型");
         Assert.hasKeyByFlowData(infos, "addRoomView", "builtUpArea", "必填，请填写房屋建筑面积");
-        Assert.hasKeyByFlowData(infos, "addRoomView", "unitPrice", "必填，请填写房屋每平米单价");
+       /* Assert.hasKeyByFlowData(infos, "addRoomView", "unitPrice", "必填，请填写房屋每平米单价");*/
         Assert.hasKeyByFlowData(infos, "addRoomView", "state", "必填，请选择房屋状态");
 
 

WebService/src/main/java/com/java110/web/smo/impl/FeeServiceSMOImpl.java

@@ -483,9 +483,9 @@ public class FeeServiceSMOImpl extends BaseComponentSMO implements IFeeServiceSM
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
         Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
 
-        if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
+       /* if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");
-        }
+        }*/
 
         if (!"2001".equals(reqJson.getString("state"))
                 && !"2002".equals(reqJson.getString("state"))

WebService/src/main/java/com/java110/web/smo/impl/RoomServiceSMOImpl.java

@@ -426,11 +426,11 @@ public class RoomServiceSMOImpl extends BaseComponentSMO implements IRoomService
         Assert.jsonObjectHaveKey(pd.getReqData(), "unitId", "请求报文中未包含unitId节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "roomNum", "请求报文中未包含roomNum节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "layer", "请求报文中未包含layer节点");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "section", "请求报文中未包含section节点");
+        /*Assert.jsonObjectHaveKey(pd.getReqData(), "section", "请求报文中未包含section节点");*/
         Assert.jsonObjectHaveKey(pd.getReqData(), "apartment", "请求报文中未包含apartment节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "builtUpArea", "请求报文中未包含builtUpArea节点");
         Assert.jsonObjectHaveKey(pd.getReqData(), "state", "请求报文中未包含state节点");
-        Assert.jsonObjectHaveKey(pd.getReqData(), "unitPrice", "请求报文中未包含unitPrice节点");
+        /*Assert.jsonObjectHaveKey(pd.getReqData(), "unitPrice", "请求报文中未包含unitPrice节点");*/
         JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
 
         Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空");
@@ -438,9 +438,9 @@ public class RoomServiceSMOImpl extends BaseComponentSMO implements IRoomService
         Assert.isMoney(reqJson.getString("builtUpArea"), "建筑面积数据格式错误");
         Assert.isMoney(reqJson.getString("unitPrice"), "房屋单价数据格式错误");
 
-        if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
+       /* if (!"1010".equals(reqJson.getString("apartment")) && !"2020".equals(reqJson.getString("apartment"))) {
             throw new IllegalArgumentException("不是有效房屋户型 传入数据错误");
-        }
+        }*/
 
         if (!"2001".equals(reqJson.getString("state"))
                 && !"2002".equals(reqJson.getString("state"))

WebService/src/main/resources/components/companyPackage/company-base/company-base.html

@@ -6,13 +6,20 @@
                 <label>公司名称 *</label>
                 <input id="name" v-model="companyBaseInfo.name" type="text" class="form-control required" aria-required="true" />
             </div>
-            <div class="form-group">
+            <div class="dropdown">
                 <label>公司地址 *</label>
+
+                <select id="pro" class="btn btn-secondary dropdown-toggle" >
+                <option value="">请选择省</option>
+            </select>
+                <select id="city" class="btn btn-secondary dropdown-toggle" >
+                    <option value="">请选择市</option>
+                </select>
                 <input  name="address" v-model="companyBaseInfo.address" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>联系电话 *</label>
-                <input name="tel" v-model="companyBaseInfo.tel" type="text" class="form-control required" aria-required="true" />
+                <input name="tel" v-model="companyBaseInfo.tel" type="number" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
                 <label>公司业务 *</label>

WebService/src/main/resources/components/companyPackage/company-cerdentials/company-cerdentials.html

@@ -9,8 +9,8 @@
         </div>
         <div class="col-lg-8">
             <div class="form-group">
-                <label>有效期(yyyy-mm-dd) *</label>
-                <input v-model="companyCerdentialsInfo.validityPeriod" size="16" type="text" placeholder="请选择时间"   readonly class="form-control form-control-sm company_time">
+                <label>有效期*</label>
+                <input v-model="companyCerdentialsInfo.validityPeriod" size="16" type="text" placeholder="请选择时间(yyyy-mm-dd)"   readonly class="form-control form-control-sm company_time">
 
             </div>
         </div>

WebService/src/main/resources/components/companyPackage/company-extend/company-extend.html

@@ -11,17 +11,17 @@
                 <input  v-model="companyExtendInfo.registeredCapital" type="text" class="form-control required" aria-required="true" />
             </div>
             <div class="form-group">
-                <label>成立日期(yyyy-mm-dd) *</label>
-                <input v-model="companyExtendInfo.foundingTime" size="16" type="text" placeholder="请选择时间"  readonly class="form-control form-control-sm extend_time">
+                <label>成立日期*</label>
+                <input v-model="companyExtendInfo.foundingTime" size="16" type="text" placeholder="请选择时间(yyyy-mm-dd) "  readonly class="form-control form-control-sm extend_time">
             </div>
             <div class="form-group">
                 <label>登记机关 *</label>
-                <input  v-model="companyExtendInfo.registrationAuthority" type="text" class="form-control required" aria-required="true" />
+                <input  v-model="companyExtendInfo.registrationAuthority" type="text" placeholder="填写营业执照上的登记机关" class="form-control required" aria-required="true" />
 
             </div>
             <div class="form-group">
                 <label>经营范围 *</label>
-                <input  v-model="companyExtendInfo.scope" type="text" class="form-control required" aria-required="true" />
+                <textarea  v-model="companyExtendInfo.scope" rows="20" cols="180" class="form-control required" aria-required="true" />
             </div>
         </div>
         <div class="col-lg-4">

WebService/src/main/resources/components/floorPackage/view-floor-info/viewFloorInfo.html

@@ -39,7 +39,7 @@
                 <div class="row">
                     <div class="col-sm-4">
                         <div class="form-group">
-                            <label class="col-form-label">楼名称：</label>
+                            <label class="col-form-label">备注：</label>
                             <label class="">{{viewFloorInfo.remark}}</label>
                         </div>
                     </div>

WebService/src/main/resources/components/roomPackage/addRoomBinding/addRoomBinding.js

@@ -56,6 +56,9 @@
 
 
                 var _currentData = vc.component.addRoomBindingInfo.infos[vc.component.addRoomBindingInfo.index];
+                if ('' == vc.component.addRoomViewInfo.unitPrice || null == vc.component.addRoomViewInfo.unitPrice){
+                    vc.component.addRoomViewInfo.unitPrice='0';
+                }
                 if( _currentData == null || _currentData == undefined){
                     vc.message("请选择或填写必选信息");
                     return ;
@@ -78,8 +81,8 @@
                            vc.message('处理成功',true);
                            //关闭model
                            var _tmpResJson = JSON.parse(json);
-                           _tmpResJson[floorName] = vc.component._getFloorName();
-                           vc.jumpToPage("/flow/roomFlow?" + vc.objToGetParam(_tmpResJson));
+                          /* _tmpResJson[floorName] = vc.component._getFloorName();*/
+                           vc.jumpToPage("/flow/roomFlow");
                            return ;
                        }
                        vc.message(json);

WebService/src/main/resources/components/roomPackage/addRoomView/addRoomView.html

@@ -23,33 +23,54 @@
                                class="form-control">
                     </div>
                 </div>
-                <div class="form-group row">
+               <!-- <div class="form-group row">
                     <label class="col-sm-2 col-form-label">房间数</label>
                     <div class="col-sm-10">
                         <input v-model="addRoomViewInfo.section" type="text" placeholder="必填，请填写房间数"
                                class="form-control">
                     </div>
-                </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="addRoomViewInfo.apartment">
+                    <div class="col-sm-5" style="display: inline">
+                        <select class="custom-select" v-model="addRoomViewInfo.apartment1">
                             <option selected disabled value="">必填，请选择房屋户型</option>
-                            <option value="1010">一室两厅</option>
-                            <option value="2020">两室两厅</option>
-                        </select></div>
+                            <option value="10">一室</option>
+                            <option value="20">两室</option>
+                            <option value="30">三室</option>
+                            <option value="40">四室</option>
+                            <option value="50">五室</option>
+                            <option value="60">六室</option>
+                            <option value="70">七室</option>
+                            <option value="80">八室</option>
+                        </select>
+                    </div>
+                    <div class="col-sm-5" style="display: inline">
+                    <select class="custom-select" v-model="addRoomViewInfo.apartment2">
+                        <option selected disabled value="">必填，请选择房屋户型</option>
+                        <option value="101">一厅</option>
+                        <option value="102">两厅</option>
+                        <option value="103">三厅</option>
+                        <option value="104">四厅</option>
+                        <option value="105">五厅</option>
+                        <option value="106">六厅</option>
+                        <option value="107">七厅</option>
+                        <option value="108">八厅</option>
+
+                    </select>
+                    </div>
                 </div>
                 <div class="form-group row">
-                    <label class="col-sm-2 col-form-label">建筑面积</label>
+                    <label class="col-sm-2 col-form-label">建筑面积(平方)</label>
                     <div class="col-sm-10">
-                        <input v-model="addRoomViewInfo.builtUpArea" type="text" placeholder="必填，请填写建筑面积"
+                        <input v-model="addRoomViewInfo.builtUpArea" type="text" placeholder="必填，请填写建筑面积! 平方"
                                class="form-control">
                     </div>
                 </div>
                 <div class="form-group row">
-                    <label class="col-sm-2 col-form-label">房屋单价</label>
+                    <label class="col-sm-2 col-form-label">房屋单价(万)</label>
                     <div class="col-sm-10">
-                        <input v-model="addRoomViewInfo.unitPrice" type="text" placeholder="必填，请填写房屋单价"
+                        <input v-model="addRoomViewInfo.unitPrice" type="text" placeholder="请填写房屋单价! 万元"
                                class="form-control">
                     </div>
                 </div>

WebService/src/main/resources/components/roomPackage/addRoomView/addRoomView.js

@@ -10,8 +10,10 @@
                 flowComponent:'addRoomView',
                 roomNum:'',
 layer:'',
-section:'',
+section:'0',
 apartment:'',
+apartment1:'',
+apartment2:'',
 builtUpArea:'',
 unitPrice:'',
 state:'2002',
@@ -38,6 +40,7 @@ remark:'',
         },
         methods:{
             addRoomValidate(){
+                vc.component.addRoomViewInfo.apartment=vc.component.addRoomViewInfo.apartment1+vc.component.addRoomViewInfo.apartment2;
                 return vc.validate.validate({
                     addRoomViewInfo:vc.component.addRoomViewInfo
                 },{
@@ -65,18 +68,6 @@ remark:'',
                             errInfo:"房屋楼层高度必须为数字"
                         },
                     ],
-'addRoomViewInfo.section':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"房间数不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"房间数必须为数字"
-                        },
-                    ],
 'addRoomViewInfo.apartment':[
 {
                             limit:"required",
@@ -101,18 +92,6 @@ remark:'',
                             errInfo:"建筑面积错误，如 300.00"
                         },
                     ],
-'addRoomViewInfo.unitPrice':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"房屋单价不能为空"
-                        },
- {
-                            limit:"money",
-                            param:"",
-                            errInfo:"房屋单价错误 如 300.00"
-                        },
-                    ],
 'addRoomViewInfo.state':[
 {
                             limit:"required",

WebService/src/main/resources/components/roomPackage/edit-room/editRoom.html

@@ -23,34 +23,54 @@
                                     </select>
                                 </div>
                             </div>
-                            <div class="form-group row">
+                            <!--<div class="form-group row">
                                 <label class="col-sm-2 col-form-label">房间数</label>
                                 <div class="col-sm-10"><input v-model="editRoomInfo.section" type="number" placeholder="必填，请填写房屋楼层" class="form-control"></div>
-                            </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="editRoomInfo.apartment">
-                                        <option selected disabled value="">必填，请选择房屋户型</option>
-                                        <option value="1010">一室两厅</option>
-                                        <option value="2020">两室两厅</option>
+                                <div class="col-sm-5" style="display: inline">
+                                    <select class="custom-select" v-model="editRoomInfo.apartment1">
+                                        <option selected  value="">必填，请选择房屋户型</option>
+                                        <option value="10">一室</option>
+                                        <option value="20">两室</option>
+                                        <option value="30">三室</option>
+                                        <option value="40">四室</option>
+                                        <option value="50">五室</option>
+                                        <option value="60">六室</option>
+                                        <option value="70">七室</option>
+                                        <option value="80">八室</option>
+                                    </select>
+                                </div>
+                                <div class="col-sm-5" style="display: inline">
+                                    <select class="custom-select" v-model="editRoomInfo.apartment2">
+                                        <option selected  value="">必填，请选择房屋户型</option>
+                                        <option value="101">一厅</option>
+                                        <option value="102">两厅</option>
+                                        <option value="103">三厅</option>
+                                        <option value="104">四厅</option>
+                                        <option value="105">五厅</option>
+                                        <option value="106">六厅</option>
+                                        <option value="107">七厅</option>
+                                        <option value="108">八厅</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="editRoomInfo.builtUpArea" type="number" placeholder="必填，请填写房屋建筑面积" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editRoomInfo.builtUpArea" type="number" 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"><input v-model="editRoomInfo.unitPrice" type="number" placeholder="必填，请填写房屋美平米单价" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editRoomInfo.unitPrice" type="number" 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="editRoomInfo.state">
-                                        <option selected disabled value="">必填，请选择房屋状态</option>
+                                    <select class="custom-select" disabled="disabled" readonly="true" v-model="editRoomInfo.state">
+                                        <option selected  value="">必填，请选择房屋状态</option>
                                         <option value="2001">已出售</option>
                                         <option value="2002">未出售</option>
                                         <option value="2003">已交定金</option>

WebService/src/main/resources/components/roomPackage/edit-room/editRoom.js

@@ -8,8 +8,10 @@
                 unitId:'',
                 roomNum:'',
                 layer:'',
-                section:'',
+                section:'0',
                 apartment:'',
+                apartment1:'',
+                apartment2:'',
                 builtUpArea:'',
                 unitPrice:'',
                 state:'',
@@ -52,6 +54,12 @@
                         if(res.status == 200){
                             var tmpUnits = JSON.parse(json);
                             vc.component.editRoomUnits = tmpUnits;
+
+                            if('0.00' == vc.component.editRoomInfo.unitPrice){
+                                vc.component.editRoomInfo.unitPrice='';
+                            }
+                            vc.component.editRoomInfo.apartment1=vc.component.editRoomInfo.apartment.substr(0,2);
+                            vc.component.editRoomInfo.apartment2=vc.component.editRoomInfo.apartment.substr(2,5);
                             /*if(tmpUnits == null || tmpUnits.length == 0){
                                 return ;
                             }
@@ -103,7 +111,7 @@
                                     errInfo:"房屋楼层高度必须为数字"
                                 }
                             ],
-                            'editRoomInfo.section':[
+                            /*'editRoomInfo.section':[
                                 {
                                     limit:"required",
                                     param:"",
@@ -114,7 +122,7 @@
                                     param:"",
                                     errInfo:"房间数必须为数字"
                                 }
-                            ],
+                            ],*/
                             'editRoomInfo.state':[
                                 {
                                     limit:"required",
@@ -146,7 +154,7 @@
                                   errInfo:"建筑面积数字长度不能超过6位"
                                 }
                             ],
-                            'editRoomInfo.unitPrice':[
+                            /*'editRoomInfo.unitPrice':[
                                 {
                                     limit:"required",
                                     param:"",
@@ -162,7 +170,7 @@
                                    param:"12",
                                    errInfo:"房屋单价数字长度不能超过12位"
                                  }
-                            ],
+                            ],*/
                             'editRoomInfo.remark':[
                                 {
                                     limit:"maxLength",
@@ -178,7 +186,10 @@
                     vc.message(vc.validate.errInfo);
                     return ;
                 }
-
+                vc.component.editRoomInfo.apartment=vc.component.editRoomInfo.apartment1+vc.component.editRoomInfo.apartment2;
+                if ('' == vc.component.editRoomInfo.unitPrice || null == vc.component.editRoomInfo.unitPrice){
+                    vc.component.editRoomInfo.unitPrice='0';
+                }
                 vc.http.post(
                     'editRoom',
                     'update',
@@ -209,7 +220,7 @@
                   unitId:'',
                   roomNum:'',
                   layer:'',
-                  section:'',
+                  section:'0',
                   apartment:'',
                   builtUpArea:'',
                   unitPrice:'',

WebService/src/main/resources/components/roomPackage/room-manage/room.html

@@ -107,7 +107,7 @@
                             <th data-hide="phone">楼栋编号</th>
                             <th data-hide="phone">单元</th>
                             <th data-hide="phone">楼层</th>
-                            <th data-hide="phone">户型</th>
+                            <!--<th data-hide="phone">户型</th>-->
                             <th data-hide="phone">建筑面积</th>
                             <th data-hide="phone">单价</th>
                             <th data-hide="phone">房屋状态</th>
@@ -133,14 +133,14 @@
                             <td>
                                 {{room.layer}}
                             </td>
-                            <td>
+                            <!--<td>
                                 {{room.apartment}}
-                            </td>
+                            </td>-->
                             <td>
                                 {{room.builtUpArea}}
                             </td>
                             <td>
-                                {{room.unitPrice}}
+                                {{room.unitPrice != '0.00'?room.unitPrice:'0'}}
                             </td>
                             <td>
                                 {{vc.component.showState(room.state)}}

java110-db/src/main/resources/mapper/unit/UnitServiceDaoImplMapper.xml

@@ -120,10 +120,10 @@
         <if test="userId !=null and userId != ''">
             and t.user_id= #{userId}
         </if>
-        <if test="page != -1 and page != null ">
+       <!-- <if test="page != -1 and page != null ">
             limit #{page}, #{row}
-        </if>
-
+        </if>-->
+            limit 10;
     </select>