From 878734f40460ed6ee70a9bb3bcaa039da529f22f Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Tue, 03 Feb 2026 11:32:51 +0800
Subject: [PATCH] update-实施清单管理
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java
index 10433f2..0a8b7f4 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java
@@ -27,6 +27,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.gd.common.GenericConverter;
import org.sxkj.gd.common.IdParam;
import org.sxkj.gd.implement.entity.GdImplementListEntity;
@@ -61,13 +62,19 @@
public IPage<GdImplementListVO> selectGdImplementListPage(IPage<GdImplementListVO> page, GdImplementListPageParam gdImplementList) {
List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
gdImplementList.setDeptList(deptList);
+ gdImplementList.setAreaCode(HeaderUtils.formatAreaCode(gdImplementList.getAreaCode()));
return page.setRecords(baseMapper.selectGdImplementListPage(page, gdImplementList));
}
@Override
public GetThingListMaterialRelationVO getThingListMaterialRelation(IdParam idParam) {
- GetThingListMaterialRelationVO getThingListMaterialRelationVO = GenericConverter.convert(
- getOne(Condition.getQueryWrapper(GenericConverter.convert(idParam, GdImplementListEntity.class))), GetThingListMaterialRelationVO.class);
+ GetThingListMaterialRelationVO getThingListMaterialRelationVO = new GetThingListMaterialRelationVO();
+
+ // 查询实施清单详情
+ GdImplementListEntity gdImplement = getOne(Condition.getQueryWrapper(GenericConverter.convert(idParam, GdImplementListEntity.class)));
+ getThingListMaterialRelationVO.setImplementListId(gdImplement.getId());
+ getThingListMaterialRelationVO.setProcessDefinitionId(gdImplement.getProcessDefinitionId());
+ getThingListMaterialRelationVO.setProcessInstanceId(gdImplement.getProcessInstanceId());
List<GdThingListMaterialRelEntity> gdThingListMaterialRelEntityList = gdThingListMaterialRelService.list(
Wrappers.<GdThingListMaterialRelEntity>query()
@@ -84,14 +91,9 @@
if (null != param.getImplementListId()) {
// 关联关系先删除，在新增
- boolean implementListId = gdThingListMaterialRelService.remove(
+ gdThingListMaterialRelService.remove(
new QueryWrapper<GdThingListMaterialRelEntity>()
.eq("implement_list_id", param.getImplementListId()));
-
- // 删除失败，返回false
- if (!implementListId) {
- return false;
- }
List<GdThingListMaterialRelEntity> gdThingListMaterialRelEntityList = getGdThingListMaterialRelEntities(param);
--
Gitblit v1.9.3