1、statistics模块的配置项目IdSuffix: ${pipIrr.statistics.idSuffix}改为idSuffix: ${pip...

liurunyu

2024-10-29 d838d08ffaf9620ac359d979f1029e0ec0512519

1、statistics模块的配置项目IdSuffix: ${pipIrr.statistics.idSuffix}改为idSuffix: ${pipIrr.statistics.idSuffix}；
2、初始沙盘系统行政区划编码修改；
3、行政区划编码数据库字段num由bigint型改为varchar（5）型，相应mapper.xml文件内修改。

 pipIrr-platform/pipIrr-global/src/main/resources/init-config.xml

@@ -52,9 +52,9 @@
        </org1>
        <org2 tag="sp" name="沙盘" enable="true">
            <districts>
                <province name="甘肃省" num="53" level="0">
                    <city name="酒泉市" num="23" level="1">
                        <country name="大禹集团" num="28" level="2" />
                <province name="甘肃省" num="62" level="0">
                    <city name="酒泉市" num="09" level="1">
                        <country name="肃州区" num="02" level="2" />
                    </city>
                </province>
            </districts>

 pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaDistrictMapper.xml

@@ -7,7 +7,7 @@
    <id column="id" jdbcType="BIGINT" property="id" />
    <id column="supperId" jdbcType="BIGINT" property="supperId" />
    <result column="name" jdbcType="VARCHAR" property="name" />
    <result column="num" jdbcType="TINYINT" property="num" />
    <result column="num" jdbcType="VARCHAR" property="num" />
    <result property="level" column="level" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.pipIrrGlobal.util.DistrictLevel"/>
    <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
  </resultMap>
@@ -47,7 +47,7 @@
    values (#{id,jdbcType=BIGINT},
            #{supperId,jdbcType=BIGINT},
            #{name,jdbcType=VARCHAR},
            #{num,jdbcType=TINYINT},
            #{num,jdbcType=VARCHAR},
            #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
            #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
    )
@@ -87,7 +87,7 @@
        #{name,jdbcType=VARCHAR},
      </if>
      <if test="num != null">
        #{num,jdbcType=TINYINT},
        #{num,jdbcType=VARCHAR},
      </if>
      <if test="level != null">
        #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -105,7 +105,7 @@
        `name` = #{name,jdbcType=VARCHAR},
      </if>
      <if test="num != null">
        num = #{num,jdbcType=TINYINT},
        num = #{num,jdbcType=VARCHAR},
      </if>
      <if test="supperId != null">
        supperId = #{supperId,jdbcType=BIGINT},
@@ -124,7 +124,7 @@
    update ba_district
    set supperId = #{supperId,jdbcType=BIGINT},
        `name` = #{name,jdbcType=VARCHAR},
        num = #{num,jdbcType=TINYINT},
        num = #{num,jdbcType=VARCHAR},
        `level` = #{level,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
        deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
    where id = #{id,jdbcType=BIGINT}
@@ -163,7 +163,7 @@
        INNER JOIN ba_district con ON tow.supperId = con.id
        INNER JOIN ba_district cit ON con.supperId = cit.id
        INNER JOIN ba_district pro ON cit.supperId = pro.id
    WHERE vil.id = ${villageId}
    WHERE vil.id = #{villageId}
  </select>

    <!--根据级别获取行政区划列表-->
@@ -171,7 +171,7 @@
        SELECT
            CAST(id AS char) AS id,
            name
        FROM ba_district WHERE `level` = ${level}
        FROM ba_district WHERE `level` = #{level}
    </select>

    <!--根据父ID获取行政区划列表-->
@@ -179,6 +179,6 @@
        SELECT
            CAST(id AS char) AS id,
            name
        FROM ba_district WHERE supperId = ${supperId}
        FROM ba_district WHERE supperId = #{supperId}
    </select>
</mapper>

 pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/resources/application.yml

@@ -13,4 +13,4 @@
        context-path: /statistics #web访问上下文路径
        context-parameters:
            #GenerateIdSetSuffixListener中应用，取值范围是0-99
            IdSuffix: ${pipIrr.statistics.idSuffix}
            idSuffix: ${pipIrr.statistics.idSuffix}