From 16a96f990b1c2ae06f56a8ebac44e911b9d8ef32 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 23 十一月 2023 14:20:03 +0800
Subject: [PATCH] 行政区划编码最大值改为999，农户编码改为字符串型
---
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java | 1 -
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml | 10 +++++-----
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java | 4 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java | 2 +-
pipIrr-platform/文档/在线需求文件访问地址.txt | 3 ++-
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java
index af0402b..8650633 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaClient.java
@@ -95,7 +95,7 @@
* 缂栧彿
*/
@Schema(description = "鍐滄埛缂栧彿(绯荤粺鑷姩鐢熸垚)", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- public Integer num;
+ public String num ;
/**
* 鎵嬫満鍙�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
index d88ab02..083d580 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaDistrict.java
@@ -55,9 +55,9 @@
/**
* 琛屾斂鍖虹紪鍙�
*/
- @Schema(description = "琛屾斂鍖虹紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Schema(description = "琛屾斂鍖虹紪鍙�(鐪佸競鍘�2浣嶏紝闀囨潙3浣�)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "琛屾斂鍖虹紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Max(message = "琛屾斂鍖虹紪鍙蜂笉澶т簬99", value = 99)
+ @Max(message = "琛屾斂鍖虹紪鍙蜂笉澶т簬99", value = 999)
@Min(message = "琛屾斂鍖虹紪鍙蜂笉灏忎簬0",value = 0)
public String num;
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
index c5a0f21..0d06d71 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaClientMapper.xml
@@ -12,7 +12,7 @@
<result column="divideId" jdbcType="BIGINT" property="divideId" />
<result column="typeId" jdbcType="BIGINT" property="typeId" />
<result column="name" jdbcType="VARCHAR" property="name" />
- <result column="num" jdbcType="INTEGER" property="num" />
+ <result column="num" jdbcType="VARCHAR" property="num" />
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="idCard" jdbcType="VARCHAR" property="idcard" />
<result column="area" jdbcType="FLOAT" property="area" />
@@ -129,7 +129,7 @@
values (#{id,jdbcType=BIGINT}, #{countyId,jdbcType=BIGINT},
#{townId,jdbcType=BIGINT}, #{villageId,jdbcType=BIGINT},
#{blockId,jdbcType=BIGINT}, #{divideId,jdbcType=BIGINT}, #{typeId,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR}, #{num,jdbcType=INTEGER},
+ #{name,jdbcType=VARCHAR}, #{num,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{idcard,jdbcType=VARCHAR},
#{area,jdbcType=FLOAT}, #{district,jdbcType=VARCHAR},
#{address,jdbcType=VARCHAR},#{remark,jdbcType=VARCHAR},
@@ -219,7 +219,7 @@
#{name,jdbcType=VARCHAR},
</if>
<if test="num != null">
- #{num,jdbcType=INTEGER},
+ #{num,jdbcType=VARCHAR},
</if>
<if test="phone != null">
#{phone,jdbcType=VARCHAR},
@@ -272,7 +272,7 @@
'name' = #{name,jdbcType=VARCHAR},
</if>
<if test="num != null">
- num = #{num,jdbcType=INTEGER},
+ num = #{num,jdbcType=VARCHAR},
</if>
<if test="phone != null">
phone = #{phone,jdbcType=VARCHAR},
@@ -312,7 +312,7 @@
blockId = #{blockId,jdbcType=BIGINT},
typeId = #{typeId,jdbcType=BIGINT},
`name` = #{name,jdbcType=VARCHAR},
- num = #{num,jdbcType=INTEGER},
+ num = #{num,jdbcType=VARCHAR},
phone = #{phone,jdbcType=VARCHAR},
idcard = #{idcard,jdbcType=VARCHAR},
area = #{area,jdbcType=FLOAT},
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
index 3cae9c1..6e09240 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockSv.java
@@ -3,7 +3,6 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoBa.BaBlockMapper;
import com.dy.pipIrrGlobal.pojoBa.BaBlock;
-import com.dy.pipIrrGlobal.pojoBa.BaClientType;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/\345\234\250\347\272\277\351\234\200\346\261\202\346\226\207\344\273\266\350\256\277\351\227\256\345\234\260\345\235\200.txt" "b/pipIrr-platform/\346\226\207\346\241\243/\345\234\250\347\272\277\351\234\200\346\261\202\346\226\207\344\273\266\350\256\277\351\227\256\345\234\260\345\235\200.txt"
index d432a8a..b709088 100644
--- "a/pipIrr-platform/\346\226\207\346\241\243/\345\234\250\347\272\277\351\234\200\346\261\202\346\226\207\344\273\266\350\256\277\351\227\256\345\234\260\345\235\200.txt"
+++ "b/pipIrr-platform/\346\226\207\346\241\243/\345\234\250\347\272\277\351\234\200\346\261\202\346\226\207\344\273\266\350\256\277\351\227\256\345\234\260\345\235\200.txt"
@@ -1 +1,2 @@
-https://docs.qq.com/desktop
\ No newline at end of file
+https://docs.qq.com/desktop
+https://lanhuapp.com/link/#/invite?sid=lX0nqhHU
\ No newline at end of file
--
Gitblit v1.8.0