| @@ -23,8 +23,8 @@ public class WxShopController extends BaseController | |||||
| private WxShopService wxShopService; | private WxShopService wxShopService; | ||||
| private Logger logger = Logger.getLogger(WxShopController.class); | private Logger logger = Logger.getLogger(WxShopController.class); | ||||
| @ApiOperation("分页列表接口") | |||||
| @ApiOperation("分页列表接口") | |||||
| @GetMapping("list") | @GetMapping("list") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), | @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), | ||||
| @@ -32,6 +32,8 @@ public class WxShopController extends BaseController | |||||
| public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) { | ||||
| if (null == wxShop) wxShop = new WxShop(); | if (null == wxShop) wxShop = new WxShop(); | ||||
| wxShop.setTenantId(getTenantId()); | wxShop.setTenantId(getTenantId()); | ||||
| wxShop.setSortColumns(WxShop.Field.Id_DESC); | |||||
| final PageInfo<Map<String,Object>> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); | final PageInfo<Map<String,Object>> page = wxShopService.listMapAsPage(wxShop, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -239,7 +239,7 @@ public class WxShop implements Serializable { | |||||
| sb.append(","); | sb.append(","); | ||||
| sb.append(fields[k].toString()); | sb.append(fields[k].toString()); | ||||
| } | } | ||||
| this.sortColumns=sb.toString(); | |||||
| } | } | ||||
| public void setSortColumns(String sortColumns) | public void setSortColumns(String sortColumns) | ||||
| @@ -15,6 +15,8 @@ import org.springframework.transaction.annotation.Transactional; | |||||
| import java.util.ArrayList; | import java.util.ArrayList; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Map; | |||||
| import java.util.stream.Collectors; | |||||
| @Service | @Service | ||||
| public class WxMerchantServiceImpl implements WxMerchantService { | public class WxMerchantServiceImpl implements WxMerchantService { | ||||
| @@ -36,7 +38,23 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| @Override | @Override | ||||
| public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { | public PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize) { | ||||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record)); | |||||
| WxMerchantShop merchantShop = new WxMerchantShop(); | |||||
| merchantShop.setTenantId(record.getTenantId()); | |||||
| merchantShop.setIsDel(0); | |||||
| List<WxMerchantShop> merchantShops = wxMerchantShopMapper.findList(merchantShop); | |||||
| PageHelper.startPage(pageIndex, pageSize); | |||||
| List<WxMerchant> merchants = wxMerchantMapper.findList(record); | |||||
| for(WxMerchant merchant:merchants){ | |||||
| List<WxMerchantShop> collect = merchantShops.stream().filter(ms -> ms.getMerchantId().equals(merchant.getId())).collect(Collectors.toList()); | |||||
| if(collect!=null && collect.size()>0){ | |||||
| merchant.setRentalStartDate(collect.get(0).getRentalStartDate()); | |||||
| merchant.setRentalEndDate(collect.get(0).getRentalEndDate()); | |||||
| } | |||||
| } | |||||
| PageInfo<WxMerchant> pageInfo = new PageInfo<>(merchants); | |||||
| return pageInfo; | |||||
| } | } | ||||
| @Override | @Override | ||||