From 7f3e843cbdced5d9deb2234648fef360cd296f83 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 05 Mar 2026 09:40:00 +0800
Subject: [PATCH] 实施清单管理，加个字段，结果送达方式：站内信、短信
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 b1faf2d..be8c0ca 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;
@@ -59,8 +60,12 @@
@Override
public IPage<GdImplementListVO> selectGdImplementListPage(IPage<GdImplementListVO> page, GdImplementListPageParam gdImplementList) {
- List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ List<Long> deptList = new ArrayList<>();
+ if (!AuthUtil.isAdministrator()) {
+ deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ }
gdImplementList.setDeptList(deptList);
+ gdImplementList.setAreaCode(HeaderUtils.formatAreaCode(gdImplementList.getAreaCode()));
return page.setRecords(baseMapper.selectGdImplementListPage(page, gdImplementList));
}
@@ -71,6 +76,9 @@
// 查询实施清单详情
GdImplementListEntity gdImplement = getOne(Condition.getQueryWrapper(GenericConverter.convert(idParam, GdImplementListEntity.class)));
getThingListMaterialRelationVO.setImplementListId(gdImplement.getId());
+ getThingListMaterialRelationVO.setProcessDefinitionId(gdImplement.getProcessDefinitionId());
+ getThingListMaterialRelationVO.setProcessInstanceId(gdImplement.getProcessInstanceId());
+ getThingListMaterialRelationVO.setResultConfig(gdImplement.getResultConfig());
List<GdThingListMaterialRelEntity> gdThingListMaterialRelEntityList = gdThingListMaterialRelService.list(
Wrappers.<GdThingListMaterialRelEntity>query()
@@ -87,14 +95,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);
@@ -106,6 +109,7 @@
gdImplementList.setId(param.getImplementListId());
gdImplementList.setProcessDefinitionId(param.getProcessDefinitionId());
gdImplementList.setProcessInstanceId(param.getProcessInstanceId());
+ gdImplementList.setResultConfig(param.getResultConfig());
updateById(gdImplementList);
return true;
--
Gitblit v1.9.3