diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java index 4a36ca982..f055b9e6e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java @@ -72,9 +72,11 @@ public class CountryCardManageReleaseEOController extends JeroController> queryList() { - List list = countryCardManageReleaseEOService.queryList(); - return Result.OK(list); + public Result> queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + @RequestParam(name="cut", defaultValue="cn") String cut) { + List list = countryCardManageReleaseEOService.queryList(countryCardManageReleaseEO,req,cut); + return Result.OK(cut,list); } /** @@ -208,7 +210,8 @@ public class CountryCardManageReleaseEOController extends JeroController> queryCountryCardManageReleaseByApplyMarkets(@RequestBody JSONObject params) { + String cut = params.getString("cut"); List list = countryCardManageReleaseEOService.queryCountryCardManageReleaseByApplyMarkets(params); - return Result.OK(list); + return Result.OK(cut,list); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java index 392c7e437..12a008567 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java @@ -5,6 +5,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; import com.baomidou.mybatisplus.extension.service.IService; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -60,7 +61,9 @@ public interface ICountryCardManageReleaseEOService extends IService queryList(); + List queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + String cut); /** * 处理数据 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java index e7252d647..593ddae63 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java @@ -3,6 +3,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.api.vo.Result; +import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.vo.DictModel; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO; import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseEO; @@ -29,6 +30,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; + /** * @Description: 问题知识库-country_card-管理发布表 * @Author: jero-boot @@ -123,8 +126,12 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl queryList() { - return list(); + public List queryList(CountryCardManageReleaseEO countryCardManageReleaseEO, + HttpServletRequest req, + String cut) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(countryCardManageReleaseEO, req.getParameterMap()); + List result = this.list(queryWrapper); + return result; } @Override