From 6990a55eca27aa03777827f20cf9a5c2f5c738c0 Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Mon, 9 May 2022 17:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=20?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=9F=A5=E8=AF=A2=E6=98=8E=E7=BB=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/ProjectLawsInventoryEOController.java  | 2 +-
 .../java/com/jero/modules/project/enums/ReviewResultEnum.java | 1 +
 .../project/service/IProjectLawsInventoryEOService.java       | 2 +-
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java       | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
index 9192810a1..ab03ec293 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryEOController.java
@@ -237,7 +237,7 @@ public class ProjectLawsInventoryEOController extends JeroController<ProjectLaws
 	 @ApiOperation(value="项目库-法规清单表-通过id与操作类型查询", notes="项目库-法规清单表-通过id与操作类型查询")
 	 @GetMapping(value = "/queryProjectLawsInventoryInfoById")
 	 public Result<?> queryProjectLawsInventoryInfoById(@RequestParam Map<String,Object> params) {
-		 ProjectLawsInventoryEO result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params);
+		 List<ProjectLawsInventoryEO> result = projectLawsInventoryEOService.queryProjectLawsInventoryInfoById(params);
 		 return Result.OK((String) params.get("cut"),result);
 	 }
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java
index e94ebd815..97b303aad 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ReviewResultEnum.java
@@ -7,6 +7,7 @@ import com.jero.common.constant.enums.CutEnum;
  * 审查结果枚举类
  */
 public enum ReviewResultEnum {
+    LAUNCH("发起","launch"),
     TO_BE_CONFIRMED("待确认","to be confirmed"),
     CONFORMITY("符合","conformity"),
     INCONFORMITY("不符合","inconformity"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
index cad641f9a..641ec12c1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLawsInventoryEOService.java
@@ -89,7 +89,7 @@ public interface IProjectLawsInventoryEOService extends IService<ProjectLawsInve
 	 */
     Result<?> processCall(JSONObject jsonObject);
 
-	ProjectLawsInventoryEO queryProjectLawsInventoryInfoById(Map<String, Object> params);
+	List<ProjectLawsInventoryEO> queryProjectLawsInventoryInfoById(Map<String, Object> params);
 
 
 	void copyInfoByIds(String ids);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index b756853b2..7beb06b21 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -1127,7 +1127,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 	}
 
 	@Override
-	public ProjectLawsInventoryEO queryProjectLawsInventoryInfoById(Map<String, Object> params) {
+	public List<ProjectLawsInventoryEO> queryProjectLawsInventoryInfoById(Map<String, Object> params) {
 
 		String id = (String) params.get("id");
 		if(StringUtils.isEmpty(id)){
@@ -1174,7 +1174,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 		}else {
 			throw new JeroBootException("未找到该法规清单信息！");
 		}
-		return projectLawsInventoryEOList.get(0);
+		return projectLawsInventoryEOList;
 	}
 
 	/**