Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 a3c4c83e9194efebafe730ef47e121f88d36dd54

Merge remote-tracking branch 'origin/master'

 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;


 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;

    /**

 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()
@@ -87,14 +89,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);


 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;

}