aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-04-19 23:21:01 +08:00
parent 837185e5aa
commit 87a1d5c16f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java
View File

@ -33,7 +33,6 @@ public class EmisDestination extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* 序号 */
private Long id;
/* 目的地编码 */
@ -60,6 +59,8 @@ public class EmisDestination extends BaseEntity
private String town;
/* 是否偏远地区 0-否 1-是 */
private Integer isHinterland;
/* 管辖片区id */
private Long countryAreaId;
/* 创建网点 */
private String createSite;
/* 更新网点 */

10
emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
View File

@ -18,6 +18,7 @@
<result property="county" column="county" />
<result property="town" column="town" />
<result property="isHinterland" column="is_hinterland" />
<result property="countryAreaId" column="country_area_id" />
<result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" />
<result property="delFlag" column="del_flag" />
@ -36,11 +37,10 @@
<association property="townName" column="town" select="selectRegionNameByCode"/>
<association property="siteName" column="site_code" select="selectSiteNameByCode"/>
</resultMap>
<sql id="selectEmisDestinationVo">
select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination
select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
@ -74,6 +74,7 @@
<if test="city != null and city != ''"> and city like concat('%', #{city}, '%')</if>
<if test="county != null and county != ''"> and county like concat('%', #{county}, '%')</if>
<if test="town != null and town != ''"> and town like concat('%', #{town}, '%')</if>
<if test="countryAreaId != null "> and country_area_id = #{countryAreaId}</if>
<if test="isHinterland != null "> and is_hinterland = #{isHinterland}</if>
<if test="remark != null and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
<if test="tenantId != null and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
@ -89,7 +90,7 @@
</select>
<select id="selectEmisDestinationById" parameterType="Long" resultMap="EmisDestinationResult">
select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time
select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time
from emis_destination a
where a.id = #{id}
</select>
@ -110,6 +111,7 @@
<if test="county != null and county != ''">county,</if>
<if test="town != null and town != ''">town,</if>
<if test="isHinterland != null">is_hinterland,</if>
<if test="countryAreaId != null">country_area_id,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="delFlag != null and delFlag != ''">del_flag,</if>
@ -134,6 +136,7 @@
<if test="county != null and county != ''">#{county},</if>
<if test="town != null and town != ''">#{town},</if>
<if test="isHinterland != null">#{isHinterland},</if>
<if test="countryAreaId != null">#{countryAreaId},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="tenantId != null and tenantId != ''">#{tenantId},</if>
<if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@ -161,6 +164,7 @@
<if test="county != null and county != ''">county = #{county},</if>
<if test="town != null and town != ''">town = #{town},</if>
<if test="isHinterland != null">is_hinterland = #{isHinterland},</if>
<if test="countryAreaId != null">country_area_id = #{countryAreaId},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>