diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index aa00ffa..22acfad 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,5 +3,6 @@
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f1814c4..ea38b77 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,15 @@
-
+
+
+
+
+
+
+
+
@@ -116,7 +123,9 @@
-
+
+
+
1695345779307
@@ -146,7 +155,49 @@
1695349889153
-
+
+ 1695351369017
+
+
+
+ 1695351369017
+
+
+ 1695351518242
+
+
+
+ 1695351518242
+
+
+ 1695351530796
+
+
+
+ 1695351530796
+
+
+ 1695351777436
+
+
+
+ 1695351777436
+
+
+ 1695353073646
+
+
+
+ 1695353073646
+
+
+ 1695353309158
+
+
+
+ 1695353309158
+
+
@@ -167,8 +218,13 @@
+
-
+
+
+
+
+
diff --git a/gj_erp.iml b/gj_erp.iml
index ae9ff99..3722b5e 100644
--- a/gj_erp.iml
+++ b/gj_erp.iml
@@ -4,6 +4,11 @@
+
+
+
+
+
@@ -26,6 +31,7 @@
+
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
index 8eb06e8..43fada1 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
@@ -2,6 +2,7 @@ package com.dsic.gj_erp.bean.jhgk;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -30,65 +31,89 @@ public class DmXbjh implements Serializable {
private static final long serialVersionUID=1L;
- @ExcelProperty("学生编号")
+// @ExcelProperty("学生编号")
@ApiModelProperty(value = "状态; 0未提交1已提交;默认为0;")
private String zt;
- @ExcelProperty("学生编号")
+// @ExcelProperty("学生编号")
@ApiModelProperty(value = "2023年01月的 产量,后面字段以此类推")
+ @TableField("cl_202301")
private Double cl202301;
- @ExcelProperty("学生编号")
+ @TableField("cl_202405")
private Double cl202405;
+ @TableField("cl_202411")
private Double cl202411;
+ @TableField("cl_202303")
private Double cl202303;
+ @TableField("cl_202408")
private Double cl202408;
+ @TableField("cl_202402")
private Double cl202402;
+ @TableField("cl_202306")
private Double cl202306;
+ @TableField("cl_202407")
private Double cl202407;
+ @TableField("cl_202501")
private Double cl202501;
@Id
@TableId(value = "dc_ch", type = IdType.ASSIGN_UUID)
private String dcCh;
+ @TableField("cl_202311")
private Double cl202311;
+ @TableField("cl_202305")
private Double cl202305;
+ @TableField("cl_202410")
private Double cl202410;
+ @TableField("cl_202308")
private Double cl202308;
+ @TableField("cl_202302")
private Double cl202302;
+ @TableField("cl_202307")
private Double cl202307;
+ @TableField("cl_202401")
private Double cl202401;
+ @TableField("cl_202404")
private Double cl202404;
+ @TableField("cl_202412")
private Double cl202412;
+ @TableField("cl_202310")
private Double cl202310;
+ @TableField("cl_202304")
private Double cl202304;
+ @TableField("cl_202409")
private Double cl202409;
+ @TableField("cl_202403")
private Double cl202403;
+ @TableField("cl_202309")
private Double cl202309;
+ @TableField("cl_202406")
private Double cl202406;
+ @TableField("cl_202312")
private Double cl202312;