行政区划编码最大值改为999，农户编码改为字符串型

liurunyu

2023-11-23 16a96f990b1c2ae06f56a8ebac44e911b9d8ef32

行政区划编码最大值改为999，农户编码改为字符串型

 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 ;

    /**
     * æ‰‹æœºå·

 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;


 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},

 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;

 pipIrr-platform/Îĵµ/ÔÚÏßÐèÇóÎļþ·ÃÎʵØÖ·.txt

@@ -1 +1,2 @@
https://docs.qq.com/desktop
https://docs.qq.com/desktop
https://lanhuapp.com/link/#/invite?sid=lX0nqhHU