bug

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

@@ -30,7 +30,7 @@ import java.io.IOException;
  * @since 2019-02-14
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 @Api(value = "工单列表API", tags = "工单列表API")
 public class TpTicketController extends BaseController {
     @Autowired

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

@@ -30,7 +30,7 @@ public interface TpTicketMapper extends BaseMapper<TpTicket> {
      * @param map
      * @return
      */
-    IPage<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Page page,Map map);
+    IPage<TpTicket> selectByCommuniytIdAndByTaUserIdAndByType(Page page,@Param("type") String type);
 
     TpTicket selectTpTicketName(@Param("communityId")Integer communityId, @Param("type")String type, @Param("ticketTitle")String ticketTitle);
 

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

@@ -82,9 +82,7 @@ public class SocialServiceImpl implements SocialServiceI {
         Page<TpAnnouncement> page = new Page<>(pageNum, pageSize);
         // 获取数据
         IPage<TpAnnouncement> wxAnnouncementsPage = tpAnnouncementMapper.getWxAnnouncements(page, orgId, title);
-        parameter.put("total", wxAnnouncementsPage.getTotal());
-        parameter.put("list", wxAnnouncementsPage.getRecords());
-        responseBean.addSuccess(parameter);
+        responseBean.addSuccess(wxAnnouncementsPage);
         return responseBean;
     }
 

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

@@ -436,14 +436,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         Map<String, Object> result = Maps.newHashMap();
 
         Map<String, Object> parameter = Maps.newHashMap();
-        parameter.put("communityId", tpTicket.getOrgId());
+        parameter.put("orgId", tpTicket.getOrgId());
         parameter.put("taUserId", tpTicket.getTaUserId());
 
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 2);
         // 报修
         Page<TpTicket> pageRepairs = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, parameter);
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageRepairs, tpTicket.getType());
         List<TpTicket> tpTicketRepairsList = tpTicketIPage.getRecords();
         List<TpTicketVO> repairsList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketRepairsList, repairsList);
@@ -452,7 +452,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 1);
         Page<TpTicket> pageComplaint = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, parameter);
+        IPage<TpTicket> tpTicketIPageComplaint = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageComplaint, tpTicket.getType());
         List<TpTicket> tpTicketComplaintList = tpTicketIPageComplaint.getRecords();
         List<TpTicketVO> complaintList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketComplaintList, complaintList);
@@ -461,7 +461,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", 3);
         Page<TpTicket> pageLiaison = new Page(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, parameter);
+        IPage<TpTicket> tpTicketIPageLiaison = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pageLiaison, tpTicket.getType());
         List<TpTicket> tpTicketLiaisonList = tpTicketIPageLiaison.getRecords();
         List<TpTicketVO> liaisonList = Lists.newArrayList();
         tpTicketVOConvert(tpTicketLiaisonList, liaisonList);
@@ -550,14 +550,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         ResponseBean response = new ResponseBean();
 
         Map<String, Object> parameter = Maps.newHashMap();
-        parameter.put("communityId", tpTicket.getOrgId());
+        parameter.put("orgId", tpTicket.getOrgId());
         parameter.put("taUserId", tpTicket.getTaUserId());
 
         //  1：投诉   2：报修 3：联系物业
         parameter.put("type", tpTicket.getType());
 
         Page<TpTicket> pagelist = new Page<>(pageNum, pageSize);
-        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, parameter);
+        IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectByCommuniytIdAndByTaUserIdAndByType(pagelist, tpTicket.getType());
         List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
 
         List<TpTicketVO> tpTicketVOList = Lists.newArrayList();

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

@@ -147,7 +147,7 @@
         LEFT JOIN tp_bill b ON b.id = i.bill_id
         AND b.org_id = #{orgId,jdbcType=INTEGER}
         WHERE
-        i.orgId = #{orgId,jdbcType=INTEGER}
+        i.org_id = #{orgId,jdbcType=INTEGER}
         <if test="payType == 0">
             AND i.bill_status = 0
         </if>

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

@@ -88,7 +88,7 @@
     a.view_count
     FROM
     tp_announcement a
-    LEFT JOIN tp_user u ON a.create_user = u.id
+    LEFT JOIN ta_user u ON a.create_user = u.user_id
     AND u.org_id = #{orgId,jdbcType=INTEGER}
     WHERE
     a.org_id = #{orgId,jdbcType=INTEGER}

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

@@ -69,17 +69,17 @@
         WHERE p.id=#{id,jdbcType=INTEGER}
     </select>
 
-    <select id="selectByCommuniytIdAndByTaUserIdAndByType" parameterType="map" resultType="com.huiju.estateagents.property.model.TpTicket" >
+    <select id="selectByCommuniytIdAndByTaUserIdAndByType" parameterType="java.util.Map" resultType="com.huiju.estateagents.property.model.TpTicket" >
         select
          *
         from tp_ticket
         <trim prefix="where" prefixOverrides="and">
-            <if test="communityId != null" >
-                and community_id = #{communityId,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="taUserId != null" >-->
+<!--                and ta_user_id = #{taUserId,jdbcType=INTEGER}-->
+<!--            </if>-->
             <if test="type != null" >
                 and type = #{type,jdbcType=CHAR}
             </if>