feats

pom.xml

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

src/main/java/com/huiju/estateagents/property/controller/BillInvoiceController.java

@@ -95,7 +95,7 @@ public class BillInvoiceController extends BaseController {
     public ResponseBean offlinePayment(HttpServletRequest request, @RequestBody List<Integer> ids) {
         ResponseBean responseBean = new ResponseBean();
 
-        responseBean = iBillInvoiceService.offlinePayment(ids, getPersonId(request));
+        responseBean = iBillInvoiceService.offlinePayment(ids, getUserId(request).toString());
         return responseBean;
     }
 
@@ -163,7 +163,7 @@ public class BillInvoiceController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaUser userElement = getTaUser(request);
         Double payPrice = JSONObject.parseObject(parameter).getDouble("payPrice");
-//        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, PayPriceUtils.yuanConversionPoints(payPrice) , userElement);
+        responseBean = iBillInvoiceService.updateBillInvoiceIdPayPrice(billId, (int) (payPrice * 100 ), userElement);
         return responseBean;
     }
 

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

@@ -29,13 +29,13 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
      * @return
      */
     @ResultType(TpRoomNo.class)
-    @Select("select * from tp_room_no " +
-            "where org_id = #{orgId} " +
-            "and phase_name = #{phaseName} " +
-            "and building_name = #{buildingName} " +
-            "and unit_name = #{unitName} " +
-            "and level_name = #{levelName} " +
-            "and name = #{roomNoName}")
+//    @Select("select * from tp_room_no " +
+//            "where org_id = #{orgId} " +
+//            "and phase_name = #{phaseName} " +
+//            "and building_name = #{buildingName} " +
+//            "and unit_name = #{unitName} " +
+//            "and level_name = #{levelName} " +
+//            "and name = #{roomNoName}")
     TpRoomNo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") String buildingName, @Param("unitName") String unitName, @Param("levelName") String levelName, @Param("roomNoName") String roomNoName);
 
     /**
@@ -58,11 +58,11 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
     Long selectCommunityIdCount(@Param("orgId") Integer orgId);
 
     @ResultType(TpRoomNo.class)
-    @Select("select * from tp_room_no where org_id=#{orgId} " +
-            "and phase_id=#{phaseId} " +
-            "and building_id=#{buildingId} " +
-            "and unit_id=#{unitId} " +
-            "and level_id=#{levelId}")
+//    @Select("select * from tp_room_no where org_id=#{orgId} " +
+//            "and phase_id=#{phaseId} " +
+//            "and building_id=#{buildingId} " +
+//            "and unit_id=#{unitId} " +
+//            "and level_id=#{levelId}")
     List<TpRoomNo> selectByAddress(Integer orgId, Integer phaseId, Integer buildingId, Integer unitId, Integer levelId);
 
 }

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

@@ -55,7 +55,7 @@
                 AND tpi.status = 1
             </trim>
         </where>
-        order by tpi.create_date DESC
+        order by tpi.id DESC
 
     </select>
 

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

@@ -36,9 +36,7 @@
   <update id="updateTpAnnouncement" parameterType="com.huiju.estateagents.property.model.TpAnnouncement" >
     update tp_announcement
     <set >
-      <if test="orgId != null" >
-        org_id = #{orgId,jdbcType=INTEGER},
-      </if>
+        ann_type = #{annType},
       <if test="announcementTitle != null" >
         announcement_title = #{announcementTitle,jdbcType=VARCHAR},
       </if>

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

@@ -27,4 +27,37 @@
         WHERE
             t.org_id = #{orgId}
     </select>
+    <select id="selectCommunityIdAndAddressName" resultType="com.huiju.estateagents.property.model.TpRoomNo">
+        SELECT
+            t.*
+        FROM
+            tp_room_no t
+            INNER JOIN tp_level s ON s.id = t.level_id
+            INNER JOIN tp_unit m ON m.id = t.unit_id
+            INNER JOIN tp_building n ON n.id = t.building_id
+            INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+            t.org_id = #{orgId}
+            AND s.`name` = #{levelName}
+            AND m.`name` = #{unitName}
+            AND n.`name` = #{buildingName}
+            AND q.`name` = #{phaseName}
+            AND t.`name` = #{roomNoName}
+    </select>
+    <select id="selectByAddress" resultType="com.huiju.estateagents.property.model.TpRoomNo">
+        SELECT
+            t.*
+        FROM
+            tp_room_no t
+            INNER JOIN tp_level s ON s.id = t.level_id
+            INNER JOIN tp_unit m ON m.id = t.unit_id
+            INNER JOIN tp_building n ON n.id = t.building_id
+            INNER JOIN tp_phase q ON q.id = t.phase_id
+        WHERE
+            t.org_id = #{orgId}
+            AND s.id = #{levelId}
+            AND m.id = #{unitId}
+            AND n.id = #{buildingId}
+            AND q.id = #{phaseId}
+    </select>
 </mapper>