57900 修改。
This commit is contained in:
+3
-2
@@ -196,8 +196,9 @@ public class CountryCardManageReleaseEOController extends JeroController<Country
|
|||||||
@AutoLog(value = "问题知识库-country_card-管理发布-获取适用市场下拉选")
|
@AutoLog(value = "问题知识库-country_card-管理发布-获取适用市场下拉选")
|
||||||
@ApiOperation(value="问题知识库-country_card-管理发布-获取适用市场下拉选", notes="问题知识库-country_card-管理发布-获取适用市场下拉选")
|
@ApiOperation(value="问题知识库-country_card-管理发布-获取适用市场下拉选", notes="问题知识库-country_card-管理发布-获取适用市场下拉选")
|
||||||
@GetMapping(value = "/getApplyMarketList")
|
@GetMapping(value = "/getApplyMarketList")
|
||||||
public Result<List<DictModel>> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag) {
|
public Result<List<DictModel>> getApplyMarketList(@RequestParam(name = "queryFlag",required=false) String queryFlag,
|
||||||
Result<List<DictModel>> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag);
|
@RequestParam(name = "cut",required = true) String cut) {
|
||||||
|
Result<List<DictModel>> result = this.countryCardManageReleaseEOService.getApplyMarketList(queryFlag,cut);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -82,7 +82,7 @@ public interface ICountryCardManageReleaseEOService extends IService<CountryCard
|
|||||||
* 获取适用市场
|
* 获取适用市场
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Result<List<DictModel>> getApplyMarketList(String queryFlag);
|
Result<List<DictModel>> getApplyMarketList(String queryFlag,String cut);
|
||||||
|
|
||||||
List<CountryCardManageReleaseEO> queryCountryCardManageReleaseByApplyMarkets(JSONObject params);
|
List<CountryCardManageReleaseEO> queryCountryCardManageReleaseByApplyMarkets(JSONObject params);
|
||||||
}
|
}
|
||||||
|
|||||||
+8
-1
@@ -3,6 +3,7 @@ package com.jero.modules.problemKnowledgeBase.service.impl;
|
|||||||
import com.alibaba.fastjson.JSONObject;
|
import com.alibaba.fastjson.JSONObject;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
import com.jero.common.api.vo.Result;
|
import com.jero.common.api.vo.Result;
|
||||||
|
import com.jero.common.constant.enums.CutEnum;
|
||||||
import com.jero.common.system.query.QueryGenerator;
|
import com.jero.common.system.query.QueryGenerator;
|
||||||
import com.jero.common.system.vo.DictModel;
|
import com.jero.common.system.vo.DictModel;
|
||||||
import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
|
import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
|
||||||
@@ -206,7 +207,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Result<List<DictModel>> getApplyMarketList(String queryFlag) {
|
public Result<List<DictModel>> getApplyMarketList(String queryFlag,String cut) {
|
||||||
List<DictModel> result = new ArrayList<>();
|
List<DictModel> result = new ArrayList<>();
|
||||||
|
|
||||||
//获取所有的适用地区
|
//获取所有的适用地区
|
||||||
@@ -256,6 +257,12 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(StringUtils.equals(cut, CutEnum.EN.getValue())){
|
||||||
|
result.forEach(data -> {
|
||||||
|
data.setText(data.getTextEn());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return Result.OK(result);
|
return Result.OK(result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user