diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java index eae2c45d6..3cbb7279e 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxBillRentController.java @@ -50,15 +50,15 @@ public class WxBillRentController extends BaseController } @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) - public ResultData delete(String id) { + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { wxBillRentService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="String", paramType = "query",required=true) - public ResultData findById(String id) { + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { return new ResultData(Result.SUCCESS,"查询成功",wxBillRentService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java index 867d7f84d..f3e14c975 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCUserBasicInfoController.java @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; +import java.util.Map; @RestController @RequestMapping("wxCUserBasicInfo") @@ -53,20 +54,21 @@ public class WxCUserBasicInfoController extends BaseController { if (null == wxCUserBasicInfo) wxCUserBasicInfo = new WxCUserBasicInfoDto(); String tenantId = getTenantId(); wxCUserBasicInfo.setTenantId(tenantId); - PageInfo page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); - if (page.getSize() == 0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) - && wxCUserBasicInfo.getEndTime() == null && wxCUserBasicInfo.getStartTime() == null - && StringUtils.isBlank(wxCUserBasicInfo.getName()) - ) {//当只有手机号查询并且查不到数据 ,新增 - WxCUser cUser = new WxCUser(); - cUser.setTenantId(tenantId); - cUser.setPhone(wxCUserBasicInfo.getPhone()); - PageInfo cUsers = wxCUserService.listAsPage(cUser, 1, 1); - if (cUsers.getSize() > 0) { - createUserBasicInfo(cUsers.getList().get(0)); - page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); - } - } + PageInfo> page = wxCUserBasicInfoService.queryListMap(wxCUserBasicInfo, pageNum, pageSize); +// PageInfo page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); +// if (page.getSize() == 0 && StringUtils.isNotBlank(wxCUserBasicInfo.getPhone()) +// && wxCUserBasicInfo.getEndTime() == null && wxCUserBasicInfo.getStartTime() == null +// && StringUtils.isBlank(wxCUserBasicInfo.getName()) +// ) {//当只有手机号查询并且查不到数据 ,新增 +// WxCUser cUser = new WxCUser(); +// cUser.setTenantId(tenantId); +// cUser.setPhone(wxCUserBasicInfo.getPhone()); +// PageInfo cUsers = wxCUserService.listAsPage(cUser, 1, 1); +// if (cUsers.getSize() > 0) { +// createUserBasicInfo(cUsers.getList().get(0)); +// page = wxCUserBasicInfoService.list(wxCUserBasicInfo, pageNum, pageSize); +// } +// } return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java index 2c4ba19d6..c1a338625 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxBillRent.java @@ -17,7 +17,7 @@ public class WxBillRent implements Serializable { protected Long id; @Transient - protected List ids; + protected List ids; @Transient protected String sortColumns; @@ -31,10 +31,10 @@ public class WxBillRent implements Serializable { return sortColumns; } - public List getIds() { + public List getIds() { return ids; } - public void setIds(List ids) { + public void setIds(List ids) { this.ids = ids; } diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java index 7bba1edc7..530f6a79a 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCUserBasicInfoMapper.java @@ -1,11 +1,11 @@ package com.simple.mapper; -import java.util.*; import com.simple.common.CommonMapper; - import com.simple.domain.dto.WxCUserBasicInfoDto; import com.simple.domain.po.WxCUserBasicInfo; +import java.util.List; + public interface WxCUserBasicInfoMapper extends CommonMapper { List findList(WxCUserBasicInfo wxCUserBasicInfo); @@ -19,4 +19,7 @@ public interface WxCUserBasicInfoMapper extends CommonMapper> queryListMap(WxCUserBasicInfoDto wxCUserBasicInfo, Integer pageNum, Integer pageSize); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java index 2cf5f2330..534467e28 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxBillRentServiceImpl.java @@ -48,7 +48,7 @@ public class WxBillRentServiceImpl implements WxBillRentService { } @Override - public void deleteById(String id) { + public void deleteById(Long id) { wxBillRentMapper.deleteByPrimaryKey(id); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index 19aee7de4..f30ee53a9 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -11,6 +11,8 @@ import com.simple.domain.po.WxCUserBasicInfo; import com.simple.mapper.WxCUserBasicInfoMapper; import com.simple.service.WxCUserBasicInfoService; +import java.util.Map; + @Service public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { @@ -75,6 +77,11 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { return wxCUserBasicInfoMapper.findCountByAge(dto); } - - + + @Override + public PageInfo> queryListMap(WxCUserBasicInfoDto record, Integer pageNum, Integer pageSize) { + return PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findListMap(record)); + } + + } diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 34eada33a..cd82396ac 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -165,4 +165,18 @@ + + +