feats"

pom.xml

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

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -813,7 +813,7 @@ public class TaPersonController extends BaseController {
     }
 
     @GetMapping("/admin/person-list")
-    public ResponseBean getPersonList(@RequestParam(defaultValue = "1") int pageNumber,
+    public ResponseBean getPersonList(@RequestParam(defaultValue = "1") int pageNum,
                                       @RequestParam(defaultValue = "10") int pageSize,
                                       @RequestParam(value = "name", required = false) String name,
                                       @RequestParam(value = "phone", required = false) String phone,
@@ -821,7 +821,7 @@ public class TaPersonController extends BaseController {
                                       HttpServletRequest request) {
         Integer orgId = getOrgId(request);
 
-        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
         IPage<TaPerson> result = taPersonService.getPersonBy(page, orgId, name, phone, recommended);
 
         return ResponseBean.success(result);

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

@@ -70,17 +70,18 @@ public class IndexCountController extends BaseController {
 	@GetMapping("/admin/dashboard/statis")
 	public ResponseBean getDashboardStatis(@RequestParam("startDate") String startDate,
 										   @RequestParam("endDate") String endDate,
+										   @RequestParam Integer communityId,
 										   HttpServletRequest request) {
 		Integer orgId = getOrgId(request);
 
 		// 楼栋
-		int buildingNum = buildingTreeService.getRoomNum(orgId);
+		int buildingNum = buildingTreeService.getRoomNum(orgId, communityId);
 		// 业主
-		int propNum = iBuildingOwnerInfoService.getAvailableProp(orgId);
+		int propNum = iBuildingOwnerInfoService.getAvailableProp(orgId, communityId);
 		// 缴费
-		int houseNum = iBillService.getBillHouse(orgId, startDate, endDate);
+		int houseNum = iBillService.getBillHouse(orgId, communityId, startDate, endDate);
 		// 工单
-		int ticketNum = tpTicketService.getTicketNum(orgId, startDate, endDate);
+		int ticketNum = tpTicketService.getTicketNum(orgId, communityId, startDate, endDate);
 
 		Map<String, Object> res = new HashMap<>();
 		res.put("buildingNum", buildingNum);
@@ -92,19 +93,20 @@ public class IndexCountController extends BaseController {
 	}
 
 	@GetMapping("/admin/dashboard/dynamic")
-	public ResponseBean getDashboardDynamic(@RequestParam("startDate") String startDate,
-										   @RequestParam("endDate") String endDate,
-										   HttpServletRequest request) {
+	public ResponseBean getDashboardDynamic(@RequestParam Integer communityId,
+											@RequestParam("startDate") String startDate,
+											@RequestParam("endDate") String endDate,
+											HttpServletRequest request) {
 		Integer orgId = getOrgId(request);
 
 		// 工单
-		List<Map<String, Object>> ticketList = tpTicketService.getTicketMapList(orgId, startDate, endDate);
+		List<Map<String, Object>> ticketList = tpTicketService.getTicketMapList(orgId, communityId, startDate, endDate);
 
 		// 业主
-		List<Map<String, Object>> propList = iTaUserVerifyService.getVerifyMapList(orgId, startDate, endDate);
+		List<Map<String, Object>> propList = iTaUserVerifyService.getVerifyMapList(orgId, communityId, startDate, endDate);
 
 		// 缴费
-		List<Map<String, Object>> billList = iBillService.getBillMapList(orgId, startDate, endDate);
+		List<Map<String, Object>> billList = iBillService.getBillMapList(orgId, communityId, startDate, endDate);
 
 		Map<String, Object> res = new HashMap<>();
 		res.put("ticketList", ticketList);
@@ -116,22 +118,24 @@ public class IndexCountController extends BaseController {
 
 
 	@GetMapping("/admin/dashboard/house-verified")
-	public ResponseBean getDashboardHouseVerified(HttpServletRequest request) {
+	public ResponseBean getDashboardHouseVerified(@RequestParam Integer communityId,
+												  HttpServletRequest request) {
 		Integer orgId = getOrgId(request);
 
-		Map<String, Object> houseList = iBuildingOwnerInfoService.getVerifyNum(orgId);
+		Map<String, Object> houseList = iBuildingOwnerInfoService.getVerifyNum(orgId, communityId);
 
 		return ResponseBean.success(houseList);
 	}
 
 	@GetMapping("/admin/dashboard/tips")
-	public ResponseBean getDashboardTips(HttpServletRequest request) {
+	public ResponseBean getDashboardTips(@RequestParam Integer communityId,
+										 HttpServletRequest request) {
 		Integer orgId = getOrgId(request);
 
 		// 待处理工单
-		int ticketNum = tpTicketService.getStartNum(orgId);
+		int ticketNum = tpTicketService.getStartNum(orgId, communityId);
 		// 待审核业主
-		int verifyNum = iTaUserVerifyService.getNoVerifyNum(orgId);
+		int verifyNum = iTaUserVerifyService.getNoVerifyNum(orgId, communityId);
 		// 兑换列表
 		int exchangeNum = iTaPointsExchangeService.getTotalNum(orgId);
 		// 近期在进行的活动

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

@@ -169,7 +169,7 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
 
     Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, @Param("orgId") Integer orgId, @Param("birthday") String birthday);
 
-    List<Map<String, Object>> getVerifyMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate,@Param("endDate") String endDate);
+    List<Map<String, Object>> getVerifyMapList(@Param("orgId") Integer orgId,@Param("communityId") Integer communityId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    int getNoVerifyNum(Integer orgId);
+    int getNoVerifyNum(Integer orgId, Integer communityId);
 }

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

@@ -84,7 +84,7 @@ public interface TpBillOrderMapper extends BaseMapper<TpBillOrder> {
     List<TpBillOrder> selectByOrderBumber(@Param("orderNumber") String orderNumber);
 
 
-    int getBillHouse(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    int getBillHouse(@Param("orgId") Integer orgId,@Param("communityId") Integer communityId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    List<Map<String, Object>> getBillMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    List<Map<String, Object>> getBillMapList(@Param("orgId") Integer orgId,@Param("communityId") Integer communityId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 }

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

@@ -81,7 +81,7 @@ public interface TpBuildingOwnerInfoMapper extends BaseMapper<TpBuildingOwnerInf
     TpBuildingOwnerInfo selectCommunityIdAndAddressName(@Param("orgId") Integer orgId, @Param("phaseName") String phaseName, @Param("buildingName") Integer buildingName, @Param("unitName") Integer unitName, @Param("levelName") Integer levelName, @Param("roomNoName") Integer roomNoName, @Param("ownerTel") String ownerTel);
 
 
-    int getAvailableProp(Integer orgId);
+    int getAvailableProp(Integer orgId, Integer communityId);
 
-    Map<String, Object> getVerifyNum(Integer orgId);
+    Map<String, Object> getVerifyNum(Integer orgId, Integer communityId);
 }

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

@@ -85,5 +85,5 @@ public interface TpRoomNoMapper extends BaseMapper<TpRoomNo> {
     @Update("update tp_room_no set level_name = #{levelName} where org_id=#{orgId} and level_id=#{levelId}")
     int updateLevelName(@Param("orgId") Integer orgId, @Param("levelId") Integer levelId, @Param("levelName") String levelName);
 
-    int getRoomNum(Integer orgId);
+    int getRoomNum(Integer orgId, Integer communityId);
 }

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

@@ -36,9 +36,9 @@ public interface TpTicketMapper extends BaseMapper<TpTicket> {
 
     void updateTpUserId(@Param("ticketId") Integer ticketId);
 
-    int getTicketNum(@Param("orgId") Integer orgId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+    int getTicketNum(@Param("orgId") Integer orgId, @Param("communityId") Integer communityId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    List<Map<String, Object>> getTicketMapList(@Param("orgId") Integer orgId, @Param("startDate") String startDate,  @Param("endDate") String endDate);
+    List<Map<String, Object>> getTicketMapList(@Param("orgId") Integer orgId,@Param("communityId") Integer communityId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    int getStartNum(Integer orgId);
+    int getStartNum(Integer orgId, Integer communityId);
 }

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

@@ -55,5 +55,5 @@ public interface BuildingTreeServiceI {
 
 	ResponseBean editNode(Map<String, Object> parameter, Integer orgId);
 
-    int getRoomNum(Integer orgId);
+    int getRoomNum(Integer orgId, Integer communityId);
 }

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

@@ -119,7 +119,7 @@ public interface IBillService extends IService<Bill> {
 	 */
 	ResponseBean getOrderInfo(String orderNumber);
 
-    int getBillHouse(Integer orgId, String startDate, String endDate);
+    int getBillHouse(Integer orgId, Integer communityId, String startDate, String endDate);
 
-    List<Map<String, Object>> getBillMapList(Integer orgId, String startDate, String endDate);
+    List<Map<String, Object>> getBillMapList(Integer orgId, Integer communityId, String startDate, String endDate);
 }

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
-import io.swagger.models.auth.In;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
@@ -187,7 +186,7 @@ public interface IBuildingOwnerInfoService extends IService<TpBuildingOwnerInfo>
      */
     ResponseBean hasBuild(String personId, Integer orgId ,Integer phaseId, Integer buildingId, Integer unitId, Integer levelId, Integer roomNoId);
 
-    int getAvailableProp(Integer orgId);
+    int getAvailableProp(Integer orgId, Integer communityId);
 
-    Map<String, Object> getVerifyNum(Integer orgId);
+    Map<String, Object> getVerifyNum(Integer orgId, Integer communityId);
 }

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

@@ -100,7 +100,7 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
      */
     Page<Map<String, String>> getPropUserByBirday(Page<Map<String, String>> page, Integer orgId, String birthday);
 
-    List<Map<String, Object>> getVerifyMapList(Integer orgId, String startDate, String endDate);
+    List<Map<String, Object>> getVerifyMapList(Integer orgId, Integer communityId, String startDate, String endDate);
 
-    int getNoVerifyNum(Integer orgId);
+    int getNoVerifyNum(Integer orgId, Integer communityId);
 }

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

@@ -2,7 +2,6 @@ package com.huiju.estateagents.property.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.property.model.TpTicket;
 import com.huiju.estateagents.property.model.TpTicketRecordComment;
 import org.apache.ibatis.annotations.Param;
@@ -182,9 +181,9 @@ public interface TpTicketService extends IService<TpTicket> {
      */
     ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId, Integer communityId);
 
-    int getTicketNum(@Param("orgId") Integer orgId,@Param("startDate") String startDate,@Param("endDate") String endDate);
+    int getTicketNum(@Param("orgId") Integer orgId, Integer communityId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
-    List<Map<String, Object>> getTicketMapList(Integer orgId, String startDate, String endDate);
+    List<Map<String, Object>> getTicketMapList(Integer orgId, Integer communityId, String startDate, String endDate);
 
-    int getStartNum(Integer orgId);
+    int getStartNum(Integer orgId, Integer communityId);
 }

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

@@ -218,6 +218,7 @@ public class BillInvoiceServiceImpl extends ServiceImpl<BillInvoiceMapper, BillI
                 // 生成订单
                 TpBillOrder tpBillOrder = new TpBillOrder();
                 tpBillOrder.setOrgId(billInvoice.getOrgId());
+                tpBillOrder.setCommunityId(billInvoice.getCommunityId());
                 tpBillOrder.setTpBillId(billInvoice.getBillId());
                 tpBillOrder.setTpBillInvoiceId(billInvoice.getId());
 

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

@@ -796,13 +796,13 @@ public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements IB
     }
 
     @Override
-    public int getBillHouse(Integer orgId, String startDate, String endDate) {
-        return tpBillOrderMapper.getBillHouse(orgId, startDate, endDate);
+    public int getBillHouse(Integer orgId, Integer communityId, String startDate, String endDate) {
+        return tpBillOrderMapper.getBillHouse(orgId, communityId, startDate, endDate);
     }
 
     @Override
-    public List<Map<String, Object>> getBillMapList(Integer orgId, String startDate, String endDate) {
-        return tpBillOrderMapper.getBillMapList(orgId, startDate, endDate);
+    public List<Map<String, Object>> getBillMapList(Integer orgId, Integer communityId, String startDate, String endDate) {
+        return tpBillOrderMapper.getBillMapList(orgId, communityId, startDate, endDate);
     }
 
 }

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

@@ -1275,12 +1275,12 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
     }
 
     @Override
-    public int getAvailableProp(Integer orgId) {
-        return tpBuildingOwnerInfoMapper.getAvailableProp(orgId);
+    public int getAvailableProp(Integer orgId, Integer communityId) {
+        return tpBuildingOwnerInfoMapper.getAvailableProp(orgId, communityId);
     }
 
     @Override
-    public Map<String, Object> getVerifyNum(Integer orgId) {
-        return tpBuildingOwnerInfoMapper.getVerifyNum(orgId);
+    public Map<String, Object> getVerifyNum(Integer orgId, Integer communityId) {
+        return tpBuildingOwnerInfoMapper.getVerifyNum(orgId, communityId);
     }
 }

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

@@ -661,8 +661,8 @@ public class BuildingTreeServiceImpl implements BuildingTreeServiceI {
 	}
 
 	@Override
-	public int getRoomNum(Integer orgId) {
-		return tpRoomNoMapper.getRoomNum(orgId);
+	public int getRoomNum(Integer orgId, Integer communityId) {
+		return tpRoomNoMapper.getRoomNum(orgId, communityId);
 	}
 
 	private void saveBuildingTreeData(Integer orgId, Integer communityId, List<TpBuildingOwnerInfo> list) {

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

@@ -498,12 +498,12 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     }
 
     @Override
-    public List<Map<String, Object>> getVerifyMapList(Integer orgId, String startDate, String endDate) {
-        return taUserVerifyMapper.getVerifyMapList(orgId, startDate, endDate);
+    public List<Map<String, Object>> getVerifyMapList(Integer orgId, Integer communityId, String startDate, String endDate) {
+        return taUserVerifyMapper.getVerifyMapList(orgId, communityId, startDate, endDate);
     }
 
     @Override
-    public int getNoVerifyNum(Integer orgId) {
-        return taUserVerifyMapper.getNoVerifyNum(orgId);
+    public int getNoVerifyNum(Integer orgId, Integer communityId) {
+        return taUserVerifyMapper.getNoVerifyNum(orgId, communityId);
     }
 }

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

@@ -17,12 +17,10 @@ import com.huiju.estateagents.common.WxUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaMpTemplate;
 import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.property.common.Constant;
 import com.huiju.estateagents.property.dao.*;
 import com.huiju.estateagents.property.entity.TpRepairType;
-import com.huiju.estateagents.property.exception.WisdomException;
 import com.huiju.estateagents.property.mapper.TpRepairTypeMapper;
 import com.huiju.estateagents.property.model.*;
 import com.huiju.estateagents.property.service.TpTicketService;
@@ -41,10 +39,8 @@ import com.huiju.estateagents.third.service.ITaMpInfoService;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
 import me.chanjar.weixin.mp.bean.kefu.WxMpKefuMessage;
-import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -54,7 +50,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
 
@@ -1338,17 +1333,17 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
     }
 
     @Override
-    public int getTicketNum(Integer orgId, String startDate, String endDate) {
-        return tpTicketMapper.getTicketNum(orgId, startDate, endDate);
+    public int getTicketNum(Integer orgId, Integer communityId, String startDate, String endDate) {
+        return tpTicketMapper.getTicketNum(orgId, communityId, startDate, endDate);
     }
 
     @Override
-    public List<Map<String, Object>> getTicketMapList(Integer orgId, String startDate, String endDate) {
-        return tpTicketMapper.getTicketMapList(orgId, startDate, endDate);
+    public List<Map<String, Object>> getTicketMapList(Integer orgId, Integer communityId, String startDate, String endDate) {
+        return tpTicketMapper.getTicketMapList(orgId, communityId, startDate, endDate);
     }
 
     @Override
-    public int getStartNum(Integer orgId) {
-        return tpTicketMapper.getStartNum(orgId);
+    public int getStartNum(Integer orgId, Integer communityId) {
+        return tpTicketMapper.getStartNum(orgId, communityId);
     }
 }

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

@@ -372,6 +372,7 @@ public class WxPayServiceImpl implements WxPayServiceI {
 
 				TpBillOrder tpBillOrder = new TpBillOrder();
 				tpBillOrder.setOrgId(tpBillInvoice.getOrgId());
+				tpBillOrder.setCommunityId(tpBillInvoice.getCommunityId());
 				tpBillOrder.setTpBillId(tpBillInvoice.getBillId());
 				tpBillOrder.setTpBillInvoiceId(tpBillInvoice.getId());
 				tpBillOrder.setCreateDate(LocalDateTime.now());

src/main/java/com/huiju/estateagents/service/ITaPointsExchangeService.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;

src/main/java/com/huiju/estateagents/service/impl/TaPointsExchangeServiceImpl.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;

src/main/resources/mapper/TaActivityDynamicEnlistMapper.xml

@@ -70,7 +70,7 @@
         SELECT
             t.dynamic_id as dynamicId,
             t.title,
-            count( IFNULL( s.attend_num, 0 ) ) as num
+            sum( IFNULL( s.attend_num, 0 ) ) as num
         FROM
             ta_building_dynamic t
             LEFT JOIN ta_activity_dynamic_enlist s ON s.dynamic_id = t.dynamic_id
@@ -78,7 +78,7 @@
             t.org_id = #{orgId}
             AND t.end_date >= now( )
             AND t.start_date <= now( )
-            AND t.`status` = 1
+            AND t.activity_status = 0
             AND t.is_enlist = 1
         GROUP BY
             t.dynamic_id

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

@@ -52,6 +52,7 @@
             tp_bill_order t
         WHERE
             t.org_id = #{orgId}
+            AND t.community_id = #{communityId}
             AND t.order_status = 1
         <if test="startDate != null and startDate != ''">
             AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
@@ -70,6 +71,7 @@
             INNER JOIN ta_person s ON t.create_user = s.person_id
         WHERE
             t.org_id = #{orgId}
+            AND t.community_id = #{communityId}
             AND t.order_status = 1
         <if test="startDate != null and startDate != ''">
             AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}

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

@@ -137,6 +137,7 @@
             ta_user_verify t
         WHERE
             t.org_id = #{orgId}
+            AND t.community_id = #{communityId}
         <if test="startDate != null and startDate != ''">
             AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
         </if>
@@ -150,6 +151,7 @@
             ta_user_verify t
         WHERE
             t.org_id = #{orgId}
+        AND t.community_id = #{communityId}
         AND t.verify_status = '0'
     </select>
 </mapper>

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

@@ -117,6 +117,7 @@
         select count(*)
         from tp_building_owner_info t
         where t.org_id = #{orgId}
+        and t.community_id = #{communityId}
         and t.verify_status = 1
     </select>
     <select id="getVerifyNum" resultType="java.util.Map">
@@ -133,5 +134,6 @@
             AND f.verify_status = 1
         WHERE
             t.org_id = #{orgId}
+            AND t.community_id = #{communityId}
     </select>
 </mapper>

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

@@ -132,5 +132,6 @@
             INNER JOIN tp_phase q ON q.id = t.phase_id
         WHERE
             t.org_id = #{orgId}
+            AND t.community_id = #{communityId}
     </select>
 </mapper>

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

@@ -108,6 +108,7 @@
             count(*)
         from tp_ticket t
         where t.org_id = #{orgId}
+        AND t.community_id = #{communityId}
         <if test="startDate != null and startDate != ''">
             AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
         </if>
@@ -123,6 +124,7 @@
         from tp_ticket t
         INNER JOIN ta_person s ON t.create_user = s.person_id
         where t.org_id = #{orgId}
+        AND t.community_id = #{communityId}
         <if test="startDate != null and startDate != ''">
             AND DATE_FORMAT(t.create_date, '%Y-%m-%d') &gt;= #{startDate}
         </if>
@@ -135,6 +137,7 @@
         count(*)
         from tp_ticket t
         where t.org_id = #{orgId}
+        and t.community_id = #{communityId}
         and t.status = '0'
     </select>