From 49120f2b9db33455756a911e56cfefd7c3120a14 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期三, 28 十月 2026 17:05:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java | 105 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 87 insertions(+), 18 deletions(-)
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
index dcd24d3..476b9df 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/SpStatCase.java
@@ -24,12 +24,6 @@
private static final long serialVersionUID = 1L;
/**
- * donationmonth
- */
- @ApiModelProperty("donationmonth")
- private String donationmonth;
-
- /**
* deptid
*/
@ApiModelProperty("deptid")
@@ -39,19 +33,21 @@
* deptname
*/
@ApiModelProperty("deptname")
+ @Excel(name = "涓氬姟缁�", sort = 1)
private String deptname;
-// /**
-// * reporterno
-// */
-// @ApiModelProperty("reporterno")
-// private String reporterno;
-//
-// /**
-// * reportername
-// */
-// @ApiModelProperty("reportername")
-// private String reportername;
+ /**
+ * reporterno
+ */
+ @ApiModelProperty("reporterno")
+ private String reporterno;
+
+ /**
+ * reportername
+ */
+ @ApiModelProperty("reportername")
+ @Excel(name = "涓撹亴浜哄憳", sort = 2)
+ private String reportername;
/**
* casesum
@@ -59,5 +55,78 @@
@ApiModelProperty("casesum")
private String casesum;
-}
+ /**
+ * 鐜妭 0锛氭綔鍦ㄦ崘鐚�
+ */
+ @ApiModelProperty("娼滃湪鎹愮尞")
+ private String workflow0;
+ /**
+ * 鐜妭 1锛氬尰瀛﹁瘎浼�
+ */
+ @ApiModelProperty("鍖诲璇勪及")
+ private String workflow1;
+
+ /**
+ * 鐜妭 2锛氬灞炵‘璁�
+ */
+ @ApiModelProperty("瀹跺睘纭")
+ private String workflow2;
+
+ /**
+ * 鐜妭 3锛氫鸡鐞嗗鏌�
+ */
+ @ApiModelProperty("浼︾悊瀹℃煡")
+ private String workflow3;
+
+ /**
+ * 鐜妭 4锛氬櫒瀹樺垎閰�
+ */
+ @ApiModelProperty("鍣ㄥ畼鍒嗛厤")
+ private String workflow4;
+
+ /**
+ * 鐜妭 5锛氳幏鍙栬璇�
+ */
+ @ApiModelProperty("鑾峰彇瑙佽瘉")
+ private String workflow5;
+
+ /**
+ * 鐜妭 6锛氭崘鐚畬鎴�
+ */
+ @ApiModelProperty("鎹愮尞瀹屾垚")
+ private String workflow6;
+
+ /**
+ * 鐜妭 7锛氬綊妗ｆ挙閿�
+ */
+ @ApiModelProperty("褰掓。鎾ら攢")
+ private String workflow7;
+
+ /**
+ * 鐜妭 8锛氭渚嬪綊妗�
+ */
+ @ApiModelProperty("妗堜緥褰掓。")
+ private String workflow8;
+
+ /**
+ * 鐜妭 9锛氭渚嬬粓姝�
+ */
+ @ApiModelProperty("妗堜緥缁堟")
+ private String workflow9;
+
+ /**
+ * 妗堜緥绱锛坵orkflow 7 鎴� 8锛�
+ */
+ @ApiModelProperty("妗堜緥绱")
+ @Excel(name = "妗堜緥绱", sort = 3, cellType = Excel.ColumnType.NUMERIC)
+ private String workflowsum;
+
+ /**
+ * 缁堟妗堜緥鏁帮紙termination_case=1锛�
+ */
+ @ApiModelProperty("缁堟妗堜緥鏁�")
+ @Excel(name = "缁堟妗堜緥", sort = 4, cellType = Excel.ColumnType.NUMERIC)
+ private String terminationcase;
+
+}
--
Gitblit v1.9.3