From d2ec14e675e29566826e004668c147e28bd50a23 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Mon, 22 Jan 2024 13:53:48 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E4=BC=9A=E5=90=8E=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):=20=E5=88=97=E8=A1=A8=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/LawsStandardizationController.java    | 12 ++++++++++++
 .../standardization/entity/LawsStandardization.java  |  2 +-
 .../service/ILawsStandardizationService.java         |  7 +++++++
 .../service/impl/LawsStandardizationServiceImpl.java |  8 ++++++++
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
index 39252083..409fff0b 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/controller/LawsStandardizationController.java
@@ -55,6 +55,18 @@ public class LawsStandardizationController extends JeroController<LawsStandardiz
 		 return Result.OK(lawsStandardizationService.queryTreeList());
 	 }
 
+	 /**
+	  * 标准化活动-列表查询
+	  * @return
+	  */
+	 @AutoLog(value = "标准化活动-列表查询")
+	 @ApiOperation(value="标准化活动-列表查询", notes="标准化活动-列表查询")
+	 @GetMapping(value = "/queryList")
+	 @Translation
+	 public Result<List<LawsStandardization>> queryList(LawsStandardization lawsStandardization) {
+		 return Result.OK(lawsStandardizationService.queryList(lawsStandardization));
+	 }
+
 	 /**
 	  * 标准化活动-树结构查询
 	  * @return
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java
index 733650e5..dcb10dc8 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/entity/LawsStandardization.java
@@ -39,7 +39,7 @@ public class LawsStandardization extends BaseEntity {
     private java.lang.String supperName;
 	/**节点类型*/
 	@Excel(name = "节点类型", width = 15)
-    @ApiModelProperty(value = "节点类型")
+    @ApiModelProperty(value = "节点类型(ROOT:总标委，WYH:委员会，FBW:委员会，GROUP:工作组)")
     @Dict(dicCode = "standardization_type")
     private java.lang.String standardizationType;
 	/**编号*/
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java
index 20740c9d..a9b0bb95 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/ILawsStandardizationService.java
@@ -109,4 +109,11 @@ public interface ILawsStandardizationService extends IService<LawsStandardizatio
 	 * @return
 	 */
 	IPage<LawsStandardizationMeeting> queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize);
+
+	/**
+	 * 标准化活动-列表查询
+	 * @param lawsStandardization
+	 * @return
+	 */
+	List<LawsStandardization> queryList(LawsStandardization lawsStandardization);
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
index a09af5f9..b5a5ad4d 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
@@ -548,6 +548,14 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
 		return page;
 	}
 
+	@Override
+	public List<LawsStandardization> queryList(LawsStandardization lawsStandardization) {
+		LambdaQueryWrapper<LawsStandardization> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(LawsStandardization::getStandardizationType, lawsStandardization.getStandardizationType());
+		queryWrapper.orderByAsc(LawsStandardization::getCreateTime);
+		return list(queryWrapper);
+	}
+
 	private void setUserInfo(List<LawsStandardizationMeeting> lawsStandardizationMeetingList) {
 		for (LawsStandardizationMeeting lawsStandardizationMeeting : lawsStandardizationMeetingList) {
 			// 人员信息