From fc5cda9c324a91948dd964e91960623b41baf293 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 10:55:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysAgreementServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysAgreementServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysAgreementServiceImpl.java
index e70b00b..b00a180 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysAgreementServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/SysAgreementServiceImpl.java
@@ -1,12 +1,16 @@
package com.sinata.system.service.impl;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sinata.common.utils.BeanUtils;
import com.sinata.system.domain.SysAgreement;
import com.sinata.system.domain.dto.SysAgreementDTO;
+import com.sinata.system.domain.vo.SysAgreementVO;
import com.sinata.system.mapper.SysAgreementMapper;
import com.sinata.system.service.SysAgreementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Optional;
/**
* <p>
@@ -18,12 +22,34 @@
*/
@Service
public class SysAgreementServiceImpl extends ServiceImpl<SysAgreementMapper, SysAgreement> implements SysAgreementService {
+ /**
+ * @param type
+ * @return
+ */
+ @Override
+ public SysAgreementVO getAgreementByType(Integer type) {
+ Optional<SysAgreement> sysAgreement = lambdaQuery().eq(SysAgreement::getType, type).oneOpt();
+ SysAgreementVO sysAgreementVO = null;
+ if (sysAgreement.isPresent()) {
+ SysAgreement item = sysAgreement.get();
+ sysAgreementVO = BeanUtils.copyBean(item, SysAgreementVO.class);
+ return sysAgreementVO;
+ }
+ return sysAgreementVO;
+ }
+
+ /**
+ * 保存协议
+ *
+ * @param dto
+ */
@Override
@Transactional(rollbackFor = Exception.class)
public void saveAgreement(SysAgreementDTO dto) {
- SysAgreement sysAgreement = lambdaQuery().eq(SysAgreement::getType, 1).oneOpt().orElse(new SysAgreement());
- sysAgreement.setContent(dto.getContent());
- sysAgreement.setType(1);
+ SysAgreement sysAgreement = BeanUtils.copyBean(dto, SysAgreement.class);
+ lambdaQuery().eq(SysAgreement::getType, dto.getType()).oneOpt().ifPresent(item -> sysAgreement.setId(item.getId()));
saveOrUpdate(sysAgreement);
}
+
+
}
--
Gitblit v1.7.1