From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java
index 65e21a8..ea835fe 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwContractServiceImpl.java
@@ -6,9 +6,9 @@
import com.sinata.common.exception.ServiceException;
import com.sinata.common.utils.BeanUtils;
import com.sinata.common.utils.CollUtils;
+import com.sinata.common.utils.StringUtils;
import com.sinata.system.domain.MwAttachment;
import com.sinata.system.domain.MwContract;
-import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.MwContractDTO;
import com.sinata.system.domain.query.MwContractQuery;
import com.sinata.system.domain.vo.MwAttachmentVO;
@@ -22,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -47,14 +48,11 @@
*/
@Override
public PageDTO<MwContractVO> pageList(MwContractQuery query) {
- if (Objects.isNull(query.getDepartmentId())) {
- SysDepartment myDepartment = sysDepartmentService.getMyDepartment();
- if (Objects.isNull(myDepartment)) {
- return PageDTO.empty(0L, 0L);
- }
- query.setDepartmentId(myDepartment.getId());
+ String treeCode = sysDepartmentService.getTreeCodeByDepartmentId(query.getDepartmentId());
+ if (StringUtils.isBlank(treeCode)) {
+ return PageDTO.empty(0L, 0L);
}
- Page<MwContractVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query);
+ Page<MwContractVO> page = baseMapper.pageList(new Page<>(query.getPageCurr(), query.getPageSize()), query, treeCode);
return PageDTO.of(page);
}
@@ -84,6 +82,7 @@
@Transactional(rollbackFor = Exception.class)
public void add(MwContractDTO dto) {
MwContract mwContract = BeanUtils.copyBean(dto, MwContract.class);
+ save(mwContract);
if (CollUtils.isNotEmpty(dto.getAttachmentList())) {
List<MwAttachment> mwAttachments = BeanUtils.copyToList(dto.getAttachmentList(), MwAttachment.class);
mwAttachments.forEach(attachment -> {
@@ -132,4 +131,15 @@
//执行删除
removeById(id);
}
+
+ /**
+ * 查询未过期合同列表
+ *
+ * @param date
+ * @return
+ */
+ @Override
+ public List<MwContractVO> queryListTerminationDateBeforeNow(Date date) {
+ return baseMapper.queryListTerminationDateBeforeNow(date);
+ }
}
--
Gitblit v1.7.1