期

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TpBuildingOwnerInfo.java

@@ -9,6 +9,9 @@ public class TpBuildingOwnerInfo {
 
     private String idCard;
 
+    // 期
+    private String phase;
+
     private String building;
 
     private String unit;
@@ -59,6 +62,14 @@ public class TpBuildingOwnerInfo {
         this.idCard = idCard == null ? null : idCard.trim();
     }
 
+    public String getPhase() {
+        return phase;
+    }
+
+    public void setPhase(String phase) {
+        this.phase = phase;
+    }
+
     public String getBuilding() {
         return building;
     }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/TaUserServiceImpl.java

@@ -847,7 +847,7 @@ public class TaUserServiceImpl implements ITaUserService {
         TaUserVO userVO = new TaUserVO();
         BeanUtils.copyProperties(user,userVO);
         userVO.setAddressProvince(province.getProvince()+""+city.getCity()+""+district.getDistrict());
-        userVO.setAddressBuilding(tpBuildingOwnerInfo.getBuilding()
+        userVO.setAddressBuilding(tpBuildingOwnerInfo.getPhase() + tpBuildingOwnerInfo.getBuilding()
                 +tpBuildingOwnerInfo.getUnit()
                 +tpBuildingOwnerInfo.getLevel()
                 +tpBuildingOwnerInfo.getRoomNo());

CODE/smart-community/app-api/src/main/resources/mapper/TpBuildingOwnerInfoMapper.xml

@@ -5,6 +5,7 @@
     <id column="id" property="id" jdbcType="INTEGER" />
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="id_card" property="idCard" jdbcType="VARCHAR" />
+    <result column="phase" property="phase" jdbcType="VARCHAR" />
     <result column="building" property="building" jdbcType="VARCHAR" />
     <result column="unit" property="unit" jdbcType="VARCHAR" />
     <result column="level" property="level" jdbcType="VARCHAR" />
@@ -20,7 +21,7 @@
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
   </resultMap>
   <sql id="Base_Column_List" >
-    id, community_id, id_card, building, unit, level, room_no, owner_name, owner_tel, 
+    id, community_id, id_card, phase, building, unit, level, room_no, owner_name, owner_tel,
     gender, pair_status, verify_status, create_user, create_date, update_user, update_date
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
@@ -34,14 +35,14 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.community.huiju.model.TpBuildingOwnerInfo" >
-    insert into tp_building_owner_info (id, community_id, id_card, 
+    insert into tp_building_owner_info (id, community_id, id_card, phase,
       building, unit, level, 
       room_no, owner_name, owner_tel, 
       gender, pair_status, verify_status, 
       create_user, create_date, update_user, 
       update_date)
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{idCard,jdbcType=VARCHAR}, 
-      #{building,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR}, 
+      #{phase,jdbcType=VARCHAR}, #{building,jdbcType=VARCHAR}, #{unit,jdbcType=VARCHAR}, #{level,jdbcType=VARCHAR},
       #{roomNo,jdbcType=VARCHAR}, #{ownerName,jdbcType=VARCHAR}, #{ownerTel,jdbcType=VARCHAR}, 
       #{gender,jdbcType=CHAR}, #{pairStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, 
       #{createUser,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, 
@@ -59,6 +60,9 @@
       <if test="idCard != null" >
         id_card,
       </if>
+      <if test="phase != null">
+        phase,
+      </if>
       <if test="building != null" >
         building,
       </if>
@@ -109,6 +113,9 @@
       <if test="idCard != null" >
         #{idCard,jdbcType=VARCHAR},
       </if>
+      <if test="phase != null">
+        #{phase,jdbcType=VARCHAR},
+      </if>
       <if test="building != null" >
         #{building,jdbcType=VARCHAR},
       </if>
@@ -159,6 +166,9 @@
       <if test="idCard != null" >
         id_card = #{idCard,jdbcType=VARCHAR},
       </if>
+      <if test="phase != null">
+        phase = #{phase,jdbcType=VARCHAR},
+      </if>
       <if test="building != null" >
         building = #{building,jdbcType=VARCHAR},
       </if>
@@ -205,6 +215,7 @@
     update tp_building_owner_info
     set community_id = #{communityId,jdbcType=INTEGER},
       id_card = #{idCard,jdbcType=VARCHAR},
+      phase = #{phase,jdbcType=VARCHAR},
       building = #{building,jdbcType=VARCHAR},
       unit = #{unit,jdbcType=VARCHAR},
       level = #{level,jdbcType=VARCHAR},

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -97,6 +97,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         Map<String, Object> map = Maps.newHashMap();
         // 小区Id
         map.put("community_id", userElement.getCommunityId());
+        // 期
+        map.put("phase", tpBuildingOwnerInfo.getPhase());
         // 栋
         map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
@@ -360,6 +362,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
 
         // 小区
         map.put("community_id", communityId);
+        // 期
+        map.put("phase", tpBuildingOwnerInfo.getPhase());
         // 栋
         map.put("building", tpBuildingOwnerInfo.getBuilding());
         // 单元
@@ -373,12 +377,15 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         /**
          * 通过分组来去重
          *
-         * 1. building 为空表示为 building 字段进行分组
-         * 2. unit 为空表示为 unit 字段进行分组
-         * 3. level 为空表示为 level 字段进行分组
-         * 4. room_no 为空表示为 room_no 字段进行分组
+         * 1. phase 为空表示为 phase 字段进行分组
+         * 2. building 为空表示为 building 字段进行分组
+         * 3. unit 为空表示为 unit 字段进行分组
+         * 4. level 为空表示为 level 字段进行分组
+         * 5. room_no 为空表示为 room_no 字段进行分组
          */
-        if (null == tpBuildingOwnerInfo.getBuilding() || "".equals(tpBuildingOwnerInfo.getBuilding())) {
+        if (null == tpBuildingOwnerInfo.getPhase() || "".equals(tpBuildingOwnerInfo.getPhase())) {
+            queryWrapper.groupBy("phase");
+        } else if (null == tpBuildingOwnerInfo.getBuilding() || "".equals(tpBuildingOwnerInfo.getBuilding())) {
             queryWrapper.groupBy("building");
         } else if (null == tpBuildingOwnerInfo.getUnit() || "".equals(tpBuildingOwnerInfo.getUnit())) {
             queryWrapper.groupBy("unit");
@@ -762,6 +769,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         QueryWrapper<TpBuildingOwnerInfo> queryWrapper = new QueryWrapper<>();
         // 小区ID
         queryWrapper.eq("community_id", communityId);
+        // 期
+        queryWrapper.eq("phase", tpBuildingOwnerInfo.getPhase());
         // 栋
         queryWrapper.eq("building", tpBuildingOwnerInfo.getBuilding());
         // 单元

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpActivityServiceImpl.java

@@ -109,7 +109,7 @@ public class TpActivityServiceImpl extends ServiceImpl<TpActivityMapper, TpActiv
         String [] contentImgArray = jsonArray.toArray(new String[]{});
         TpActivity tpActivity = jsonObject.toJavaObject(TpActivity.class);
 
-        if (contentImgArray.length <= 0 && (null == tpActivity.getActivityContent() || "".equals(tpActivity.getActivityContent())) {
+        if (contentImgArray.length <= 0 && (null == tpActivity.getActivityContent() || "".equals(tpActivity.getActivityContent()))) {
             responseBean.addError("活动内容描述 和 活动配图至少要存在一个!");
             return responseBean;
         }

VUECODE/smart-property-manage/src/api/buildingOwnerInfo.js

@@ -6,6 +6,7 @@ export function buildingAddress(data) {
     url: '/building/address',
     method: 'post',
     data: {
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,
@@ -21,6 +22,7 @@ export function buildingList(data) {
     url: '/building/list',
     method: 'post',
     data: {
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,
@@ -73,6 +75,7 @@ export function addBuilding(data) {
     url: '/building/add',
     method: 'post',
     data: {
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,
@@ -90,6 +93,7 @@ export function updateBuilding(data) {
     method: 'put',
     data: {
       id: data.id,
+      phase: data.phase,
       building: data.building,
       unit: data.unit,
       level: data.level,

VUECODE/smart-property-manage/src/views/building/add/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="root">
     <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px" class="add-ruleForm">
+      <el-form-item label="期" prop="phase">
+        <el-input v-model="ruleForm.phase"/>
+      </el-form-item>
       <el-form-item label="栋" prop="building">
         <el-input v-model="ruleForm.building"/>
       </el-form-item>
@@ -32,6 +35,7 @@ export default {
   data() {
     return {
       ruleForm: {
+        phase: '',
         building: '',
         unit: '',
         level: '',
@@ -40,6 +44,9 @@ export default {
         ownerTel: ''
       },
       rules: {
+        phase: [
+          { required: true, message: '请输入期', trigger: 'blur' }
+        ],
         building: [
           { required: true, message: '请输入楼栋', trigger: 'blur' }
         ],

VUECODE/smart-property-manage/src/views/building/edi/index.vue

@@ -36,6 +36,7 @@ export default {
     return {
       ruleForm: {
         id: '',
+        phase: '',
         building: '',
         unit: '',
         level: '',
@@ -46,6 +47,9 @@ export default {
       isOwnerTel: false, // 手机号是否可以编辑 true 不可编辑  false 为可编辑
       listQuery: [], // 查询的参数
       rules: {
+        phase: [
+          { required: true, message: '请输入楼栋', trigger: 'blur' }
+        ],
         building: [
           { required: true, message: '请输入楼栋', trigger: 'blur' }
         ],
@@ -115,6 +119,7 @@ export default {
       this.$store.dispatch('GetByIdBuildingId', buildingId).then((res) => {
         const data = res.data
         this.ruleForm.id = data.id
+        this.ruleForm.phase = data.phase
         this.ruleForm.building = data.building
         this.ruleForm.unit = data.unit
         this.ruleForm.level = data.level

VUECODE/smart-property-manage/src/views/building/index.vue

@@ -3,6 +3,14 @@
   <div class="root">
     <el-form :inline="true" :model="listQuery" class="form-listQuery">
       <el-form-item label="楼盘库">
+        <el-select v-model="listQuery.phase" placeholder="期" @change="buildSelectChange(0)">
+          <!--<el-option label="选择楼栋" value="-1" />-->
+          <el-option
+            v-for="item in phaseList"
+            :key="item.id"
+            :label="item.phase"
+            :value="item.phase"/>
+        </el-select>
         <el-select v-model="listQuery.building" placeholder="栋" @change="buildSelectChange(1)">
           <!--<el-option label="选择楼栋" value="-1" />-->
           <el-option
@@ -63,6 +71,7 @@
       style="width: 100%; margin-top: 20px;"
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column prop="phase" label="期" align="center" />
       <el-table-column prop="building" label="栋" align="center" />
       <el-table-column prop="unit" label="单元" align="center" />
       <el-table-column prop="level" label="楼层" align="center" />
@@ -96,6 +105,7 @@ export default {
   data() {
     return {
       listQuery: {
+        phase: '',
         building: '',
         unit: '',
         level: '',
@@ -105,11 +115,12 @@ export default {
         pageSize: 10
       },
       total: 0, // 数据总数
-      buildingInfoLists: [],
-      buildingList: [],
-      unitList: [],
-      levelList: [],
-      roomNoList: [],
+      phaseList: [], // 期 集合
+      buildingInfoLists: [], // 表格数据集合
+      buildingList: [], // seletc 楼栋集合
+      unitList: [], // seletc 单元集合
+      levelList: [], // seletc 层 集合
+      roomNoList: [], //  seletc 户号集合
       listLoading: true, // 加载圈
       deleteIds: [] // 需要删除的id集合
     }
@@ -129,7 +140,10 @@ export default {
   },
   mounted() {
     // 获取栋
-    this.getBuild()
+    // this.getBuild()
+
+    // 获取期
+    this.getPhase()
 
     const query = this.$route.params.listQuery
     if (query !== undefined) {
@@ -169,12 +183,20 @@ export default {
         this.deleteIds.push(data[i].id)
       }
     },
+    getPhase() { // 获取楼栋
+      this.listQuery.phase = ''
+      this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
+        this.phaseList = res.data
+      }).catch(() => {
+        console.log('error phase BuildingAddress')
+      })
+    },
     getBuild() { // 获取楼栋
       this.listQuery.building = ''
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.buildingList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error building BuildingAddress')
       })
     },
     getUnit() { // 获取单元
@@ -182,7 +204,7 @@ export default {
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.unitList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error unit BuildingAddress')
       })
     },
     getLevel() { // 获取楼层
@@ -190,7 +212,7 @@ export default {
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.levelList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error level BuildingAddress')
       })
     },
     getRoomNo() { // 获取户号
@@ -198,11 +220,22 @@ export default {
       this.$store.dispatch('BuildingAddress', this.listQuery).then((res) => {
         this.roomNoList = res.data
       }).catch(() => {
-        console.log('error BuildingAddress')
+        console.log('error roomNo BuildingAddress')
       })
     },
     buildSelectChange(value) { // select 的 change
       switch (value) {
+        case 0: // 查询栋
+          this.buildingList = []
+          this.unitList = []
+          this.levelList = []
+          this.roomNoList = []
+          this.listQuery.building = ''
+          this.listQuery.unit = ''
+          this.listQuery.level = ''
+          this.listQuery.roomNo = ''
+          this.getBuild()
+          break
         case 1: // 查询 单元
           this.unitList = []
           this.levelList = []
@@ -245,6 +278,7 @@ export default {
       })
     },
     emptyListQuery() { // 清空按钮
+      this.listQuery.phase = ''
       this.listQuery.building = ''
       this.listQuery.unit = ''
       this.listQuery.level = ''