Просмотр исходного кода

解决添加房屋丢失小区ID的问题

wuxw лет назад: 6
Родитель
Сommit
92aa8ec543

+ 1 - 0
Api/src/main/java/com/java110/api/listener/room/BindingAddRoomBindingListener.java

@@ -29,6 +29,7 @@ public class BindingAddRoomBindingListener extends AbstractServiceApiListener {
         JSONArray infos = reqJson.getJSONArray("data");
 
         Assert.hasKeyByFlowData(infos, "addRoomView", "roomNum", "必填,请填写房屋编号");
+        Assert.hasKeyByFlowData(infos, "addRoomView", "communityId", "必填,请填写房屋小区信息");
         Assert.hasKeyByFlowData(infos, "addRoomView", "layer", "必填,请填写房屋楼层");
         Assert.hasKeyByFlowData(infos, "addRoomView", "section", "必填,请填写房屋楼层");
         Assert.hasKeyByFlowData(infos, "addRoomView", "apartment", "必填,请选择房屋户型");

+ 1 - 0
WebService/src/main/resources/components/roomPackage/addRoomBinding/addRoomBinding.js

@@ -15,6 +15,7 @@
         },
         _initEvent:function(){
             vc.on("addRoomBinding", "notify", function(_info){
+                _info.communityId=vc.getCurrentCommunity().communityId;
                 vc.component.addRoomBindingInfo.infos[vc.component.addRoomBindingInfo.index] = _info;
             });
 

+ 93 - 96
WebService/src/main/resources/components/roomPackage/addRoomView/addRoomView.js

@@ -1,127 +1,124 @@
-(function(vc){
+(function(vc) {
 
     vc.extends({
         propTypes: {
-           callBackListener:vc.propTypes.string, //父组件名称
-           callBackFunction:vc.propTypes.string //父组件监听方法
+            callBackListener: vc.propTypes.string,
+            //父组件名称
+            callBackFunction: vc.propTypes.string //父组件监听方法
         },
-        data:{
-            addRoomViewInfo:{
-                flowComponent:'addRoomView',
-                roomNum:'',
-layer:'',
-section:'0',
-apartment:'',
-apartment1:'',
-apartment2:'',
-builtUpArea:'',
-unitPrice:'',
-state:'2002',
-remark:'',
-
+        data: {
+            addRoomViewInfo: {
+                flowComponent: 'addRoomView',
+                roomNum: '',
+                layer: '',
+                section: '0',
+                apartment: '',
+                apartment1: '',
+                apartment2: '',
+                builtUpArea: '',
+                unitPrice: '',
+                state: '2002',
+                remark: '',
+                communityId:vc.getCurrentCommunity().communityId
             }
         },
-        watch:{
-            addRoomViewInfo:{
+        watch: {
+            addRoomViewInfo: {
                 deep: true,
-                handler:function(){
+                handler: function() {
                     vc.component.saveAddRoomInfo();
                 }
-             }
+            }
         },
-         _initMethod:function(){
+        _initMethod: function() {
 
-         },
-         _initEvent:function(){
+},
+        _initEvent: function() {
 
-            vc.on('addRoomViewInfo', 'onIndex', function(_index){
+            vc.on('addRoomViewInfo', 'onIndex',
+            function(_index) {
                 vc.component.addRoomViewInfo.index = _index;
             });
         },
-        methods:{
-            addRoomValidate(){
-                vc.component.addRoomViewInfo.apartment=vc.component.addRoomViewInfo.apartment1+vc.component.addRoomViewInfo.apartment2;
+        methods: {
+            addRoomValidate() {
+                vc.component.addRoomViewInfo.apartment = vc.component.addRoomViewInfo.apartment1 + vc.component.addRoomViewInfo.apartment2;
                 return vc.validate.validate({
-                    addRoomViewInfo:vc.component.addRoomViewInfo
-                },{
-                    'addRoomViewInfo.roomNum':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"房屋编号不能为空"
-                        },
- {
-                            limit:"maxLength",
-                            param:"12",
-                            errInfo:"房屋编号长度不能超过12位"
-                        },
+                    addRoomViewInfo: vc.component.addRoomViewInfo
+                },
+                {
+                    'addRoomViewInfo.roomNum': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "房屋编号不能为空"
+                    },
+                    {
+                        limit: "maxLength",
+                        param: "12",
+                        errInfo: "房屋编号长度不能超过12位"
+                    },
                     ],
-'addRoomViewInfo.layer':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"房屋楼层不能为空"
-                        },
- {
-                            limit:"num",
-                            param:"",
-                            errInfo:"房屋楼层高度必须为数字"
-                        },
+                    'addRoomViewInfo.layer': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "房屋楼层不能为空"
+                    },
+                    {
+                        limit: "num",
+                        param: "",
+                        errInfo: "房屋楼层高度必须为数字"
+                    },
                     ],
-'addRoomViewInfo.apartment':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"房屋户型不能为空"
-                        },
- {
-                            limit:"maxLength",
-                            param:"50",
-                            errInfo:"房屋户型不能大于50"
-                        },
+                    'addRoomViewInfo.apartment': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "房屋户型不能为空"
+                    },
+                    {
+                        limit: "maxLength",
+                        param: "50",
+                        errInfo: "房屋户型不能大于50"
+                    },
                     ],
-'addRoomViewInfo.builtUpArea':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"建筑面积不能为空"
-                        },
- {
-                            limit:"money",
-                            param:"",
-                            errInfo:"建筑面积错误,如 300.00"
-                        },
+                    'addRoomViewInfo.builtUpArea': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "建筑面积不能为空"
+                    },
+                    {
+                        limit: "money",
+                        param: "",
+                        errInfo: "建筑面积错误,如 300.00"
+                    },
                     ],
-'addRoomViewInfo.state':[
-{
-                            limit:"required",
-                            param:"",
-                            errInfo:"房屋状态不能为空"
-                        },
- {
-                            limit:"maxLength",
-                            param:"12",
-                            errInfo:"房屋状态 不能超过12位"
-                        },
+                    'addRoomViewInfo.state': [{
+                        limit: "required",
+                        param: "",
+                        errInfo: "房屋状态不能为空"
+                    },
+                    {
+                        limit: "maxLength",
+                        param: "12",
+                        errInfo: "房屋状态 不能超过12位"
+                    },
                     ],
-'addRoomViewInfo.remark':[
- {
-                            limit:"maxLength",
-                            param:"200",
-                            errInfo:"备注内容不能超过200"
-                        },
+                    'addRoomViewInfo.remark': [{
+                        limit: "maxLength",
+                        param: "200",
+                        errInfo: "备注内容不能超过200"
+                    },
                     ],
 
                 });
             },
-            saveAddRoomInfo:function(){
-                if(vc.component.addRoomValidate()){
+            saveAddRoomInfo: function() {
+                if (vc.component.addRoomValidate()) {
                     //侦听回传
-                    vc.emit($props.callBackListener,$props.callBackFunction, vc.component.addRoomViewInfo);
-                    return ;
+                    vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addRoomViewInfo);
+                    return;
                 }
             }
         }
     });
 
-})(window.vc);
+})(window.vc);

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

@@ -103,9 +103,9 @@
                         <thead>
                         <tr>
                             <th>房屋ID</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>
@@ -121,15 +121,15 @@
                             <td>
                                 {{room.roomId}}
                             </td>
-                            <td>
-                                {{room.roomNum}}
-                            </td>
                             <td>
                                 {{room.floorNum}}
                             </td>
                             <td>
                                 {{room.unitNum}}
                             </td>
+                            <td>
+                                {{room.roomNum}}
+                            </td>
                             <td>
                                 {{room.layer}}
                             </td>

+ 2 - 1
java110-db/src/main/resources/mapper/community/RoomServiceDaoImplMapper.xml

@@ -9,7 +9,8 @@
         insert into business_building_room(
         unit_price,section,remark,user_id,room_id,layer,built_up_area,operate,room_num,unit_id,b_id,apartment,state,community_id
         ) values (
-        #{unitPrice},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},#{communityId}
+        #{unitPrice},#{section},#{remark},#{userId},#{roomId},#{layer},#{builtUpArea},#{operate},#{roomNum},#{unitId},#{bId},#{apartment},#{state},
+        #{communityId}
         )
     </insert>