From 8261ceda58718fe8becb795d09e152a3b61a6f22 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 31 Jan 2026 16:39:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/excel/GdImplementListExcel.java | 102 ++++++++++++++++++++++++++++----------------------
1 files changed, 57 insertions(+), 45 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/excel/GdImplementationListExcel.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/excel/GdImplementListExcel.java
similarity index 61%
rename from drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/excel/GdImplementationListExcel.java
rename to drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/excel/GdImplementListExcel.java
index 53bfcd6..14597e0 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/implementation/excel/GdImplementationListExcel.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/implement/excel/GdImplementListExcel.java
@@ -14,7 +14,7 @@
* this software without specific prior written permission.
* Author: Chill 庄骞 (smallchill@163.com)
*/
-package org.sxkj.gd.implementation.excel;
+package org.sxkj.gd.implement.excel;
import com.alibaba.excel.annotation.ExcelProperty;
@@ -27,73 +27,85 @@
/**
- * 实施清单表（实时清单管理） Excel实体类
+ * 实施清单主表 Excel实体类
*
- * @author lw
- * @since 2026-01-14
+ * @author Aix
+ * @since 2026-01-31
*/
@Data
@ColumnWidth(25)
@HeadRowHeight(20)
@ContentRowHeight(18)
-public class GdImplementationListExcel implements Serializable {
+public class GdImplementListExcel implements Serializable {
private static final long serialVersionUID = 1L;
/**
- * 实施编码（唯一）
+ * 事项名称
*/
@ColumnWidth(20)
- @ExcelProperty("实施编码（唯一）")
- private String implementationCode;
+ @ExcelProperty("事项名称")
+ private String matterName;
+ /**
+ * 事项编码
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("事项编码")
+ private String matterCode;
+ /**
+ * 所属区划编码
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("所属区划编码")
+ private String areaCode;
+ /**
+ * 所属区划名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("所属区划名称")
+ private String areaName;
+ /**
+ * 所属机构编码
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("所属机构编码")
+ private String orgCode;
+ /**
+ * 所属机构名称
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("所属机构名称")
+ private String orgName;
+ /**
+ * 目录编码
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("目录编码")
+ private String catalogCode;
+ /**
+ * 实施编码
+ */
+ @ColumnWidth(20)
+ @ExcelProperty("实施编码")
+ private String implementCode;
/**
* 实施清单名称
*/
@ColumnWidth(20)
@ExcelProperty("实施清单名称")
- private String listName;
+ private String implementName;
/**
- * 所属区划
+ * 流程定义主键
*/
@ColumnWidth(20)
- @ExcelProperty("所属区划")
- private String belongArea;
+ @ExcelProperty("流程定义主键")
+ private String processDefinitionId;
/**
- * 所属机构
+ * 流程实例主键
*/
@ColumnWidth(20)
- @ExcelProperty("所属机构")
- private String belongOrg;
- /**
- * 项目编码
- */
- @ColumnWidth(20)
- @ExcelProperty("项目编码")
- private String projectCode;
- /**
- * 材料数量
- */
- @ColumnWidth(20)
- @ExcelProperty("材料数量")
- private Integer materialQuantity;
- /**
- * 结果送达方式（短信方式等）
- */
- @ColumnWidth(20)
- @ExcelProperty("结果送达方式（短信方式等）")
- private String resultDeliveryMethod;
- /**
- * 受条件规则（已注册用户等）
- */
- @ColumnWidth(20)
- @ExcelProperty("受条件规则（已注册用户等）")
- private String acceptanceRules;
- /**
- * 区域编码
- */
- @ColumnWidth(20)
- @ExcelProperty("区域编码")
- private String areaCode;
+ @ExcelProperty("流程实例主键")
+ private String processInstanceId;
/**
* 删除标志（0存在 1删除）
*/
--
Gitblit v1.9.3