From ebb2b7790cd50297cf3dbbafcdda7f67971ca7a0 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Sat, 14 Sep 2024 20:24:15 +0800
Subject: [PATCH] 湖北水库：新增上报修复
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java
index 234fafa..7d1c0cd 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgGxServiceImpl.java
@@ -12,6 +12,8 @@
import cn.gistack.sm.sg.service.SgGxStepService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.log.exception.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +47,12 @@
private SgProgressReportMapper sgProgressReportMapper;
@Override
public IPage<SgGxVO> queryPageList(IPage<SgGxVO> page, ProjectSearchDTO searchDTO) {
+ if (StringUtils.isNotBlank(searchDTO.getGxType())){
+ List<String> childType = sgGxMapper.childType(searchDTO.getGxType());
+ searchDTO.setChildTypeList(childType);
+ }
List<SgGxVO> list = sgGxMapper.queryPageList(page,searchDTO);
+
if (CollectionUtils.isNotEmpty(list)){
List<Long> ids = list.stream().map(SgGxDO::getId).collect(Collectors.toList());
List<Long> userIds = list.stream().map(SgGxDO::getCreateUser).collect(Collectors.toList());
@@ -101,6 +108,10 @@
@Transactional
public void delete(Long id) {
SgGxDO byId = this.getById(id);
- this.delete(id);
+ List<SgGxStepDO> list = new LambdaQueryChainWrapper<>(sgGxStepMapper).eq(SgGxStepDO::getGxInfoId, id).list();
+ if (CollectionUtils.isNotEmpty(list)){
+ throw new ServiceException("此工序存在工序步骤，不允许删除");
+ }
+ sgGxMapper.deleteById(id);
}
}
--
Gitblit v1.9.3