傅行帆 4 years ago
parent
commit
5d197d7b08

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

@@ -361,9 +361,10 @@ public class TpTicketController extends BaseController {
361 361
     @RequestMapping(value = "/wx/life/ticket/list", method = RequestMethod.GET)
362 362
     public ResponseBean getWorkerList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
363 363
                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
364
+                                      @RequestParam(value = "communityId", required = false) Integer communityId,
364 365
                                       HttpServletRequest request){
365 366
         TaUser taUser = getPropUserByPersonId(getPersonId(request));
366
-        ResponseBean  responseBean = tpTicketService.getWorkerList(pageNum,pageSize,taUser.getUserId(),taUser.getOrgId());
367
+        ResponseBean  responseBean = tpTicketService.getWorkerList(pageNum,pageSize,taUser.getUserId(),taUser.getOrgId(),communityId);
367 368
         return responseBean;
368 369
     }
369 370
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/property/service/TpTicketService.java View File

@@ -180,7 +180,7 @@ public interface TpTicketService extends IService<TpTicket> {
180 180
      * @param orgId
181 181
      * @return
182 182
      */
183
-    ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId);
183
+    ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId, Integer communityId);
184 184
 
185 185
     int getTicketNum(@Param("orgId") Integer orgId,@Param("startDate") String startDate,@Param("endDate") String endDate);
186 186
 

+ 2
- 1
src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java View File

@@ -1318,11 +1318,12 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
1318 1318
      * @return
1319 1319
      */
1320 1320
     @Override
1321
-    public ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId) {
1321
+    public ResponseBean getWorkerList(Integer pageNum, Integer pageSize, Integer userId, Integer orgId, Integer communityId) {
1322 1322
         IPage<TpTicket> page = new Page<>(pageNum,pageSize);
1323 1323
         LambdaQueryWrapper<TpTicket> tpTicketLambdaQueryWrapper = new LambdaQueryWrapper<>();
1324 1324
         tpTicketLambdaQueryWrapper.eq(TpTicket::getOrgId,orgId);
1325 1325
         tpTicketLambdaQueryWrapper.eq(TpTicket::getTpUserId,userId);
1326
+        tpTicketLambdaQueryWrapper.eq(TpTicket::getCommunityId,communityId);
1326 1327
         tpTicketLambdaQueryWrapper.orderByDesc(TpTicket::getCreateDate);
1327 1328
         IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectPage(page, tpTicketLambdaQueryWrapper);
1328 1329
         List<TpTicket> tpTicketList = tpTicketIPage.getRecords();