优化 单元信息 根据条件查询

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

@@ -60,8 +60,7 @@ public class UnitServiceSMOImpl extends BaseComponentSMO implements IUnitService
         //数据校验是否 商户是否入驻该小区
         super.checkStoreEnterCommunity(pd, storeId, storeTypeCd, communityId, restTemplate);
 
-        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/unit.queryUnits?floorId=" + floorId + "&communityId="
-                + communityId;
+        String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/unit.queryUnits" + mapToUrlParam(paramIn);
 
         responseEntity = this.callCenterService(restTemplate, pd, "",
                 apiUrl,

WebService/src/main/resources/components/unitPackage/add-unit/addUnit.html

@@ -9,7 +9,7 @@
                         <div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">单元编号</label>
-                                <div class="col-sm-10"><input v-model="addUnitInfo.unitNum" type="text"
+                                <div class="col-sm-10"><input v-model="addUnitInfo.unitNum" type="number"
                                                               placeholder="必填，请填写单元编号" class="form-control"></div>
                             </div>
                             <div class="form-group row">
@@ -29,8 +29,8 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="addUnitInfo.remark" type="text"
-                                                              placeholder="请填写备注信息" class="form-control"></div>
+                                <div class="col-sm-10"><textarea cols="5" v-model="addUnitInfo.remark" type="text"
+                                                                 placeholder="请填写备注信息" class="form-control"></textarea></div>
                             </div>
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button" v-on:click="addUnit()"><i

WebService/src/main/resources/components/unitPackage/add-unit/addUnit.js

@@ -51,9 +51,9 @@
                                     errInfo:"单元编号不能为空"
                                 },
                                 {
-                                    limit:"maxLength",
-                                    param:"12",
-                                    errInfo:"单元编号长度不能超过12位"
+                                    limit:"num",
+                                    param:"",
+                                    errInfo:"单元编号必须为数字"
                                 },
                             ],
                             'addUnitInfo.layerCount':[

WebService/src/main/resources/components/unitPackage/edit-unit/editUnit.html

@@ -8,7 +8,7 @@
                         <div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">单元编号</label>
-                                <div class="col-sm-10"><input v-model="editUnitInfo.unitNum" type="text" placeholder="必填，请填写单元编号" class="form-control"></div>
+                                <div class="col-sm-10"><input v-model="editUnitInfo.unitNum" type="number" placeholder="必填，请填写单元编号" class="form-control"></div>
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">总层数</label>
@@ -26,7 +26,7 @@
                             </div>
                             <div class="form-group row">
                                 <label class="col-sm-2 col-form-label">备注</label>
-                                <div class="col-sm-10"><input v-model="editUnitInfo.remark" type="text" placeholder="请填写备注信息" class="form-control"></div>
+                                <div class="col-sm-10"><textarea cols="5" v-model="editUnitInfo.remark" type="text" placeholder="请填写备注信息" class="form-control"></textarea></div>
                             </div>
                             <div class="ibox-content">
                                 <button class="btn btn-primary float-right" type="button" v-on:click="editUnit()" ><i class="fa fa-check"></i>&nbsp;保存</button>

WebService/src/main/resources/components/unitPackage/edit-unit/editUnit.js

@@ -42,9 +42,9 @@
                                     errInfo:"单元编号不能为空"
                                 },
                                 {
-                                    limit:"maxLength",
-                                    param:"12",
-                                    errInfo:"单元编号长度不能超过12位"
+                                    limit:"num",
+                                    param:"",
+                                    errInfo:"单元编号必须为数字"
                                 },
                             ],
                             'editUnitInfo.layerCount':[

WebService/src/main/resources/components/unitPackage/unit-manage/unit.html

@@ -86,7 +86,6 @@
                             <th data-hide="phone">总层数</th>
                             <th data-hide="phone">是否有电梯</th>
                             <th data-hide="phone,tablet">创建人</th>
-                            <th data-hide="phone">备注</th>
                             <th class="text-right">操作</th>
 
                         </tr>
@@ -108,9 +107,6 @@
                             <td>
                                 {{unit.userName}}
                             </td>
-                            <td>
-                                {{unit.remark}}
-                            </td>
                             <td class="text-right">
                                 <div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditUnitModel(unit)">修改

WebService/src/main/resources/components/unitPackage/unit-manage/unit.js

@@ -62,11 +62,14 @@
             _openChooseFloorMethod:function(){
                 vc.emit('searchFloor','openSearchFloorModel',{});
             },
-            openAddUnitModel(){
+            openAddUnitModel:function(){
                 vc.emit('addUnit','addUnitModel',{
                     floorId:vc.component.unitInfo.conditions.floorId
                 });
             },
+            _queryUnitMethod:function(){
+                vc.component._loadUnits({'floorId':vc.component.unitInfo.conditions.floorId});
+            }
             _moreCondition:function(){
                 if(vc.component.unitInfo.moreCondition){
                     vc.component.unitInfo.moreCondition = false;

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

@@ -5,133 +5,131 @@
 <mapper namespace="unitServiceDaoImpl">
 
     <!-- 保存小区单元信息 add by wuxw 2018-07-03 -->
-       <insert id="saveBusinessUnitInfo" parameterType="Map">
-           insert into business_building_unit(
-floor_id,operate,layer_count,unit_id,unit_num,lift,remark,b_id,user_id
-) values (
-#{floorId},#{operate},#{layerCount},#{unitId},#{unitNum},#{lift},#{remark},#{bId},#{userId}
-)
-       </insert>
-
-
-       <!-- 查询小区单元信息（Business） add by wuxw 2018-07-03 -->
-       <select id="getBusinessUnitInfo" parameterType="Map" resultType="Map">
-           select  t.floor_id,t.floor_id floorId,t.operate,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId
-from business_building_unit t 
-where 1 =1 
-<if test="floorId !=null and floorId != ''">
-   and t.floor_id= #{floorId}
-</if> 
-<if test="operate !=null and operate != ''">
-   and t.operate= #{operate}
-</if> 
-<if test="layerCount !=null and layerCount != ''">
-   and t.layer_count= #{layerCount}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-   and t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-   and t.lift= #{lift}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-
-       </select>
+    <insert id="saveBusinessUnitInfo" parameterType="Map">
+        insert into business_building_unit(
+        floor_id,operate,layer_count,unit_id,unit_num,lift,remark,b_id,user_id
+        ) values (
+        #{floorId},#{operate},#{layerCount},#{unitId},#{unitNum},#{lift},#{remark},#{bId},#{userId}
+        )
+    </insert>
 
 
+    <!-- 查询小区单元信息（Business） add by wuxw 2018-07-03 -->
+    <select id="getBusinessUnitInfo" parameterType="Map" resultType="Map">
+        select t.floor_id,t.floor_id floorId,t.operate,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
+        unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+        from business_building_unit t
+        where 1 =1
+        <if test="floorId !=null and floorId != ''">
+            and t.floor_id= #{floorId}
+        </if>
+        <if test="operate !=null and operate != ''">
+            and t.operate= #{operate}
+        </if>
+        <if test="layerCount !=null and layerCount != ''">
+            and t.layer_count= #{layerCount}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and t.unit_num= #{unitNum}
+        </if>
+        <if test="lift !=null and lift != ''">
+            and t.lift= #{lift}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
 
+    </select>
 
 
     <!-- 保存小区单元信息至 instance表中 add by wuxw 2018-07-03 -->
     <insert id="saveUnitInfoInstance" parameterType="Map">
         insert into building_unit(
-floor_id,layer_count,unit_id,unit_num,lift,status_cd,remark,b_id,user_id
-) select t.floor_id,t.layer_count,t.unit_id,t.unit_num,t.lift,'0',t.remark,t.b_id,t.user_id from business_building_unit t where 1=1
-<if test="floorId !=null and floorId != ''">
-   and t.floor_id= #{floorId}
-</if> 
-   and t.operate= 'ADD'
-<if test="layerCount !=null and layerCount != ''">
-   and t.layer_count= #{layerCount}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-   and t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-   and t.lift= #{lift}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
+        floor_id,layer_count,unit_id,unit_num,lift,status_cd,remark,b_id,user_id
+        ) select t.floor_id,t.layer_count,t.unit_id,t.unit_num,t.lift,'0',t.remark,t.b_id,t.user_id from
+        business_building_unit t where 1=1
+        <if test="floorId !=null and floorId != ''">
+            and t.floor_id= #{floorId}
+        </if>
+        and t.operate= 'ADD'
+        <if test="layerCount !=null and layerCount != ''">
+            and t.layer_count= #{layerCount}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and t.unit_num= #{unitNum}
+        </if>
+        <if test="lift !=null and lift != ''">
+            and t.lift= #{lift}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
 
     </insert>
 
 
-
     <!-- 查询小区单元信息 add by wuxw 2018-07-03 -->
     <select id="getUnitInfo" parameterType="Map" resultType="Map">
-        select  t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId 
-from building_unit t 
-where 1 =1 
-<if test="floorId !=null and floorId != ''">
-   and t.floor_id= #{floorId}
-</if> 
-<if test="layerCount !=null and layerCount != ''">
-   and t.layer_count= #{layerCount}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-   and t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-   and t.lift= #{lift}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
+        unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id
+        bId,t.user_id,t.user_id userId
+        from building_unit t
+        where 1 =1
+        <if test="floorId !=null and floorId != ''">
+            and t.floor_id= #{floorId}
+        </if>
+        <if test="layerCount !=null and layerCount != ''">
+            and t.layer_count= #{layerCount}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and t.unit_num= #{unitNum}
+        </if>
+        <if test="lift !=null and lift != ''">
+            and t.lift= #{lift}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改小区单元信息 add by wuxw 2018-07-03 -->
     <update id="updateUnitInfoInstance" parameterType="Map">
-        update  building_unit t set t.status_cd = #{statusCd}
+        update building_unit t set t.status_cd = #{statusCd}
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
@@ -153,9 +151,10 @@ where 1 =1
         <if test="userId !=null and userId != ''">
             , t.user_id= #{userId}
         </if>
-        where 1=1 <if test="unitId !=null and unitId != ''">
-        and t.unit_id= #{unitId}
-    </if>
+        where 1=1
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
         <if test="bId !=null and bId != ''">
             and t.b_id= #{bId}
         </if>
@@ -163,43 +162,45 @@ where 1 =1
     </update>
 
     <!-- 查询小区单元数量 add by wuxw 2018-07-03 -->
-     <select id="queryUnitsCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from building_unit t 
-where 1 =1 
-<if test="floorId !=null and floorId != ''">
-   and t.floor_id= #{floorId}
-</if> 
-<if test="layerCount !=null and layerCount != ''">
-   and t.layer_count= #{layerCount}
-</if> 
-<if test="unitId !=null and unitId != ''">
-   and t.unit_id= #{unitId}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-   and t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-   and t.lift= #{lift}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="remark !=null and remark != ''">
-   and t.remark= #{remark}
-</if> 
-<if test="bId !=null and bId != ''">
-   and t.b_id= #{bId}
-</if> 
-<if test="userId !=null and userId != ''">
-   and t.user_id= #{userId}
-</if> 
-
-
-     </select>
+    <select id="queryUnitsCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from building_unit t
+        where 1 =1
+        <if test="floorId !=null and floorId != ''">
+            and t.floor_id= #{floorId}
+        </if>
+        <if test="layerCount !=null and layerCount != ''">
+            and t.layer_count= #{layerCount}
+        </if>
+        <if test="unitId !=null and unitId != ''">
+            and t.unit_id= #{unitId}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            and t.unit_num= #{unitNum}
+        </if>
+        <if test="lift !=null and lift != ''">
+            and t.lift= #{lift}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="remark !=null and remark != ''">
+            and t.remark= #{remark}
+        </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
+        <if test="userId !=null and userId != ''">
+            and t.user_id= #{userId}
+        </if>
+
+
+    </select>
 
     <select id="queryUnitsByCommunityId" parameterType="Map" resultType="Map">
-        select  t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId
+        select t.floor_id,t.floor_id floorId,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id
+        unitId,t.unit_num,t.unit_num unitNum,t.lift,t.status_cd,t.status_cd statusCd,t.remark,t.b_id,t.b_id
+        bId,t.user_id,t.user_id userId
         from building_unit t,s_community sc,s_community_member scm,f_floor f
         where 1 =1
         and t.floor_id = f.floor_id