From afb0d090d4409eadbaf70e3ee7b89defc574f1e9 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 21 Jul 2022 18:34:15 +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=E6=B8=85=E5=8D=95-=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=AD=E7=9A=84=E8=B7=B3=E8=BD=AC=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 74 +++++++++++++++++--
 1 file changed, 68 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 424e1ffe3..346534b85 100644
--- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -1294,6 +1294,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
@@ -1325,8 +1327,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 		SysUser sysUser = sysUserService.getUserByName(dre);
 		String[] thirdIds = new String[1];
 		thirdIds[0] = sysUser.getThirdId();
-		String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-		String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
+		String urlParamsStr = parseUrlParams(paramsManifestEO);
+		String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+		String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
 		String content = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " and other parameter items, please enter the link to handle it.";
 		String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length()-1) + " please enter " + href + " to handle it.";
 		String msgTitle = "You have a homo parameter task to complete";
@@ -1385,6 +1388,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String[] paramsCollectManifestIdStr = paramsCollectManifestIds.split(",");
@@ -1450,8 +1455,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				 SysUser sysUser = sysUserService.getUserByName(sdt);
 				 String[] thirdIds = new String[1];
 				 thirdIds[0] = sysUser.getThirdId();
-				 String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-				 String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
+				 String urlParamsStr = parseUrlParams(paramsManifestEO);
+				 String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+				 String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
 				 String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
 				 String msgTitle = "You have a homo parameter task to complete";
 
@@ -1509,6 +1515,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); // 获取当前登录人
 		ParamsManifestVO projectInfo = paramsManifestEOService.getProjectById(projectId); // 获取项目信息
+		ParamsManifestEO paramsManifestEO = paramsManifestEOService.queryById(paramsManifestId); // 获取清单信息
+		paramsManifestEO.setProjectName(projectInfo.getProjectName());
 
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		List<ParamsCollectManifestEO> updateEOList = new ArrayList<>();
@@ -1576,8 +1584,9 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 				SysUser sysUser = sysUserService.getUserByName(sdt);
 				String[] thirdIds = new String[1];
 				thirdIds[0] = sysUser.getThirdId();
-				String hrefFeishu = backUrl + "/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId;
-				String href = "<a href='/ParameterItemCollection?id=" + paramsManifestId + "&projectId=" + projectId + "'" + " target='_blank'>the link</a>,";
+				String urlParamsStr = parseUrlParams(paramsManifestEO);
+				String hrefFeishu = backUrl + "/ParameterItemCollection" + urlParamsStr;
+				String href = "<a href='/ParameterItemCollection" + urlParamsStr + "'" + " target='_blank'>the link</a>,";
 				String contentInfo = connectBuilder.substring(0, connectBuilder.toString().length() - 1) + " and other parameter items, please enter " + href + " and fill in the relevant information.";
 				String msgTitle = "You have a homo parameter task to complete";
 
@@ -2446,6 +2455,59 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 	}
 
+	/**
+	 * 通过实体类获取 URL Params
+	 *
+	 * @param clazz 实体类
+	 * @return URL Params
+	 */
+	private String parseUrlParams(Object clazz) {
+		// 遍历属性类、属性值
+		List<Field> list = findAllFieldsOfSelfAndSuperClass(clazz.getClass());
+
+		StringBuilder requestURL = new StringBuilder();
+		try {
+
+			boolean flag = true;
+			String property, value, params;
+			for (Field field : list) {
+				// 允许访问私有变量
+				field.setAccessible(true);
+				// 过滤静态属性
+				if (Modifier.isStatic(field.getModifiers())) {
+					continue;
+				}
+				// 属性名
+				property = field.getName();
+				// 属性值
+				if (field.get(clazz) != null) {
+					if (Date.class.equals(field.getType())) {
+						Date date = (Date) field.get(clazz);
+						String pattern = "";
+						pattern = "yyyy-MM-dd HH:mm:ss";
+						SimpleDateFormat formatter=new SimpleDateFormat(pattern);
+						String time=formatter.format(date);
+						value = time;
+					} else {
+						value = field.get(clazz).toString();
+					}
+					params = property + "=" + value;
+				} else {
+					params = property + "=";
+				}
+				if (flag) {
+					requestURL.append("?").append(params);
+					flag = false;
+				} else {
+					requestURL.append("&").append(params);
+				}
+			}
+		} catch (Exception e) {
+			log.error("通过实体类获取URL出现异常：" + e.getMessage(), e);
+		}
+		return requestURL.toString();
+	}
+
 	/**
 	 * 实体对象转成Map
 	 * @param obj 实体对象