From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 20:56:27 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AgreementServiceImpl.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AgreementServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AgreementServiceImpl.java
index eaf75c8..86cbd67 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AgreementServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AgreementServiceImpl.java
@@ -1,15 +1,17 @@
package com.ruoyi.system.service.impl;
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.utils.page.BeanUtils;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.Agreement;
+import com.ruoyi.system.domain.dto.AgreementDTO;
import com.ruoyi.system.mapper.AgreementMapper;
import com.ruoyi.system.service.IAgreementService;
+import java.time.LocalDateTime;
+import java.util.Optional;
import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
/**
* <p>
@@ -22,14 +24,37 @@
@Service
public class AgreementServiceImpl extends ServiceImpl<AgreementMapper, Agreement> implements IAgreementService {
- @Resource
- private IAgreementService iAgreementService;
-
@Override
public Agreement getAgreement(Integer agreementType) {
LambdaQueryWrapper<Agreement> wrapper= Wrappers.lambdaQuery();
wrapper.eq(Agreement::getAgreementType,agreementType);
wrapper.eq(Agreement::getDelFlag,0);
- return iAgreementService.getOne(wrapper);
+ return this.getOne(wrapper);
+ }
+
+ /**
+ * 保存协议
+ *
+ * @param dto 协议对象
+ */
+ @Override
+ public void saveAgreement(AgreementDTO dto) {
+ Optional<Agreement> agreementOpt = this.lambdaQuery()
+ .eq(Agreement::getAgreementType, dto.getAgreementType()).oneOpt();
+ Agreement agreement;
+ if (agreementOpt.isPresent()) {
+ agreement = agreementOpt.get();
+ agreement.setAgreementType(dto.getAgreementType());
+ agreement.setAgreementContent(dto.getAgreementContent());
+ agreement.setUpdateBy(SecurityUtils.getUsername());
+ agreement.setUpdateTime(LocalDateTime.now());
+ this.updateById(agreement);
+ } else {
+ agreement = BeanUtils.copyBean(dto, Agreement.class);
+ agreement.setCreateBy(SecurityUtils.getUsername());
+ agreement.setCreateTime(LocalDateTime.now());
+ this.save(agreement);
+ }
+
}
}
--
Gitblit v1.7.1