andrew 4 years ago
parent
commit
bd4b158a25

+ 1
- 1
src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java View File

113
     }
113
     }
114
 
114
 
115
 
115
 
116
-    @RequestMapping(value = "/wx/tickets/{orgId}", method = RequestMethod.GET)
116
+    @RequestMapping(value = "/wx/ticketList/{orgId}", method = RequestMethod.GET)
117
     @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
117
     @ApiOperation(value = "获取 报修/投诉/联系单 各3条数据", notes = "根据 小区编号,第几页,一页多少行")
118
     @ApiImplicitParams({
118
     @ApiImplicitParams({
119
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "orgId",value = "小区编号"),
119
             @ApiImplicitParam(paramType = "path",dataType = "Integer",name = "orgId",value = "小区编号"),

+ 1
- 1
src/main/resources/mapper/property/BillInvoiceMapper.xml View File

145
         FROM
145
         FROM
146
         tp_bill_invoice i
146
         tp_bill_invoice i
147
         LEFT JOIN tp_bill b ON b.id = i.bill_id
147
         LEFT JOIN tp_bill b ON b.id = i.bill_id
148
-        AND b.org_id = #{communityId,jdbcType=INTEGER}
148
+        AND b.org_id = #{orgId,jdbcType=INTEGER}
149
         WHERE
149
         WHERE
150
         i.orgId = #{orgId,jdbcType=INTEGER}
150
         i.orgId = #{orgId,jdbcType=INTEGER}
151
         <if test="payType == 0">
151
         <if test="payType == 0">

+ 2
- 2
src/main/resources/mapper/property/TpAnnouncementMapper.xml View File

89
     FROM
89
     FROM
90
     tp_announcement a
90
     tp_announcement a
91
     LEFT JOIN tp_user u ON a.create_user = u.id
91
     LEFT JOIN tp_user u ON a.create_user = u.id
92
-    AND u.community_id = #{communityId,jdbcType=INTEGER}
92
+    AND u.org_id = #{orgId,jdbcType=INTEGER}
93
     WHERE
93
     WHERE
94
-    a.community_id = #{communityId,jdbcType=INTEGER}
94
+    a.org_id = #{orgId,jdbcType=INTEGER}
95
     AND ( a.STATUS = 1 OR a.STATUS = 3 )
95
     AND ( a.STATUS = 1 OR a.STATUS = 3 )
96
     <if test="title != null and title != ''">
96
     <if test="title != null and title != ''">
97
       and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')
97
       and a.announcement_title like concat('%',#{title,jdbcType=VARCHAR},'%')