From eb015fcecc0b394aaf22aad477c3af7dc9d29d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com> Date: Thu, 30 Oct 2025 15:28:07 +0800 Subject: [PATCH] =?UTF-8?q?10-30-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi-admin/src/main/resources/application.yml | 4 ++-- .../app/controller/SysPackageController.java | 12 ++++++++++++ .../dromara/app/service/SysPackageServiceImpl.java | 14 ++++++++++++++ .../vo/XzdContractProgressSettlementDateVo.java | 2 +- .../impl/XzdContractAccountServiceImpl.java | 1 + 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml index 996d67a0..f384688c 100644 --- a/xinnengyuan/ruoyi-admin/src/main/resources/application.yml +++ b/xinnengyuan/ruoyi-admin/src/main/resources/application.yml @@ -281,8 +281,8 @@ springdoc: packages-to-scan: org.dromara.gps - group: 24.招标模块 packages-to-scan: org.dromara.tender - # - group: 25.app版本模块 - # packages-to-scan: org.dromara.app + - group: 29.app版本模块 + packages-to-scan: org.dromara.app - group: 25.数据迁移模块 packages-to-scan: org.dromara.transferData - group: 26.netty消息模块 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java index 6b0cd431..dee59e16 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java @@ -3,8 +3,12 @@ package org.dromara.app.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.dromara.app.domain.SysPackage; +import org.dromara.app.domain.bo.SysPackageBo; +import org.dromara.app.domain.vo.SysPackageVo; import org.dromara.app.service.SysPackageServiceImpl; import org.dromara.common.core.domain.R; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.impl.SysOssServiceImpl; import org.springframework.beans.factory.annotation.Autowired; @@ -26,6 +30,14 @@ public class SysPackageController { @Autowired private SysPackageServiceImpl sysPackageService; + /** + * 获取列表 + */ + @GetMapping("/list") + public TableDataInfo list(SysPackageBo bo, PageQuery pageQuery) { + return sysPackageService.queryPageList(bo, pageQuery); + } + /** * 获取最新版本 */ diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/service/SysPackageServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/service/SysPackageServiceImpl.java index ea319ac6..d57ed760 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/service/SysPackageServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/service/SysPackageServiceImpl.java @@ -1,10 +1,24 @@ package org.dromara.app.service; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.dromara.app.domain.SysPackage; +import org.dromara.app.domain.bo.SysPackageBo; +import org.dromara.app.domain.vo.SysPackageVo; import org.dromara.app.mapper.SysPackageMapper; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.mybatis.core.page.TableDataInfo; import org.springframework.stereotype.Service; @Service public class SysPackageServiceImpl extends ServiceImpl { + + public TableDataInfo queryPageList(SysPackageBo bo, PageQuery pageQuery) { +// LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), new LambdaQueryWrapper<>()); +// setValue(result.getRecords()); + return TableDataInfo.build(result); + } + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java index f658dda8..d064545f 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdContractProgressSettlementDateVo.java @@ -53,7 +53,7 @@ public class XzdContractProgressSettlementDateVo implements Serializable { * 周期类型 */ @ExcelProperty(value = "周期类型") - private LocalDate type; + private String type; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java index 8e01ae49..498c1365 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdContractAccountServiceImpl.java @@ -133,6 +133,7 @@ public class XzdContractAccountServiceImpl extends ServiceImpl