From fc70c81d0681133aac7fc880110055cc9e8f38fb Mon Sep 17 00:00:00 2001 From: yinq Date: Thu, 23 Oct 2025 09:12:41 +0800 Subject: [PATCH] =?UTF-8?q?1.0.15=20=E5=90=88=E5=90=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/auth/controller/TokenController.java | 2 +- .../oa/erp/controller/ErpContractInfoController.java | 4 ++-- .../dromara/oa/erp/mapper/ErpContractInfoMapper.java | 6 ++++++ .../oa/erp/service/IErpContractInfoService.java | 2 +- .../erp/service/impl/ErpContractInfoServiceImpl.java | 12 +++++++++--- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java index cd9f8d61..a088f789 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/controller/TokenController.java @@ -104,7 +104,7 @@ public class TokenController { Long userId = LoginHelper.getUserId(); scheduledExecutorService.schedule(() -> { - remoteMessageService.publishMessage(List.of(userId), "欢迎登录RuoYi-Cloud-Plus微服务管理系统"); + remoteMessageService.publishMessage(List.of(userId), "欢迎登录海威经营管理信息化系统"); }, 5, TimeUnit.SECONDS); return R.ok(loginVo); } diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java index a216126f..9adc17ce 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/controller/ErpContractInfoController.java @@ -76,8 +76,8 @@ public class ErpContractInfoController extends BaseController { @Log(title = "合同信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) { - return toAjax(erpContractInfoService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody ErpContractInfoBo bo) { + return R.ok(erpContractInfoService.insertByBo(bo)); } /** diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java index 25d597be..a9ac7557 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/mapper/ErpContractInfoMapper.java @@ -5,6 +5,8 @@ import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; +import org.dromara.common.mybatis.annotation.DataColumn; +import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.oa.erp.domain.ErpContractInfo; import org.dromara.oa.erp.domain.vo.ErpContractInfoVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -24,6 +26,10 @@ public interface ErpContractInfoMapper extends BaseMapperPlus selectCustomErpContractInfoVoList(@Param("page") Page page, @Param(Constants.WRAPPER) MPJLambdaWrapper queryWrapper); /** diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java index 1fe7fa2f..e46c0fb5 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractInfoService.java @@ -48,7 +48,7 @@ public interface IErpContractInfoService { * @param bo 合同信息 * @return 是否新增成功 */ - Boolean insertByBo(ErpContractInfoBo bo); + ErpContractInfoVo insertByBo(ErpContractInfoBo bo); /** * 修改合同信息 diff --git a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java index 7e5bd7cb..cd343d20 100644 --- a/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java @@ -47,7 +47,13 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { */ @Override public ErpContractInfoVo queryById(Long contractId) { - return baseMapper.selectVoById(contractId); + ErpContractInfoVo contractInfoVo = baseMapper.selectVoById(contractId); + MPJLambdaWrapper lqw = JoinWrappers.lambda(ErpContractMaterial.class) + .selectAll(ErpContractMaterial.class) + .eq(contractId != null, ErpContractMaterial::getContractId, contractId); + List contractMaterialList = contractMaterialMapper.selectList(lqw); + contractInfoVo.setContractMaterialList(contractMaterialList); + return contractInfoVo; } /** @@ -108,7 +114,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean insertByBo(ErpContractInfoBo bo) { + public ErpContractInfoVo insertByBo(ErpContractInfoBo bo) { ErpContractInfo add = MapstructUtils.convert(bo, ErpContractInfo.class); validEntityBeforeSave(add); List contractMaterialList = bo.getContractMaterialList(); @@ -120,7 +126,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService { contractMaterialMapper.insert(erpContractMaterial); } } - return flag; + return MapstructUtils.convert(add, ErpContractInfoVo.class); } /**