From d48b39f5346cf4843b15bf78a7dcf95b6b0c2eae Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Mon, 02 Feb 2026 15:52:30 +0800
Subject: [PATCH] update-实施清单管理
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/GdImplementListPageParam.java | 17 +++++++++++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/ThingListMaterialRelationParam.java | 8 ++++++++
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java | 7 +------
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/GdImplementListPageParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/GdImplementListPageParam.java
index 12976d5..35a212a 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/GdImplementListPageParam.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/GdImplementListPageParam.java
@@ -33,6 +33,23 @@
@ApiModelProperty(value = "所属区划编码")
private String areaCode;
+ /**
+ * 所属机构编码
+ */
+ @ApiModelProperty(value = "所属机构编码")
+ private String orgCode;
+ /**
+ * 所属机构名称
+ */
+ @ApiModelProperty(value = "所属机构名称")
+ private String orgName;
+
+ /**
+ * 目录编码
+ */
+ @ApiModelProperty(value = "目录编码")
+ private String catalogCode;
+
@ApiModelProperty(value = "部门集合",hidden = true)
private List<Long> deptList;
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/ThingListMaterialRelationParam.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/ThingListMaterialRelationParam.java
index 618e064..7c09558 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/ThingListMaterialRelationParam.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/param/ThingListMaterialRelationParam.java
@@ -1,5 +1,7 @@
package org.sxkj.gd.implement.param;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -21,11 +23,17 @@
* 关联实施清单ID
*/
@ApiModelProperty(value = "关联实施清单ID")
+ @JsonSerialize(
+ using = ToStringSerializer.class
+ )
private Long implementListId;
/**
* 关联材料ID
*/
@ApiModelProperty(value = "关联材料ids")
+ @JsonSerialize(
+ using = ToStringSerializer.class
+ )
private List<Long> materialIds;
/**
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..b5ee84c 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
@@ -87,14 +87,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