country_card-管理发布 - 对比接口。

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/controller/CountryCardManageReleaseEOController.java

@@ -198,4 +198,17 @@ public class CountryCardManageReleaseEOController extends JeroController<Country
 		 Result<List<DictModel>> result = this.countryCardManageReleaseEOService.getApplyMarketList();
 		 return result;
 	 }
+
+	 /**
+	  * 根据多个适用地区查询数据
+	  *
+	  * @return
+	  */
+	 @AutoLog(value = "问题知识库-country_card-管理发布表-根据多个适用地区查询数据")
+	 @ApiOperation(value="问题知识库-country_card-管理发布表-根据多个适用地区查询数据", notes="问题知识库-country_card-管理发布表-根据多个适用地区查询数据")
+	 @PostMapping(value = "/queryCountryCardManageReleaseByApplyMarkets")
+	 public Result<List<CountryCardManageReleaseEO>> queryCountryCardManageReleaseByApplyMarkets(@RequestBody JSONObject params) {
+		 List<CountryCardManageReleaseEO> list = countryCardManageReleaseEOService.queryCountryCardManageReleaseByApplyMarkets(params);
+		 return Result.OK(list);
+	 }
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/entity/CountryCardManageReleaseDetailEO.java

@@ -1,6 +1,8 @@
 package com.jero.modules.problemKnowledgeBase.entity;
 
 import java.io.Serializable;
+import java.util.List;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -70,7 +72,7 @@ public class CountryCardManageReleaseDetailEO implements Serializable {
 	/**标签名称**/
 	@TableField(exist = false)
     @ApiModelProperty(value = "标签名称")
-    private java.lang.String countryCardTempIdName;
+    private java.lang.String lableName;
 
 	/**描述*/
 	@Excel(name = "描述", width = 15)
@@ -89,4 +91,8 @@ public class CountryCardManageReleaseDetailEO implements Serializable {
     @TableField(exist = false)
     @ApiModelProperty(value = "标签类型")
     private String lableType;
+
+    /**Country Card模板维护-字典项实体*/
+    @TableField(exist = false)
+    private List<CountryCardTempItemEO> countryCardTempItemEOList;
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/ICountryCardManageReleaseEOService.java

@@ -80,4 +80,6 @@ public interface ICountryCardManageReleaseEOService extends IService<CountryCard
 	 * @return
 	 */
     Result<List<DictModel>> getApplyMarketList();
+
+    List<CountryCardManageReleaseEO> queryCountryCardManageReleaseByApplyMarkets(JSONObject params);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseDetailEOServiceImpl.java

@@ -5,6 +5,7 @@ import com.jero.common.system.query.QueryGenerator;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardManageReleaseDetailEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempEO;
 import com.jero.modules.problemKnowledgeBase.entity.CountryCardTempItemEO;
+import com.jero.modules.problemKnowledgeBase.enums.LableTypeEnum;
 import com.jero.modules.problemKnowledgeBase.mapper.CountryCardManageReleaseDetailEOMapper;
 import com.jero.modules.problemKnowledgeBase.service.ICountryCardManageReleaseDetailEOService;
 import com.jero.modules.problemKnowledgeBase.service.ICountryCardTempEOService;
@@ -35,6 +36,8 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl<Cou
 
 	@Autowired
 	private ICountryCardTempEOService countryCardTempEOService;
+	@Autowired
+	private ICountryCardTempItemEOService countryCardTempItemEOService;
 
 	/**
 	 * 保存
@@ -114,6 +117,11 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl<Cou
 			//获取模板
 			List<CountryCardTempEO> countryCardTempEOList = this.countryCardTempEOService.list();
 
+			List<String> countroCardTempIdList = countryCardTempEOList.stream().map(CountryCardTempEO::getId).distinct().collect(Collectors.toList());
+			QueryWrapper<CountryCardTempItemEO> tempItemEOQueryWrapper = new QueryWrapper<>();
+			tempItemEOQueryWrapper.lambda().in(CountryCardTempItemEO::getCountryCardTempId,countroCardTempIdList);
+			List<CountryCardTempItemEO> countryCardTempItemEOList = this.countryCardTempItemEOService.list(tempItemEOQueryWrapper);
+
 			datas.forEach(data -> {
 				List<CountryCardTempEO> countryCardTemp = countryCardTempEOList.stream().filter(countryCardTempEO -> {
 					boolean flag = false;
@@ -122,9 +130,23 @@ public class CountryCardManageReleaseDetailEOServiceImpl extends ServiceImpl<Cou
 					}
 					return flag;
 				}).collect(Collectors.toList());
-				data.setCountryCardTempIdName(countryCardTemp.get(0).getLableName());
+				data.setLableName(countryCardTemp.get(0).getLableName());
 
 				data.setLableType(countryCardTemp.get(0).getLableType());
+
+				//如果该条数据的标签类型是下拉选项
+				if(CollectionUtils.isNotEmpty(countryCardTempItemEOList) && StringUtils.equals(data.getLableType(), LableTypeEnum.PULL_SINGLE.getValue())){
+					//把这条模板的下拉选项设置进去
+					List<CountryCardTempItemEO> collect = countryCardTempItemEOList.stream().filter(countryCardTempItemEO -> {
+						boolean flag = false;
+						if (StringUtils.equals(data.getCountryCardTempId(), countryCardTempItemEO.getCountryCardTempId())) {
+							flag = true;
+						}
+						return flag;
+					}).collect(Collectors.toList());
+
+					data.setCountryCardTempItemEOList(collect);
+				}
 			});
 
 		}

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/CountryCardManageReleaseEOServiceImpl.java

@@ -132,6 +132,7 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 			QueryWrapper<CountryCardManageReleaseDetailEO> releaseDetailEOQueryWrapper = new QueryWrapper<>();
 			releaseDetailEOQueryWrapper.lambda().in(CountryCardManageReleaseDetailEO::getCountryCardManageReleaseId,CountryCardManageReleaseEOId);
 			List<CountryCardManageReleaseDetailEO> releaseDetailEOList = this.countryCardManageReleaseDetailEOService.list(releaseDetailEOQueryWrapper);
+			this.countryCardManageReleaseDetailEOService.disposeData(releaseDetailEOList,cut);
 
 			datas.forEach(data -> {
 				if (StringUtils.isNotEmpty(data.getReleaseStatus())) {
@@ -196,4 +197,16 @@ public class CountryCardManageReleaseEOServiceImpl extends ServiceImpl<CountryCa
 
 		return Result.OK(result);
 	}
+
+	@Override
+	public List<CountryCardManageReleaseEO> queryCountryCardManageReleaseByApplyMarkets(JSONObject params) {
+		String applyMarkets = params.getString("applyMarkets");
+		String cut = params.getString("cut");
+		List<String> applyMarketList = Arrays.asList(applyMarkets.split(","));
+		QueryWrapper<CountryCardManageReleaseEO> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().in(CountryCardManageReleaseEO::getApplyMarket,applyMarketList);
+		List<CountryCardManageReleaseEO> result = this.list(queryWrapper);
+		this.disposeData(result,cut);
+		return result;
+	}
 }