From 9b184444111708625540e6faab44206ca1e87982 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Tue, 6 Dec 2022 10:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0=E9=A1=B9?=
 =?UTF-8?q?=E6=94=B6=E9=9B=86-=E5=8F=82=E8=80=83=E5=88=97-=E5=BC=95?=
 =?UTF-8?q?=E7=94=A8=E5=8F=82=E8=80=83=E5=8F=82=E6=95=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ParamsReportEOController.java  | 58 ++++++++++++++++++-
 .../cert/report/entity/ParamsReportEO.java    |  5 ++
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
index 80fc4a3df..e1962639d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
@@ -5,8 +5,10 @@ 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.system.base.controller.JeroController;
+import com.jero.modules.cert.report.entity.ParamsReportConfigEO;
 import com.jero.modules.cert.report.entity.ParamsReportEO;
 import com.jero.modules.cert.report.entity.ParamsReportExportHistoryEO;
+import com.jero.modules.cert.report.service.IParamsReportConfigEOService;
 import com.jero.modules.cert.report.service.IParamsReportEOService;
 import com.jero.modules.cert.report.service.IParamsReportExportHistoryEOService;
 import com.jero.modules.system.util.StringUtils;
@@ -21,11 +23,11 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
- /**
+/**
  * @Description: 上报库
  * @Author: jero-boot
  * @Date:   2022-05-18
@@ -41,6 +43,9 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 
 	@Autowired
 	private IParamsReportExportHistoryEOService paramsReportExportHistoryEOService;
+
+	 @Autowired
+	 private IParamsReportConfigEOService paramsReportConfigEOService;
 	
 	/**
 	 * 分页列表查询
@@ -76,6 +81,53 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param paramsReportEO
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 @AutoLog(value = "上报库-参数收集的分页列表查询")
+	 @ApiOperation(value="上报库-参数收集的分页列表查询", notes="上报库-参数收集的分页列表查询")
+	 @GetMapping(value = "/pageForManifest")
+	 @RequiresPermissions("params:report:page")
+	 public Result<?> queryPageListForManifest(ParamsReportEO paramsReportEO,
+									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+									HttpServletRequest req) {
+		 if (StringUtils.isNotEmpty(paramsReportEO.getProjectName())) {
+			 paramsReportEO.setProjectName(paramsReportEO.getProjectName().replace("%", "\\%"));
+		 }
+
+		 if (StringUtils.isNotEmpty(paramsReportEO.getTitle())) {
+			 paramsReportEO.setTitle(paramsReportEO.getTitle().replace("%", "\\%"));
+		 }
+
+		 IPage page = new Page(pageNo, pageSize);
+		 IPage pageList = paramsReportEOService.pageInfo(page, paramsReportEO);
+		 List<ParamsReportEO> rows = pageList.getRecords();
+		 for (ParamsReportEO row : rows) {
+			 // 项目名称-国家-清单名称
+			 row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
+			 // 设置配置
+			 List<ParamsReportConfigEO> paramsReportConfigEOList = paramsReportConfigEOService.queryList(row.getId()).stream()
+					 .sorted(Comparator.comparing(ParamsReportConfigEO::getDisplaySeq))
+					 .collect(Collectors.toList());
+			 List<HashMap<String, String>> mapList = new ArrayList<>();
+			 paramsReportConfigEOList.forEach(paramsReportConfigEO -> {
+				 HashMap<String, String> map = new HashMap<>();
+				 map.put("label", paramsReportConfigEO.getConfigName());
+				 map.put("value", paramsReportConfigEO.getId());
+				 mapList.add(map);
+			 });
+			 row.setConfigList(mapList);
+		 }
+		 return Result.OK(pageList);
+	 }
+
 	/**
 	 * 分页列表查询
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
index 49612c6d5..0c501baac 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/entity/ParamsReportEO.java
@@ -14,6 +14,8 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -82,4 +84,7 @@ public class ParamsReportEO implements Serializable {
     @TableField(exist = false)
     private String pageName; // 项目名称-国家-清单名称
 
+    @TableField(exist = false)
+    private List<HashMap<String, String>> configList;
+
 }