Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-service

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

      * @param map
      * @return
      */
-    IPage<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Page page,@Param("type") String type);
+    IPage<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Page page,@Param("type") String type,@Param("personId") String personId,@Param("orgId") Integer orgId);
 
     TpTicket selectTpTicketName(@Param("orgId")Integer orgId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
 

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

         }
 
         /*所有物业端本小区的人员*/
-//        ticketVO.setTpUsersList(userMapper.getUser( userID,orgId));
+        QueryWrapper<TaUser> taUserQueryWrapper =new QueryWrapper<>();
+        taUserQueryWrapper.eq("org_id",orgId);
+        taUserQueryWrapper.ne("user_id",userID);
+        ticketVO.setTpUsersList(taUserMapper.selectList(taUserQueryWrapper));
         /*本人*/
         ticketVO.setCurrentUserName(userID.toString());
 
         parameter.put("type", 2);
         // 报修
         Page<TpTicket> pageRepairs = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, tpTicket.getType());
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
         List<TpTicket> tpTicketRepairsList = tpTicketIPage.getRecords();
         List<TpTicketVO> repairsList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketRepairsList, repairsList);
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 1);
         Page<TpTicket> pageComplaint = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, tpTicket.getType());
+        IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, tpTicket.getType(), tpTicket.getPersonId(),tpTicket.getOrgId());
         List<TpTicket> tpTicketComplaintList = tpTicketIPageComplaint.getRecords();
         List<TpTicketVO> complaintList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketComplaintList, complaintList);
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 3);
         Page<TpTicket> pageLiaison = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, tpTicket.getType());
+        IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
         List<TpTicket> tpTicketLiaisonList = tpTicketIPageLiaison.getRecords();
         List<TpTicketVO> liaisonList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
         parameter.put("type", tpTicket.getType());
 
         Page<TpTicket> pagelist = new Page<>(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, tpTicket.getType());
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, tpTicket.getType(),tpTicket.getPersonId(),tpTicket.getOrgId());
         List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
 
         List<TpTicketVO> tpTicketVOList = Lists.newArrayList();

src/main/java/com/huiju/estateagents/property/vo/TpTicketVO.java

 package com.huiju.estateagents.property.vo;
 
+import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TpTicket;
 import com.huiju.estateagents.property.model.TpTicketRecord;
 import com.huiju.estateagents.property.model.TpTicketRecordComment;
     /**
      * 物业端所有小区人员
      */
-    private List<User> tpUsersList;
+    private List<TaUser> tpUsersList;
 
     /**
      * 本人

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

          *
         from tp_ticket
         <trim prefix="where" prefixOverrides="and">
-<!--            <if test="orgId != null" >-->
-<!--                and org_id = #{orgId,jdbcType=INTEGER}-->
-<!--            </if>-->
-<!--            <if test="taUserId != null" >-->
-<!--                and ta_user_id = #{taUserId,jdbcType=INTEGER}-->
-<!--            </if>-->
+            <if test="orgId != null" >
+                and org_id = #{orgId,jdbcType=INTEGER}
+            </if>
+            <if test="personId!= null" >
+                and person_id = #{personId}
+            </if>
             <if test="type != null" >
                 and type = #{type,jdbcType=CHAR}
             </if>