bug

src/main/java/com/huiju/estateagents/property/common/sign/DaSuSign.java

@@ -42,7 +42,7 @@ public class DaSuSign {
         treeMap.put("appid", appid);
         treeMap.put("datetime", datetime);
         treeMap.put("encrypt", encrypt);
-        treeMap.put("communityid", orgId);
+        treeMap.put("orgId", orgId);
 
         String sign = "";
 

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

@@ -182,7 +182,7 @@ public class BillController extends BaseController {
     }
 
     @ApiOperation(value = "获取账单的详细信息", notes = "获取账单的详细信息")
-    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({@ApiImplicitParam(paramType = "path", dataType = "String", name = "orgId", value = "小区Id"),
             @ApiImplicitParam(paramType = "path", dataType = "Integer", name = "billInvoiceId", value = "账单id")})
     @RequestMapping(value = "/wx/bill/{orgId}/{billInvoiceId}",method = RequestMethod.GET)
     public ResponseBean getBillInvoiceDetail(@PathVariable Integer orgId,@PathVariable Integer billInvoiceId){

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

@@ -82,7 +82,7 @@ public class MessageController extends BaseController {
     }
 
     @ApiOperation(value = "按小区获取分页消息", notes = "按小区获取分页消息")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "orgId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/wx/message/{orgId}/news",method = RequestMethod.GET)
@@ -98,7 +98,7 @@ public class MessageController extends BaseController {
     }
 
     @ApiOperation(value = "按小区获取分页待办", notes = "按小区获取分页待办")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "orgId", value = "小区Id"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageNum", value = "分页第几页"),
             @ApiImplicitParam(paramType = "query", dataType = "integer", name = "pageSize", value = "分页每页长度")})
     @RequestMapping(value = "/wx/message/{orgId}/upcoming",method = RequestMethod.GET)
@@ -115,7 +115,7 @@ public class MessageController extends BaseController {
     }
 
     @ApiOperation(value = "消息已读接口", notes = "消息已读接口")
