From c98785e77c78ee133fdfff987c3c30256aa4f2d5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 22 Jul 2019 12:38:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A1=A5=E8=B4=B4][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E=E5=85=A8=E9=83=A8,?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=88=B8=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxMerchantSubsidyController.java | 4 ++-- .../iformall/controller/WxMerchantSubsidyController.java | 8 +++++--- .../java/com/iformall/mapper/WxMerchantSubsidyMapper.java | 2 +- .../com/iformall/service/WxMerchantSubsidyService.java | 5 +++-- .../service/impl/WxMerchantSubsidyServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxMerchantSubsidyMapper.xml | 5 ++++- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index 5fc1196b3..8d68e14e8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -57,7 +57,7 @@ public class WxMerchantSubsidyController extends BaseController { wxMerchantSubsidy.setStatusS(tmpList); } } - Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); + List> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); return new ResultData(retMap); } @@ -67,7 +67,7 @@ public class WxMerchantSubsidyController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "商户-补贴记录-列表") - public ResultData listMonth(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, Integer pageNum, Integer pageSize) { + public ResultData listMonth(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString()); if (wxMerchantSubsidy == null) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index 19c50b861..de6355bc9 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -13,6 +13,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + +import java.util.List; import java.util.Map; @RestController @@ -32,7 +34,7 @@ public class WxMerchantSubsidyController extends BaseController { WxMerchantBUser user = getUser(); wxMerchantSubsidy.setTenantId(user.getTenantId()); wxMerchantSubsidy.setMerchantId(user.getMerchantId()); - Map retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); + List> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); return new ResultData(retMap); } @@ -41,10 +43,10 @@ public class WxMerchantSubsidyController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData listMonth(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, Integer pageNum, Integer pageSize) { + public ResultData listMonth(@ModelAttribute WxMerchantSubsidyVo wxMerchantSubsidy, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString()); - if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); + if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); WxMerchantBUser user = getUser(); wxMerchantSubsidy.setTenantId(user.getTenantId()); wxMerchantSubsidy.setMerchantId(user.getMerchantId()); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java index e4a6ab493..557fc16a1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java @@ -13,6 +13,6 @@ public interface WxMerchantSubsidyMapper extends CommonMapper findVoList(WxMerchantSubsidy wxMerchantSubsidy); - Map sumVoList(WxMerchantSubsidy wxMerchantSubsidy); + List> sumVoList(WxMerchantSubsidy wxMerchantSubsidy); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java index 1f587493e..513c8dc78 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java @@ -7,6 +7,7 @@ import com.iformall.domain.vo.WxMerchantSubsidyVo; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; public interface WxMerchantSubsidyService { @@ -16,7 +17,7 @@ public interface WxMerchantSubsidyService { * @param record * @return */ - Map sumForSubsidy(WxMerchantSubsidy record); + List> sumForSubsidy(WxMerchantSubsidy record); /** * 根据实体查询分页列表 @@ -26,7 +27,7 @@ public interface WxMerchantSubsidyService { * @param pageSize * @return */ - PageInfo listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxMerchantSubsidyVo record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index de712d298..cf795d4ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -31,12 +31,12 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { ExcelService excelService; @Override - public Map sumForSubsidy(WxMerchantSubsidy record) { + public List> sumForSubsidy(WxMerchantSubsidy record) { return wxMerchantSubsidyMapper.sumVoList(record); } @Override - public PageInfo listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize) { + public PageInfo listAsPage(WxMerchantSubsidyVo record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantSubsidyMapper.findVoList(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 5202c69b9..c2ea2be73 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -185,6 +185,9 @@ and t.`create_date` between #{startdate} and #{enddate} + + and t.`title` like concat('%', #{title},'%') + and t.`status` in @@ -200,7 +203,7 @@ order by ${sortColumns} - select * from ( select