From 4fa212add5bb7689331e9e070c802bfcb5dcafa2 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 02 Feb 2026 17:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java | 31 ++++++++++++++++++++++++++-----
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.xml | 3 +++
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java | 2 +-
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml | 2 +-
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/service/impl/GdImplementListServiceImpl.java | 2 ++
5 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
index 571b201..ed9b4ff 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneManageMapper.xml
@@ -79,7 +79,7 @@
FROM ja_fw_defense_scene_manage dsm
LEFT JOIN ja_fw_defense_scene ds ON ds.id = dsm.defense_scene_id AND ds.is_deleted = 0
LEFT JOIN ja_fw_area_divide ad ON FIND_IN_SET(ad.id, ds.area_divide_ids) > 0 AND ad.is_deleted = 0
- WHERE dsm.id = #{id} AND dsm.is_deleted = 0
+ WHERE dsm.id = #{id}
) ad ON CHAR_LENGTH(ad.device_ids) - CHAR_LENGTH(REPLACE(ad.device_ids, ',', '')) >= numbers.n - 1
WHERE ad.device_ids IS NOT NULL AND ad.device_ids != ''
</select>
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.xml
index c21f9d8..f18e59a 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/mapper/GdMaterialMapper.xml
@@ -15,6 +15,9 @@
<select id="selectGdMaterialPage" resultMap="gdMaterialResultMap">
select * from ja_gd_material where is_deleted = 0
+ <if test="gdMaterial.materialName != null">
+ and material_name like concat('%',#{gdMaterial.materialName},'%')
+ </if>
</select>
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 b5ee84c..026a7e9 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
@@ -71,6 +71,8 @@
// 查询实施清单详情
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()
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java
index ec99323..921a1e7 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdMaterialVO.java
@@ -54,7 +54,7 @@
* 是否适用全部情形：1是 0否
*/
@ApiModelProperty(value = "是否适用全部情形：1是 0否")
- private Byte isAllScenario;
+ private Integer isAllScenario;
/**
* 材料说明
*/
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
index 3b6c813..8f009c3 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/vo/GdThingListMaterialRelVO.java
@@ -16,10 +16,10 @@
*/
package org.sxkj.gd.implement.vo;
-import org.sxkj.gd.implement.entity.GdThingListMaterialRelEntity;
-import org.springblade.core.tool.node.INode;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
/**
* 实施清单-材料关联表（情形化配置） 视图实体类
@@ -28,8 +28,29 @@
* @since 2026-01-31
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class GdThingListMaterialRelVO extends GdThingListMaterialRelEntity {
+public class GdThingListMaterialRelVO implements Serializable {
+
private static final long serialVersionUID = 1L;
+ /**
+ * 关联实施清单ID
+ */
+ @ApiModelProperty(value = "关联实施清单ID")
+ private Long implementListId;
+ /**
+ * 关联材料ID
+ */
+ @ApiModelProperty(value = "关联材料ID")
+ private Long materialId;
+ /**
+ * 材料序号（列表展示字段）
+ */
+ @ApiModelProperty(value = "材料序号（列表展示字段）")
+ private Integer sort;
+ /**
+ * 材料情形化配置：{"scenario_name":"情形1","is_need":1,"remark":"仅情形1需提供"}
+ */
+ @ApiModelProperty(value = "材料情形化配置：{\"scenario_name\":\"情形1\",\"is_need\":1,\"remark\":\"仅情形1需提供\"}")
+ private String scenarioConfig;
+
}
--
Gitblit v1.9.3