后台管理优化

src/main/java/com/izouma/awesomeadmin/dao/ContactRecordMapper.xml

@@ -243,6 +243,9 @@
                      select="com.izouma.awesomeadmin.dao.HouseKeeperMapper.queryHouseKeeper"
                      column="{id = housekeeper}">
         </association>
+        <association property="userInfo" javaType="com.izouma.awesomeadmin.model.UserInfo"
+                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.querySingleUserInfo" column="{id = user_id}">
+        </association>
     </resultMap>
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/SeeOrderMapper.xml

@@ -376,6 +376,9 @@
                      select="com.izouma.awesomeadmin.dao.HouseKeeperMapper.queryHouseKeeper"
                      column="{id = housekeeper}">
         </association>
+        <association property="userInfo" javaType="com.izouma.awesomeadmin.model.UserInfo"
+                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.querySingleUserInfo" column="{id = user_id}">
+        </association>
     </resultMap>
 </mapper>
 

src/main/java/com/izouma/awesomeadmin/dao/UserCollectionMapper.xml

@@ -240,6 +240,11 @@
         <association property="houseInfo" javaType="com.izouma.awesomeadmin.model.HouseInfo"
                      select="com.izouma.awesomeadmin.dao.HouseInfoMapper.queryHouseInfo" column="{id = house_id}">
         </association>
+
+        <association property="userInfo" javaType="com.izouma.awesomeadmin.model.UserInfo"
+                     select="com.izouma.awesomeadmin.dao.UserInfoMapper.querySingleUserInfo" column="{id = user_id}">
+        </association>
+
     </resultMap>
 
 </mapper>

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.java

@@ -30,6 +30,8 @@ public interface UserInfoMapper {
 
     UserInfo queryUserInfo(UserInfo record);
 
+    UserInfo querySingleUserInfo(UserInfo record);
+
     UserInfo login(Map<String, Object> parameter);
 }
 

src/main/java/com/izouma/awesomeadmin/dao/UserInfoMapper.xml

@@ -449,6 +449,72 @@
         </where>
         LIMIT 1
     </select>
+    <select id="querySingleUserInfo" parameterType="java.util.Map" resultType="com.izouma.awesomeadmin.model.UserInfo">
+        select
+        <include refid="Base_Column_List"/>
+        from user_info
+        <where>
+            and del_flag = 'N'
+            <if test="id != null and !&quot;&quot;.equals(id)">
+                and id = #{id}
+            </if>
+            <if test="username != null and !&quot;&quot;.equals(username)">
+                and username = #{username}
+            </if>
+            <if test="nickname != null and !&quot;&quot;.equals(nickname)">
+                and nickname = #{nickname}
+            </if>
+            <if test="password != null and !&quot;&quot;.equals(password)">
+                and password = #{password}
+            </if>
+            <if test="icon != null and !&quot;&quot;.equals(icon)">
+                and icon = #{icon}
+            </if>
+            <if test="birthday != null and !&quot;&quot;.equals(birthday)">
+                and birthday = #{birthday}
+            </if>
+            <if test="sex != null and !&quot;&quot;.equals(sex)">
+                and sex = #{sex}
+            </if>
+            <if test="openId != null and !&quot;&quot;.equals(openId)">
+                and open_id = #{openId}
+            </if>
+            <if test="unionId != null and !&quot;&quot;.equals(unionId)">
+                and union_id = #{unionId}
+            </if>
+            <if test="phone != null and !&quot;&quot;.equals(phone)">
+                and phone = #{phone}
+            </if>
+            <if test="mail != null and !&quot;&quot;.equals(mail)">
+                and mail = #{mail}
+            </if>
+            <if test="country != null and !&quot;&quot;.equals(country)">
+                and country = #{country}
+            </if>
+            <if test="province != null and !&quot;&quot;.equals(province)">
+                and province = #{province}
+            </if>
+            <if test="city != null and !&quot;&quot;.equals(city)">
+                and city = #{city}
+            </if>
+            <if test="district != null and !&quot;&quot;.equals(district)">
+                and district = #{district}
+            </if>
+            <if test="roleId != null and !&quot;&quot;.equals(roleId)">
+                and role_id = #{roleId}
+            </if>
+            <if test="createTime != null and !&quot;&quot;.equals(createTime)">
+                and create_time = #{createTime}
+            </if>
+            <if test="delFlag != null and !&quot;&quot;.equals(delFlag)">
+                and del_flag = #{delFlag}
+            </if>
+            <if test="departId != null and !&quot;&quot;.equals(departId)">
+                and depart_id = #{departId}
+            </if>
+        </where>
+        LIMIT 1
+    </select>
     <select id="login" resultMap="BaseResultMap" parameterType="java.util.Map">
         SELECT
         <include refid="Base_Column_List"/>

