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> 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 queryMeetingPageByStandardizationId(String standardizationId, Integer pageNo, Integer pageSize); + + /** + * 标准化活动-列表查询 + * @param lawsStandardization + * @return + */ + List 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 queryList(LawsStandardization lawsStandardization) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsStandardization::getStandardizationType, lawsStandardization.getStandardizationType()); + queryWrapper.orderByAsc(LawsStandardization::getCreateTime); + return list(queryWrapper); + } + private void setUserInfo(List lawsStandardizationMeetingList) { for (LawsStandardizationMeeting lawsStandardizationMeeting : lawsStandardizationMeetingList) { // 人员信息