From fc0cc9fff4b4cbdc7cbb52b4a96c947530fcbba0 Mon Sep 17 00:00:00 2001
From: zhai <1528081232@qq.com>
Date: 星期六, 13 十二月 2025 11:04:03 +0800
Subject: [PATCH] 广海地质资料系统部分内容修改
---
src/main/java/com/zbooksoft/gdmis/data/entity/CatAjjxx.java | 298 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 237 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zbooksoft/gdmis/data/entity/CatAjjxx.java b/src/main/java/com/zbooksoft/gdmis/data/entity/CatAjjxx.java
index 774f2ad..39500be 100644
--- a/src/main/java/com/zbooksoft/gdmis/data/entity/CatAjjxx.java
+++ b/src/main/java/com/zbooksoft/gdmis/data/entity/CatAjjxx.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -16,6 +18,7 @@
@TableName("CAT_FILE_AJJXX")
@Data
public class CatAjjxx {
+
/**
* 涓婚敭
@@ -101,8 +104,9 @@
/**
* 褰㈡垚鏃堕棿
*/
-
- private Date xcsj;
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private String xcsj;
/**
* 璧勬枡绫诲埆
*/
@@ -154,6 +158,11 @@
private String mj;
/**
+ * 瀵嗙骇浠ｇ爜
+ */
+
+ private String mjdm;
+ /**
* 鏄惁淇濇姢
*/
@@ -176,12 +185,13 @@
/**
* 鍙戣瘉鏃ユ湡
*/
-
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date fzrq;
/**
* 鍙戝竷鏃ユ湡
*/
-
+ @JsonFormat(locale = "zh", timezone = "GMT+8", pattern = "yyyy-MM-dd")
private Date fbrq;
/**
* 鍏抽敭瀛�
@@ -415,27 +425,27 @@
* 姝ｆ枃绾歌川浠舵暟
*/
- private String zwzzjs;
+ private Integer zwzzjs;
/**
* 瀹℃壒绾歌川浠舵暟
*/
- private String spzzjs;
+ private Integer spzzjs;
/**
* 闄勫浘绾歌川浠舵暟
*/
- private String ftzzjs;
+ private Integer ftzzjs;
/**
* 闄勮〃绾歌川浠舵暟
*/
- private String fbzzjs;
+ private Integer fbzzjs;
/**
* 闄勪欢绾歌川浠舵暟
*/
- private String fjzzjs;
+ private Integer fjzzjs;
/**
* 鍏朵粬绾歌川浠舵暟
*/
@@ -451,164 +461,172 @@
* 姝ｆ枃鐢靛瓙浠舵暟
*/
- private String zwdzjs;
+ private Integer zwdzjs;
/**
* 瀹℃壒鐢靛瓙浠舵暟
*/
- private String spdzjs;
+ private Integer spdzjs;
/**
* 闄勫浘鐢靛瓙浠舵暟
*/
- private String ftdzjs;
+ private Integer ftdzjs;
/**
* 闄勮〃鐢靛瓙浠舵暟
*/
- private String fbdzjs;
+ private Integer fbdzjs;
/**
* 闄勪欢鐢靛瓙浠舵暟
*/
- private String fjdzjs;
+ private Integer fjdzjs;
/**
* 杞欢鐢靛瓙浠舵暟
*/
- private String rjdzjs;
+ private Integer rjdzjs;
/**
* 鏁版嵁搴撶數瀛愪欢鏁�
*/
- private String sjkdzjs;
+ private Integer sjkdzjs;
/**
* 澶氬獟浣撶數瀛愪欢鏁�
*/
- private String dmtdzjs;
+ private Integer dmtdzjs;
/**
* 鍏朵粬鐢靛瓙浠舵暟
*/
- private String qtdzjs;
+ private Integer qtdzjs;
/**
* 鎴愭灉璧勬枡鏁版嵁閲�
*/
- private String cgzlsjl;
+ private Double cgzlsjl;
/**
* 鎴愭灉璧勬枡鐢靛瓙鏂囦欢鎬绘暟
*/
- private String cgzldzwjzs;
+ private Integer cgzldzwjzs;
+ /**
+ * 鎴愭灉璧勬枡鐢靛瓙浠舵暟
+ */
+ private Integer cgzldzjs;
+ /**
+ * 鎴愭灉璧勬枡绾歌川浠舵暟
+ */
+ private Integer cgzlzzjs;
/**
* 鎴愭灉璧勬枡鐢靛瓙鏂囦欢澶规�绘暟
*/
- private String cgzldzwjjzs;
+ private Integer cgzldzwjjzs;
/**
* 搴�/d绫荤焊璐ㄤ欢鏁�
*/
- private String dzzjs;
+ private Integer dzzjs;
/**
* 娴�/c绫荤焊璐ㄤ欢鏁�
*/
- private String czzjs;
+ private Integer czzjs;
/**
* 瑙�/g绫荤焊璐ㄤ欢鏁�
*/
- private String gzzjs;
+ private Integer gzzjs;
/**
* 鎺�/t绫荤焊璐ㄤ欢鏁�
*/
- private String tzzjs;
+ private Integer tzzjs;
/**
* 鏍�/y绫荤焊璐ㄤ欢鏁�
*/
- private String yzzjs;
+ private Integer yzzjs;
/**
* 璇�/s绫荤焊璐ㄤ欢鏁�
*/
- private String szzjs;
+ private Integer szzjs;
/**
* 褰�/l绫荤焊璐ㄤ欢鏁�
*/
- private String lzzjs;
+ private Integer lzzjs;
/**
* 鍍�/x绫荤焊璐ㄤ欢鏁�
*/
- private String xzzjs;
+ private Integer xzzjs;
/**
* 缁�/z绫荤焊璐ㄤ欢鏁�
*/
- private String zzzjs;
+ private Integer zzzjs;
/**
* 鏂�/w绫荤焊璐ㄤ欢鏁�
*/
- private String wzzjs;
+ private Integer wzzjs;
/**
* 搴�/d绫荤數瀛愪欢鏁�
*/
- private String ddzjs;
+ private Integer ddzjs;
/**
* 娴�/c绫荤數瀛愪欢鏁�
*/
- private String cdzjs;
+ private Integer cdzjs;
/**
* 瑙�/g绫荤數瀛愪欢鏁�
*/
- private String gdzjs;
+ private Integer gdzjs;
/**
* 鎺�/t绫荤數瀛愪欢鏁�
*/
- private String tdzjs;
+ private Integer tdzjs;
/**
* 鏍�/y绫荤數瀛愪欢鏁�
*/
- private String ydzjs;
+ private Integer ydzjs;
/**
* 璇�/s绫荤數瀛愪欢鏁�
*/
- private String sdzjs;
+ private Integer sdzjs;
/**
* 褰�/l绫荤數瀛愪欢鏁�
*/
- private String ldzjs;
+ private Integer ldzjs;
/**
* 鍍�/x绫荤數瀛愪欢鏁�
*/
- private String xdzjs;
+ private Integer xdzjs;
/**
* 缁�/z绫荤數瀛愪欢鏁�
*/
- private String zdzjs;
+ private Integer zdzjs;
/**
* 鏂�/w绫荤數瀛愪欢鏁�
*/
- private String wdzjs;
+ private Integer wdzjs;
/**
* 鍘熷鐢靛瓙鏁版嵁閲�
*/
@@ -633,44 +651,44 @@
* 閽诲瓟鏁伴噺(宀╃熆蹇�)
*/
- private String zksl;
+ private Integer zksl;
/**
* 鎬昏繘灏�
*/
- private String zjc;
+ private Double zjc;
/**
* 宀╁績鎬绘暟閲忥紙鍙栧績锛�
*/
- private String yxzsl;
+ private Double yxzsl;
/**
* 宀╁睉鎬绘暟閲�
*/
- private String yxizsl;
+ private Integer yxizsl;
/**
* 鏍囨湰鎬绘暟閲�
*/
- private String bbzsl;
+ private Integer bbzsl;
/**
* 鏍峰搧鎬绘暟閲�
*/
- private String ypzsl;
+ private Integer ypzsl;
/**
* 鍏夌墖鎬绘暟閲�
*/
- private String gpzsl;
+ private Integer gpzsl;
/**
* 钖勭墖鎬绘暟閲�
*/
- private String bpzsl;
+ private Integer bpzsl;
/**
* 鍏朵粬绫诲瀷鍚嶇О
*/
@@ -685,7 +703,6 @@
*/
private String qtswsl;
- //椤圭洰/鐭挎潈淇℃伅
/**
* 椤圭洰/鐭夸笟鏉冩�ц川
*/
@@ -698,33 +715,84 @@
/**
* 鎵�灞為」鐩悕绉�
*/
-
private String xmkyqmc;
/**
* 鎵�灞為」鐩紪鍙�
*/
private String xmkyqbh;
+
+ /**
+ * 骞村害
+ */
+ private String nd;
+ /**
+ * 骞村害缁忚垂
+ */
+ private String ndjf;
+ /**
+ * 骞村害缁忚垂
+ */
+
+
+ /**
+ * 鎵�灞為」鐩紪鍙�
+ */
+ private String xmsfzm;
+
+ /**
+ * 浠诲姟涔︾紪鍙�
+ */
+ private String rwsbh;
+
/**
* 鐭夸笟鏉冭捣濮嬫棩鏈�
*/
-
- private Date qssj;
+ private String qssj;
/**
* 鐭夸笟鏉冪粓姝㈡棩鏈�
*/
- private Date zzsj;
+ private String zzsj;
+
+ /**
+ * 椤圭洰鍛ㄦ湡
+ */
+ private String xmzq;
+
+ /**
+ * 椤圭洰灞炴��
+ */
+ private String xmsx;
+
+ /**
+ * 涓夋�у畾浣�
+ */
+ private String sxdw;
+
+ /**
+ * 涓夋�у畾浣�
+ */
+ private String xmzt;
/**
* 椤圭洰涓荤鏈烘瀯鍚嶇О
*/
-
private String xmzgjgmc;
+
+ /**
+ * 椤圭洰鎶�鏈礋璐ｄ汉
+ */
+ private String xmfzrjs;
+
+ /**
+ * 椤圭洰鎶�鏈礋璐ｄ汉
+ */
+ private String xmfzrhq;
+
/**
* 鐭夸笟鏉冧汉
*/
-
private String xmcddwkyqr;
/**
* 椤圭洰璐熻矗浜�
@@ -795,7 +863,7 @@
* 鍙楃悊鏃堕棿
*/
- private Date slsj;
+ private String slsj;
/**
* 鍒涘缓鏃堕棿
*/
@@ -805,9 +873,10 @@
* 璧勬枡鐘舵��
*/
- private String zlzt;
+ private Integer zlzt;
/**
* 钁楀綍鐘舵��
+ * 0:鍙楃悊 1:涓嶅悎鏍� 2:鍚堟牸 3:寰呰憲褰� 4:钁楀綍
*/
private String zluzt;
@@ -815,7 +884,7 @@
* 鍙戝竷鐘舵��
*/
- private String fbzt;
+ private Integer fbzt;
/**
* 楠屾敹浜�
*/
@@ -825,14 +894,15 @@
/**
* 楠屾敹瀹屾垚鏃堕棿
*/
-
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date yswsj;
/**
* 鍑瘉淇℃伅褰曞叆鐘舵��
*/
- private String pzxxlrzt;
+ private Integer pzxxlrzt;
/**
* 鍙戝竷鏃堕棿
*/
@@ -843,4 +913,110 @@
*/
private String fbr;
+
+
+ /**
+ * 姝ｆ枃婧愮數瀛愪欢鏁�
+ */
+ private String zwydzjs;
+ /**
+ * 瀹℃壒婧愮數瀛愪欢鏁�
+ */
+ private String spydzjs;
+ /**
+ * 闄勫浘婧愮數瀛愪欢鏁�
+ */
+ private String ftydzjs;
+ /**
+ * 闄勮〃婧愮數瀛愪欢鏁�
+ */
+ private String fbydzjs;
+ /**
+ * 闄勪欢婧愮數瀛愪欢鏁�
+ */
+ private String fjydzjs;
+ /**
+ * 杞欢婧愮數瀛愪欢鏁�
+ */
+ private String rjydzjs;
+ /**
+ * 鏁版嵁搴撴簮鐢靛瓙浠舵暟
+ */
+ private String sjkydzjs;
+ /**
+ * 澶氬獟浣撴簮鐢靛瓙浠舵暟
+ */
+ private String dmtydzjs;
+ /**
+ * 鍏朵粬婧愮數瀛愪欢鏁�
+ */
+ private String qtydzjs;
+ /**
+ * 姝ｆ枃瀛樻。鐢靛瓙浠舵暟
+ */
+ private String zwcddzjs;
+ /**
+ * 瀹℃壒瀛樻。鐢靛瓙浠舵暟
+ */
+ private String spcddzjs;
+ /**
+ * 闄勫浘瀛樻。鐢靛瓙浠舵暟
+ */
+ private String ftcddzjs;
+ /**
+ * 闄勮〃瀛樻。鐢靛瓙浠舵暟
+ */
+ private String fbcddzjs;
+ /**
+ * 闄勪欢瀛樻。鐢靛瓙浠舵暟
+ */
+ private String fjcddzjs;
+ /**
+ * 杞欢瀛樻。鐢靛瓙浠舵暟
+ */
+ private String rjcddzjs;
+ /**
+ * 鏁版嵁搴撳瓨妗ｇ數瀛愪欢鏁�
+ */
+ private String sjkcddzjs;
+ /**
+ * 澶氬獟浣撳瓨妗ｇ數瀛愪欢鏁�
+ */
+ private String dmtcddzjs;
+ /**
+ * 鍏朵粬瀛樻。鐢靛瓙浠舵暟
+ */
+ private String qtcddzjs;
+ /**
+ * 鍏朵粬绾歌川浠舵暟
+ */
+ private Integer qtzzjs;
+ /**
+ * 鍘熷璧勬枡鐢靛瓙浠舵暟
+ */
+ private Integer yszldzjs;
+ /**
+ * 鍘熷璧勬枡鏁版嵁閲�
+ */
+ private Double yszlsjl;
+ /**
+ * 鍘熷璧勬枡鐢靛瓙鏂囦欢鎬绘暟
+ */
+ private Integer yszldzwjzs;
+ /**
+ * 鍘熷璧勬枡鐢靛瓙鏂囦欢澶规�绘暟
+ */
+ private Integer yszldzwjjzs;
+ /**
+ * 鍘熷璧勬枡绾歌川浠舵暟
+ */
+ private String yszlzzjs;
+ /**
+ * 瀛樺偍涓ゆ潯浠ヤ笂鐨勫湴鐞嗕綅缃俊鎭�
+ */
+ private String dlwzs;
+
+ private Long swId;
+
+ private Integer deleteState;
}
--
Gitblit v1.9.1