src/main/java/com/izouma/awesomeadmin/model/ContactRecord.java

@@ -23,6 +23,8 @@ public class ContactRecord {
 
     private HouseKeeper keeper;
 
+    private UserInfo userInfo;
+
     public Integer getId() {
         return this.id;
     }
@@ -110,5 +112,13 @@ public class ContactRecord {
     public void setKeeper(HouseKeeper keeper) {
         this.keeper = keeper;
     }
+
+    public UserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/SeeOrder.java

@@ -31,6 +31,8 @@ public class SeeOrder {
 
     private HouseKeeper keeper;
 
+    private UserInfo userInfo;
+
     public Integer getId() {
         return this.id;
     }
@@ -174,5 +176,13 @@ public class SeeOrder {
     public void setKeeper(HouseKeeper keeper) {
         this.keeper = keeper;
     }
+
+    public UserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
 }
 

src/main/java/com/izouma/awesomeadmin/model/UserCollection.java

@@ -21,6 +21,7 @@ public class UserCollection {
 
     private HouseInfo houseInfo;
 
+    private UserInfo userInfo;
 
     public Integer getId() {
         return this.id;
@@ -101,5 +102,13 @@ public class UserCollection {
     public void setHouseInfo(HouseInfo houseInfo) {
         this.houseInfo = houseInfo;
     }
+
+    public UserInfo getUserInfo() {
+        return userInfo;
+    }
+
+    public void setUserInfo(UserInfo userInfo) {
+        this.userInfo = userInfo;
+    }
 }
 

src/main/vue/src/pages/ContactRecords.vue

@@ -24,11 +24,17 @@
             </el-table-column>
             <el-table-column type="index" min-width="50" align="center">
             </el-table-column>
-            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户" min-width="100">
+            <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户ID" min-width="100">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('userInfo.nickname')" prop="userInfo.nickname" label="用户" min-width="100">
             </el-table-column>
             <el-table-column v-if="isColumnShow('houseId')" prop="houseId" label="房源" min-width="100">
             </el-table-column>
-            <el-table-column v-if="isColumnShow('housekeeper')" prop="housekeeper" label="管家" min-width="100">
+            <el-table-column v-if="isColumnShow('houseInfo.title')" prop="houseInfo.title" label="房源标题" min-width="100">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('housekeeper')" prop="housekeeper" label="管家ID" min-width="100">
+            </el-table-column>
+            <el-table-column v-if="isColumnShow('keeper.keepName')" prop="keeper.keepName" label="管家" min-width="100">
             </el-table-column>
             <el-table-column v-if="isColumnShow('showFlag')" prop="showFlag" label="用户显示" min-width="100">
             </el-table-column>
@@ -68,20 +74,35 @@ export default {
             filter2: '',
             tableColumns: [
                 {
-                    label: '用户',
+                    label: '用户ID',
                     value: 'userId',
                     show: true
                 },
+                {
+                    label: '用户',
+                    value: 'userInfo.nickname',
+                    show: true
+                },
                 {
                     label: '房源',
                     value: 'houseId',
                     show: true
                 },
                 {
-                    label: '管家',
+                    label: '房源标题',
+                    value: 'houseInfo.title',
+                    show: true
+                },
+                {
+                    label: '管家ID',
                     value: 'housekeeper',
                     show: true
                 },
+                {
+                    label: '管家',
+                    value: 'keeper.keepName',
+                    show: true
+                },
                 {
                     label: '用户显示',
                     value: 'showFlag',

src/main/vue/src/pages/HouseInfo.vue

@@ -350,6 +350,9 @@ export default {
         },
         submit() {
             var data = JSON.parse(JSON.stringify(this.formData));
+            delete data.houseImages;
+            delete data.houseFeatures;
+            
             this.$http.post({
                 url: this.formData.id ? '/houseInfo/update' : '/houseInfo/save',
                 data: data

src/main/vue/src/pages/HouseInfos.vue

@@ -45,6 +45,8 @@
             </el-table-column>
             <el-table-column v-if="isColumnShow('title')" prop="title" label="标题" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" :formatter="statusFlagFormatter" label="状态" min-width="100">
+            </el-table-column>
             <el-table-column v-if="isColumnShow('price')" prop="price" label="价格" min-width="100">
             </el-table-column>
             <el-table-column v-if="isColumnShow('payMode')" prop="payMode" label="付款方式" min-width="100">
@@ -113,8 +115,6 @@
             </el-table-column>
             <el-table-column v-if="isColumnShow('addressDetail')" prop="addressDetail" label="详细地址" min-width="100">
             </el-table-column>
-            <el-table-column v-if="isColumnShow('statusFlag')" prop="statusFlag" :formatter="statusFlagFormatter" label="状态" min-width="100">
-            </el-table-column>
             <el-table-column v-if="isColumnShow('buildYear')" prop="buildYear" label="建造年" min-width="100">
             </el-table-column>
             <el-table-column v-if="isColumnShow('createTime')" prop="createTime" :formatter="DateTimeFormatter" label="创建时间" min-width="100">

src/main/vue/src/pages/SeeOrders.vue

@@ -26,10 +26,16 @@
             </el-table-column>
             <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户ID" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('userInfo.nickname')" prop="userInfo.nickname" label="用户" min-width="100">
+            </el-table-column>
             <el-table-column v-if="isColumnShow('houseId')" prop="houseId" label="房源" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('houseInfo.title')" prop="houseInfo.title" label="房源标题" min-width="100">
+            </el-table-column>
             <el-table-column v-if="isColumnShow('housekeeper')" prop="housekeeper" label="管家ID" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('keeper.keepName')" prop="keeper.keepName" label="管家" min-width="100">
+            </el-table-column>
             <el-table-column v-if="isColumnShow('orderStatus')" prop="orderStatus" :formatter="orderStatusFormatter" label="状态" min-width="100">
             </el-table-column>
             <el-table-column v-if="isColumnShow('contact')" prop="contact" label="联系人" min-width="100">
@@ -83,16 +89,31 @@ export default {
                     value: 'userId',
                     show: true
                 },
+                {
+                    label: '用户',
+                    value: 'userInfo.nickname',
+                    show: true
+                },
                 {
                     label: '房源',
                     value: 'houseId',
                     show: true
                 },
+                {
+                    label: '房源标题',
+                    value: 'houseInfo.title',
+                    show: true
+                },
                 {
                     label: '管家ID',
                     value: 'housekeeper',
                     show: true
                 },
+                {
+                    label: '管家',
+                    value: 'keeper.keepName',
+                    show: true
+                },
                 {
                     label: '联系人',
                     value: 'contact',

src/main/vue/src/pages/UserCollections.vue

@@ -26,8 +26,12 @@
             </el-table-column>
             <el-table-column v-if="isColumnShow('userId')" prop="userId" label="用户ID" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('userInfo.nickname')" prop="userInfo.nickname" label="用户" min-width="100">
+            </el-table-column>
             <el-table-column v-if="isColumnShow('houseId')" prop="houseId" label="房源ID" min-width="100">
             </el-table-column>
+            <el-table-column v-if="isColumnShow('houseInfo.title')" prop="houseInfo.title" label="房源标题" min-width="100">
+            </el-table-column>
             <el-table-column v-if="isColumnShow('remark')" prop="remark" label="备注" min-width="100">
             </el-table-column>
             <el-table-column v-if="isColumnShow('showFlag')" prop="showFlag" label="用户显示" min-width="100">
@@ -66,11 +70,21 @@ export default {
                     value: 'userId',
                     show: true
                 },
+                {
+                    label: '用户',
+                    value: 'userInfo.nickname',
+                    show: true
+                },
                 {
                     label: '房源ID',
                     value: 'houseId',
                     show: true
                 },
+                {
+                    label: '房源标题',
+                    value: 'houseInfo.title',
+                    show: true
+                },
                 {
                     label: '备注',
                     value: 'remark',