上报库-项目名称

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java

@@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
+import com.jero.common.constant.enums.CutEnum;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.vo.DictModel;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
 import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
 import com.jero.modules.cert.report.service.IParamsReportEOService;
 import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
 import com.jero.modules.dummy.enums.OrderEnum;
+import com.jero.modules.system.enums.DicCodeEnum;
+import com.jero.modules.system.service.ISysDictService;
 import com.jero.modules.system.util.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -35,6 +39,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.stream.Collectors;
 
 
 /**
@@ -54,6 +59,9 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 	@Autowired
 	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
 
+	@Autowired
+	private ISysDictService sysDictService;
+
 	/**
 	 * 分页列表查询
 	 *
@@ -85,9 +93,19 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 //		for (ParamsReportEO row : rows) {
 //			row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
 //		}
+		//目标市场
+		List<DictModel> targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode());
 		List<ParamsReportEO> paramsReportEOS = paramsReportEOService.listInfo(paramsReportEO);
 		for (ParamsReportEO row : paramsReportEOS) {
-			row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
+			String market = getMarket(paramsReportEO, targetMarketList, row);
+			if(StringUtils.isNotBlank(row.getProjectName())){
+				if(StringUtils.isBlank(market)){
+					row.setProjectName(row.getProjectName()+ "-00");
+				}else{
+					row.setProjectName(row.getProjectName()+"-" +market+ "-00");
+				}
+				row.setPageName(row.getProjectName());
+			}
 		}
 		String orderBy = paramsReportEO.getOrderBy();
 		String orderByField = paramsReportEO.getOrderByField();
@@ -109,7 +127,34 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		IPage pageList = getPages(pageNo,pageSize,paramsReportEOS);
 		return Result.OK(pageList);
 	}
-	 public Page getPages(Integer currentPage, Integer pageSize, List<ParamsReportEO> list){
+
+	private String getMarket(ParamsReportEO paramsReportEO, List<DictModel> targetMarketList, ParamsReportEO row) {
+		List<DictModel> dictModelList = new ArrayList<>();
+		String targetMarket = "";
+		if(StringUtils.isNotBlank(row.getTargetMarket())){
+			for (String s : row.getTargetMarket().split(",")) {
+				List<DictModel> dictModelListTemp = targetMarketList.stream()
+						.filter(e -> s.equals(e.getValue())).collect(Collectors.toList());
+				dictModelList.addAll(dictModelListTemp);
+			}
+		}
+		if(dictModelList.size() != 0){
+			StringBuilder sb = new StringBuilder();
+			for (DictModel dictModel : dictModelList) {
+				if(CutEnum.CN.getValue().equals(paramsReportEO)){
+					sb.append(dictModel.getText()+",");
+				}else{
+					sb.append(dictModel.getTextEn()+",");
+				}
+			}
+			if(StringUtils.isNotBlank(sb)){
+				targetMarket = sb.substring(0,sb.length()-1);
+			}
+		}
+		return targetMarket;
+	}
+
+	public Page getPages(Integer currentPage, Integer pageSize, List<ParamsReportEO> list){
 		 Page page =new Page();
 		 if(list==null){
 			 return null;

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java

@@ -79,6 +79,9 @@ public class ParamsReportEO implements Serializable {
     @ApiModelProperty(value = "目标市场")
     private String targetMarket;
 
+    @TableField(exist = false)
+    private String cut;
+
     @TableField(exist = false)
     private String pageName; // 项目名称-国家-清单名称