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-05-11 16:04:21 +08:00
parent 37140c9cea
commit 39cb174ee2
4 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
View File

@ -31,7 +31,6 @@ import lombok.Data;
public class EmisTransLine extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* 序号 */
private Long id;
/* 线路代码 */
@ -42,7 +41,7 @@ public class EmisTransLine extends BaseEntity
private String lineNameEn;
/* 计泡方式 */
private String meterRate;
/* 启用状态 */
/* 启用状态 0-未启用 1-启用 */
private Integer status;
/* 单证员 */
private String siteAuditMan;
@ -66,6 +65,8 @@ public class EmisTransLine extends BaseEntity
private String logoType;
/* 运输方式 */
private String transType;
/* 显示顺序 */
private Integer orderNum;
private String fromCountryName;
private String countryName;

5
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransProduct.java
View File

@ -32,6 +32,7 @@ public class EmisTransProduct extends BaseEntity
{
private static final long serialVersionUID = 1L;
/* 序号 */
private Long id;
/* 产品代码 */
@ -40,7 +41,7 @@ public class EmisTransProduct extends BaseEntity
private String prodName;
/* 英文名称 */
private String prodNameEn;
/* 启用状态 1-启用 0-禁用 */
/* 启用状态 0-启用 1-停用 */
private Integer status;
/* 所属国家 */
private String country;
@ -58,6 +59,8 @@ public class EmisTransProduct extends BaseEntity
private Integer minAging;
/* 最大时效 */
private Integer maxAging;
/* 显示顺序 */
private Integer orderNum;
private String countryName;

32
emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
View File

@ -22,6 +22,7 @@
<result property="applyScope" column="apply_scope" />
<result property="logoType" column="logo_type" />
<result property="transType" column="trans_type" />
<result property="orderNum" column="order_num" />
<result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" />
<result property="delFlag" column="del_flag" />
@ -29,26 +30,29 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="fromCountryName" column="from_country" select="selectCountryNameByCode"/>
<association property="countryName" column="country" select="selectCountryNameByCode"/>
</resultMap>
<sql id="selectEmisTransLineVo">
select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_line
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code}
</select>
<sql id="selectEmisTransLineVo">
select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_line
</sql>
<select id="selectEmisTransLineList" parameterType="EmisTransLine" resultMap="EmisTransLineResult">
<include refid="selectEmisTransLineVo"/>
<where>
del_flag = '0'
<if test="id != null "> and id = #{id}</if>
<if test="lineCode != null and lineCode != ''"> and line_code = #{lineCode}</if>
<if test="lineCode != null and lineCode != ''"> and line_code like concat('%', #{lineCode}, '%')</if>
<if test="lineName != null and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
<if test="lineNameEn != null and lineNameEn != ''"> and line_name_en like concat('%', #{lineNameEn}, '%')</if>
<if test="meterRate != null and meterRate != ''"> and meter_rate like concat('%', #{meterRate}, '%')</if>
@ -64,6 +68,7 @@
<if test="applyScope != null and applyScope != ''"> and apply_scope like concat('%', #{applyScope}, '%')</if>
<if test="logoType != null and logoType != ''"> and logo_type like concat('%', #{logoType}, '%')</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
<if test="orderNum != null "> and order_num = #{orderNum}</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>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@ -71,12 +76,14 @@
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
</where>
order by create_time desc
</select>
<select id="selectEmisTransLineById" parameterType="Long" resultMap="EmisTransLineResult">
select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_trans_line a
where a.id = #{id}
</select>
@ -101,6 +108,7 @@
<if test="applyScope != null and applyScope != ''">apply_scope,</if>
<if test="logoType != null and logoType != ''">logo_type,</if>
<if test="transType != null and transType != ''">trans_type,</if>
<if test="orderNum != null">order_num,</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>
@ -108,6 +116,8 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -127,6 +137,7 @@
<if test="applyScope != null and applyScope != ''">#{applyScope},</if>
<if test="logoType != null and logoType != ''">#{logoType},</if>
<if test="transType != null and transType != ''">#{transType},</if>
<if test="orderNum != null">#{orderNum},</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>
@ -134,6 +145,8 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</insert>
@ -156,6 +169,7 @@
<if test="applyScope != null and applyScope != ''">apply_scope = #{applyScope},</if>
<if test="logoType != null and logoType != ''">logo_type = #{logoType},</if>
<if test="transType != null and transType != ''">trans_type = #{transType},</if>
<if test="orderNum != null">order_num = #{orderNum},</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>
@ -163,16 +177,18 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEmisTransLineById" parameterType="Long">
delete from emis_trans_line where id = #{id}
update emis_trans_line set del_flag='1' where id = #{id}
</delete>
<delete id="deleteEmisTransLineByIds" parameterType="String">
delete from emis_trans_line where id in
update emis_trans_line set del_flag='1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>

35
emis-biz/src/main/resources/mapper/EmisTransProductMapper.xml
View File

@ -12,11 +12,13 @@
<result property="status" column="status" />
<result property="country" column="country" />
<result property="transLineCode" column="trans_line_code" />
<result property="transLine" column="trans_line" />
<result property="carryType" column="carry_type" />
<result property="transType" column="trans_type" />
<result property="agingDesc" column="aging_desc" />
<result property="minAging" column="min_aging" />
<result property="maxAging" column="max_aging" />
<result property="orderNum" column="order_num" />
<result property="remark" column="remark" />
<result property="tenantId" column="tenant_id" />
<result property="delFlag" column="del_flag" />
@ -24,15 +26,15 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="createSite" column="create_site" />
<result property="updateSite" column="update_site" />
<association property="transLine" column="trans_line_code" select="selectLineNameByCode"/>
<association property="countryName" column="country" select="selectCountryNameByCode"/>
</resultMap>
<sql id="selectEmisTransProductVo">
select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, min_aging, max_aging, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_product
</sql>
<select id="selectCountryNameByCode" parameterType="String" resultType="string">
select a.name from emis_country a where a.code = #{code} limit 1
@ -42,23 +44,27 @@
select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
</select>
<sql id="selectEmisTransProductVo">
select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, min_aging, max_aging, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_product
</sql>
<select id="selectEmisTransProductList" parameterType="EmisTransProduct" resultMap="EmisTransProductResult">
<include refid="selectEmisTransProductVo"/>
<where>
<if test="id != null "> and id = #{id}</if>
<if test="prodCode != null and prodCode != ''"> and prod_code like concat('%', #{prodCode}, '%')</if>
<if test="prodCode != null and prodCode != ''"> and prod_code=#{prodCode}</if>
<if test="prodName != null and prodName != ''"> and prod_name like concat('%', #{prodName}, '%')</if>
<if test="prodNameEn != null and prodNameEn != ''"> and prod_name_en like concat('%', #{prodNameEn}, '%')</if>
<if test="status != null "> and status = #{status}</if>
<if test="country != null and country != ''"> and country like concat('%', #{country}, '%')</if>
<if test="transLineCode != null and transLineCode != ''"> and trans_line_code=#{transLineCode}</if>
<if test="transLineCode != null and transLineCode != ''"> and trans_line_code like concat('%', #{transLineCode}, '%')</if>
<if test="transLine != null and transLine != ''"> and trans_line like concat('%', #{transLine}, '%')</if>
<if test="carryType != null and carryType != ''"> and carry_type like concat('%', #{carryType}, '%')</if>
<if test="transType != null and transType != ''"> and trans_type like concat('%', #{transType}, '%')</if>
<if test="agingDesc != null and agingDesc != ''"> and aging_desc like concat('%', #{agingDesc}, '%')</if>
<if test="minAging != null "> and min_aging = #{minAging}</if>
<if test="maxAging != null "> and max_aging = #{maxAging}</if>
<if test="orderNum != null "> and order_num = #{orderNum}</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>
<if test="delFlag != null and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@ -66,12 +72,14 @@
<if test="createTime != null "> and create_time = #{createTime}</if>
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
<if test="createSite != null and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
<if test="updateSite != null and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
</where>
order by create_time desc
order by order_num desc
</select>
<select id="selectEmisTransProductById" parameterType="Long" resultMap="EmisTransProductResult">
select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, min_aging, max_aging, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
select id, prod_code, prod_name, prod_name_en, status, country, trans_line_code, trans_line, carry_type, trans_type, aging_desc, min_aging, max_aging, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
from emis_trans_product a
where a.id = #{id}
</select>
@ -92,6 +100,7 @@
<if test="agingDesc != null and agingDesc != ''">aging_desc,</if>
<if test="minAging != null">min_aging,</if>
<if test="maxAging != null">max_aging,</if>
<if test="orderNum != null">order_num,</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>
@ -99,6 +108,8 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="createSite != null and createSite != ''">create_site,</if>
<if test="updateSite != null and updateSite != ''">update_site,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@ -114,6 +125,7 @@
<if test="agingDesc != null and agingDesc != ''">#{agingDesc},</if>
<if test="minAging != null">#{minAging},</if>
<if test="maxAging != null">#{maxAging},</if>
<if test="orderNum != null">#{orderNum},</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>
@ -121,6 +133,8 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="createSite != null and createSite != ''">#{createSite},</if>
<if test="updateSite != null and updateSite != ''">#{updateSite},</if>
</trim>
</insert>
@ -139,6 +153,7 @@
<if test="agingDesc != null and agingDesc != ''">aging_desc = #{agingDesc},</if>
<if test="minAging != null">min_aging = #{minAging},</if>
<if test="maxAging != null">max_aging = #{maxAging},</if>
<if test="orderNum != null">order_num = #{orderNum},</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>
@ -146,16 +161,18 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="createSite != null and createSite != ''">create_site = #{createSite},</if>
<if test="updateSite != null and updateSite != ''">update_site = #{updateSite},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEmisTransProductById" parameterType="Long">
delete from emis_trans_product where id = #{id}
update emis_trans_product set del_flag='1' where id = #{id}
</delete>
<delete id="deleteEmisTransProductByIds" parameterType="String">
delete from emis_trans_product where id in
update emis_trans_product set del_flag='1' where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>