傅行帆 4 年 前
コミット
5d197d7b08

+ 2
- 1
src/main/java/com/huiju/estateagents/property/controller/TpTicketController.java ファイルの表示

361
     @RequestMapping(value = "/wx/life/ticket/list", method = RequestMethod.GET)
361
     @RequestMapping(value = "/wx/life/ticket/list", method = RequestMethod.GET)
362
     public ResponseBean getWorkerList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
362
     public ResponseBean getWorkerList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
363
                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
363
                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
364
+                                      @RequestParam(value = "communityId", required = false) Integer communityId,
364
                                       HttpServletRequest request){
365
                                       HttpServletRequest request){
365
         TaUser taUser = getPropUserByPersonId(getPersonId(request));
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
         return responseBean;
368
         return responseBean;
368
     }
369
     }
369
 }
370
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/property/service/TpTicketService.java ファイルの表示

180
      * @param orgId
180
      * @param orgId
181
      * @return
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
     int getTicketNum(@Param("orgId") Integer orgId,@Param("startDate") String startDate,@Param("endDate") String endDate);
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 ファイルの表示

1318
      * @return
1318
      * @return
1319
      */
1319
      */
1320
     @Override
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
         IPage<TpTicket> page = new Page<>(pageNum,pageSize);
1322
         IPage<TpTicket> page = new Page<>(pageNum,pageSize);
1323
         LambdaQueryWrapper<TpTicket> tpTicketLambdaQueryWrapper = new LambdaQueryWrapper<>();
1323
         LambdaQueryWrapper<TpTicket> tpTicketLambdaQueryWrapper = new LambdaQueryWrapper<>();
1324
         tpTicketLambdaQueryWrapper.eq(TpTicket::getOrgId,orgId);
1324
         tpTicketLambdaQueryWrapper.eq(TpTicket::getOrgId,orgId);
1325
         tpTicketLambdaQueryWrapper.eq(TpTicket::getTpUserId,userId);
1325
         tpTicketLambdaQueryWrapper.eq(TpTicket::getTpUserId,userId);
1326
+        tpTicketLambdaQueryWrapper.eq(TpTicket::getCommunityId,communityId);
1326
         tpTicketLambdaQueryWrapper.orderByDesc(TpTicket::getCreateDate);
1327
         tpTicketLambdaQueryWrapper.orderByDesc(TpTicket::getCreateDate);
1327
         IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectPage(page, tpTicketLambdaQueryWrapper);
1328
         IPage<TpTicket> tpTicketIPage = tpTicketMapper.selectPage(page, tpTicketLambdaQueryWrapper);
1328
         List<TpTicket> tpTicketList = tpTicketIPage.getRecords();
1329
         List<TpTicket> tpTicketList = tpTicketIPage.getRecords();