-    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "communityId", value = "小区Id"),
+    @ApiImplicitParams({ @ApiImplicitParam(paramType = "path", dataType = "String", name = "orgId", value = "小区Id"),
             })
     @RequestMapping(value = "/wx/readStatus/{orgId}",method = RequestMethod.POST)
     public ResponseBean allMessageRead(@PathVariable("orgId") Integer orgId, HttpServletRequest request){

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

@@ -182,7 +182,7 @@ public class UserVerifyController extends BaseController {
     @ApiOperation(value = "添加一个审核的房产", notes = "添加一个审核的房产")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header", dataTypeClass = String.class, name = "X-Auth-Token", value = "Token"),
-            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "communityId小区编号;roleName角色名称;phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
+            @ApiImplicitParam(paramType = "body", dataTypeClass = String.class, name = "parameter", value = "phaseId期;buildingId楼栋;unitId单元;levelId楼层;roomNoId户号")
     })
     public ResponseBean addUserVerify(@RequestBody String parameter, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();

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

@@ -71,7 +71,7 @@ public interface BillInvoiceMapper extends BaseMapper<BillInvoice> {
      * @param communityId
      * @return
      */
-    BillInvoice selectByIdAndroomNoId(@Param("id") Integer billInvoiceId,@Param("roomNoId") Integer buildingOwnerInfoId,@Param("communityId") Integer communityId);
+    BillInvoice selectByIdAndroomNoId(@Param("id") Integer billInvoiceId,@Param("roomNoId") Integer buildingOwnerInfoId,@Param("orgId") Integer orgId);
 
     BillInvoice selectByOutTradeNo(@Param("outTradeNo") String outTradeNo);
 

src/main/java/com/huiju/estateagents/property/service/IBuildingOwnerInfoService.java

@@ -23,7 +23,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      * @param paramets
      * @return
      */
-    ResponseBean selectUserApprove(String paramets, Integer CommunityId);
+    ResponseBean selectUserApprove(String paramets, Integer orgId);
     /**
      * 根据条件查询
      * @param parameter

src/main/java/com/huiju/estateagents/property/service/TpAnnouncementService.java

@@ -16,7 +16,7 @@ public interface TpAnnouncementService extends IService<TpAnnouncement> {
     /**
      * 获取公告列表
      */
-    ResponseBean tpAnnouncemenList(String paramets, Integer CommunityId);
+    ResponseBean tpAnnouncemenList(String paramets, Integer orgId);
 
     /**
      * 添加公告

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

@@ -54,11 +54,11 @@ private  TpAnnouncementMapper tpAnnouncementMapper;
 //    @Autowired
 //    private TaUserMapper taUserMapper;
     @Override
-    public ResponseBean tpAnnouncemenList(String paramets, Integer CommunityId) {
+    public ResponseBean tpAnnouncemenList(String paramets, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
         TpAnnouncement   tpAnnouncement= JSONObject.parseObject(paramets, TpAnnouncement.class);
-        tpAnnouncement.setOrgId(CommunityId);
+        tpAnnouncement.setOrgId(orgId);
         JSONObject jsonobject = JSONObject.parseObject(paramets);
         Integer pageNum = jsonobject.getInteger("pageNum");
         Integer announcementNumber = jsonobject.getInteger("announcementNumber");

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

@@ -896,7 +896,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
 
     }
     @Override
-    public ResponseBean addWxRecordComment(String parameter, Integer verifyId,Integer communityId,String userName) {
+    public ResponseBean addWxRecordComment(String parameter, Integer verifyId,Integer orgId,String userName) {
         ResponseBean response=new ResponseBean();
         JSONObject object= JSONObject.parseObject(parameter);
 
@@ -907,7 +907,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         TpTicket  tpTicket= tpTicketMapper.selectById(ticketId);
         TpTicketRecord ticketRecord= tpTicketRecordMapper.selectTpTicketRecord(ticketId, Integer.valueOf(tpTicket.getStatus()));
         TpTicketRecordComment tpTicketRecordComment= new TpTicketRecordComment();
-        tpTicketRecordComment.setOrgId(communityId);
+        tpTicketRecordComment.setOrgId(orgId);
         tpTicketRecordComment.setContent(content);
         tpTicketRecordComment.setTicketId(ticketId);
         tpTicketRecordComment.setTicketRecordId(ticketRecord.getId());
@@ -935,7 +935,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //工单消息回复最最后一个物业人员
 
         Message message = new Message();
-        message.setOrgId(communityId);
+        message.setOrgId(orgId);
         message.setModelType("1");
         message.setMessageType(tpTicket.getType());
         message.setAdviceType("4");

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

@@ -211,7 +211,7 @@
     <select id="selectByOutTradeNo" resultType="com.huiju.estateagents.property.model.BillInvoice" >
   SELECT
         t.id,
-        t.org_id AS communityId,
+        t.org_id AS orgId,
         t.bill_id AS billId,
         t.building_owner_info_id AS buildingOwnerInfoId,
         t.ta_user_id AS taUserId,

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

@@ -167,7 +167,7 @@
     <select id="getMessages" resultType="com.huiju.estateagents.property.model.Message">
     SELECT
         t.id,
-        t.community_id,
+        t.org_id,
         t.message_type AS new_message_type,
         CASE
           WHEN t.message_type = 9 THEN
@@ -199,7 +199,7 @@
         LEFT JOIN tp_message_icon i ON t.message_type = i.message_type
     WHERE
         t.uuid_type = "app"
-        AND t.community_id = #{communityId,jdbcType=INTEGER}
+        AND t.org_id = #{orgId,jdbcType=INTEGER}
         AND t.uuid = #{userId,jdbcType=INTEGER}
         AND t.STATUS = 1
         AND t.advice_type != 1

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.huiju.estateagents.property.dao.TaUserVerifyMapper">
 
     <sql id="Base_Column_List" >
-    id, user_id, community_id, role_id, phase_id, phase_name, building_id, building_name,
+    id, user_id, org_id, role_id, phase_id, phase_name, building_id, building_name,
     unit_id, unit_name, level_id, level_name, room_no_id, room_no_name, verify_status,
     create_date, verify_name, remark
   </sql>
@@ -86,7 +86,7 @@
         select
         <include refid="Base_Column_List"/>
         from ta_user_verify
-        where community_id = #{communityId,jdbcType=INTEGER}
+        where org_id = #{orgId,jdbcType=INTEGER}
         and user_id = #{userId,jdbcType=INTEGER}
         and phase_id = #{phaseId,jdbcType=INTEGER}
         and building_id = #{buildingId,jdbcType=INTEGER}

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

@@ -24,10 +24,10 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" parameterType="com.huiju.estateagents.property.model.TpSocialView" >
-    insert into tp_social_view (id, community_id, uuid, 
+    insert into tp_social_view (id, org_id, uuid,
       social_type, ta_user_id, remark, 
       create_date)
-    values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER}, 
+    values (#{id,jdbcType=INTEGER}, #{orgId,jdbcType=INTEGER}, #{uuid,jdbcType=INTEGER},
       #{socialType,jdbcType=VARCHAR}, #{taUserId,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}, 
       #{createDate,jdbcType=TIMESTAMP})
   </insert>
@@ -83,8 +83,8 @@
   <update id="updateByPrimaryKeySelective" parameterType="com.huiju.estateagents.property.model.TpSocialView" >
     update tp_social_view
     <set >
-      <if test="communityId != null" >
-        community_id = #{communityId,jdbcType=INTEGER},
+      <if test="orgId != null" >
+        org_id = #{orgId,jdbcType=INTEGER},
       </if>
       <if test="uuid != null" >
         uuid = #{uuid,jdbcType=INTEGER},
@@ -106,7 +106,7 @@
   </update>
   <update id="updateByPrimaryKey" parameterType="com.huiju.estateagents.property.model.TpSocialView" >
     update tp_social_view
-    set community_id = #{communityId,jdbcType=INTEGER},
+    set org_id = #{orgId,jdbcType=INTEGER},
       uuid = #{uuid,jdbcType=INTEGER},
       social_type = #{socialType,jdbcType=VARCHAR},
       ta_user_id = #{taUserId,jdbcType=INTEGER},

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

@@ -15,7 +15,7 @@
         FROM
         tp_ticket_record_comment
         WHERE
-        community_id = #{communityId,jdbcType=INTEGER}
+        org_id = #{orgId,jdbcType=INTEGER}
         AND ticket_id = #{ticketId,jdbcType=INTEGER}
         AND ticket_record_id = #{id,jdbcType=INTEGER}
     </select>

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

@@ -43,6 +43,6 @@
         select
          *
         from tp_transaction ttr
-        where ttr.id = #{id,jdbcType=INTEGER} and ttr.community_id=#{communityId,jdbcType=INTEGER}
+        where ttr.id = #{id,jdbcType=INTEGER} and ttr.org_id=#{orgId,jdbcType=INTEGER}
     </select>
 </mapper>