feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.7</version>
+	<version>1.0.9</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/property/dao/ToCommunitiesMapper.java

@@ -23,7 +23,7 @@ public interface ToCommunitiesMapper extends BaseMapper<ToCommunities> {
      * @param phone
      * @return
      */
-    @Select("SELECT tc.* FROM tp_user tu LEFT JOIN to_communities tc ON tu.org_id = tc.id WHERE tu.login_name = #{phone}")
+    @Select("SELECT tc.* FROM ta_user tu LEFT JOIN to_communities tc ON tu.org_id = tc.id WHERE tu.login_name = #{phone}")
     List<ToCommunities> selectUserById(String phone);
 
 }

src/main/java/com/huiju/estateagents/property/service/impl/BillInvoiceServiceImpl.java

@@ -263,15 +263,15 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
         // 收费项ID
         Integer billId = jsonObject.getInteger("billId");
         // 区/期
-        Integer phase = jsonObject.getInteger("phase");
+        Integer phase = jsonObject.getInteger("phaseId");
         // 栋
-        Integer building = jsonObject.getInteger("building");
+        Integer building = jsonObject.getInteger("buildingId");
         // 单元
-        Integer unit = jsonObject.getInteger("unit");
+        Integer unit = jsonObject.getInteger("unitId");
         // 楼层
-        Integer level = jsonObject.getInteger("level");
+        Integer level = jsonObject.getInteger("levelId");
         // 户号
-        Integer roomNo = jsonObject.getInteger("roomNo");
+        Integer roomNo = jsonObject.getInteger("roomNoId");
         // 催缴日期
         // Date worthOf = jsonObject.getDate("worthOf");
         // 收费单说明

src/main/resources/mapper/property/BillInvoiceMapper.xml

@@ -16,8 +16,8 @@
             tpro.unit_name as unit,
             tpro.name as roomNo,
             tpbo.order_bumber as billStatement,
-            (SELECT user_name from tp_user tu WHERE tu.id = tpi.create_user) as createUserName,
-            (SELECT user_name from tp_user tu WHERE tu.id = tpi.update_user) as updateUserName
+            (SELECT user_name from ta_user tu WHERE tu.user_id = tpi.create_user) as createUserName,
+            (SELECT user_name from ta_user tu WHERE tu.user_id = tpi.update_user) as updateUserName
         FROM
           tp_bill_invoice tpi
         LEFT JOIN tp_room_no tpro ON tpi.room_no_id = tpro.id
@@ -96,8 +96,8 @@
         tpro.unit_name as unit,
         tpro.name as roomNo,
         tpbo.order_bumber as billStatement,
-        (SELECT user_name from tp_user tu WHERE tu.id = tpi.create_user) as createUserName,
-        (SELECT user_name from tp_user tu WHERE tu.id = tpi.update_user) as updateUserName
+        (SELECT user_name from ta_user tu WHERE tu.user_id = tpi.create_user) as createUserName,
+        (SELECT user_name from ta_user tu WHERE tu.user_id = tpi.update_user) as updateUserName
         FROM
         tp_bill_invoice tpi
         LEFT JOIN tp_room_no tpro ON tpi.room_no_id = tpro.id

src/main/resources/mapper/property/SysRoleMapper.xml

@@ -15,8 +15,8 @@
             uu.user_name as updateName
         FROM
             tp_sys_role t
-        LEFT JOIN tp_user u ON t.create_user = u.id AND u.org_id = #{role.orgId}
-        LEFT JOIN tp_user uu ON t.update_user = uu.id AND uu.org_id = #{role.orgId}
+        LEFT JOIN ta_user u ON t.create_user = u.user_id AND u.org_id = #{role.orgId}
+        LEFT JOIN ta_user uu ON t.update_user = uu.user_id AND uu.org_id = #{role.orgId}
         where
           1 = 1
         AND t.org_id = #{role.orgId}

src/main/resources/mapper/property/TpRentalHouseMapper.xml

@@ -15,7 +15,7 @@
             u.user_name
         FROM
             tp_rental_house t
-        LEFT JOIN tp_user u ON t.update_user = u.id
+        LEFT JOIN ta_user u ON t.update_user = u.user_id
         where 1=1
         and t.org_id = #{tpRentalHouse.orgId}
         <if test="tpRentalHouse.id != null and tpRentalHouse.id != ''">

src/main/resources/mapper/property/TpShopMapper.xml

@@ -18,7 +18,7 @@
             tp_shop t
             LEFT JOIN tp_shop_img i ON t.id = i.shop_id AND i.img_type = 1
             LEFT JOIN  tp_shop_type s on t.shop_type_id = s.id
-            LEFT JOIN tp_user u on t.update_user = u.id
+            LEFT JOIN ta_user u on t.update_user = u.user_id
         where 1=1
         and t.org_id = #{tpShop.orgId}
         <if test="tpShop.id != null and tpShop.id != ''">