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-03-20 19:58:35 +08:00
parent 99e5377ada
commit c0790cf713
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisContinent.java
View File

@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisContinent.java
* @author linfso
* @date 2023-12-12 06:35:06
* @date 2024-03-20 11:58:13
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 全球大区 实体类 </p>
@ -17,6 +17,7 @@ import com.xdadan.erp.common.annotation.Excel;
import com.xdadan.erp.common.core.domain.BaseEntity;
import com.xdadan.erp.common.core.domain.TreeEntity;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@ -25,7 +26,7 @@ import lombok.Data;
* @ClassName EmisContinent
* @Description 全球大区
* @author linfso
* @date 2023-12-12 06:35:06
* @date 2024-03-20 11:58:13
*/
@Data
public class EmisContinent extends BaseEntity
@ -38,6 +39,8 @@ public class EmisContinent extends BaseEntity
private String name;
/* 英文名称 */
private String nameEn;
/* 显示顺序 */
private Integer orderNum;
/* 父ID */
private Integer parentId;
/* 洲代码(段码使用) */

8
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCountry.java
View File

@ -2,7 +2,7 @@
* @Project: emis
* @Title: EmisCountry.java
* @author linfso
* @date 2024-03-20 08:33:37
* @date 2024-03-20 11:55:22
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @Description: <p> 国家 实体类 </p>
@ -26,7 +26,7 @@ import lombok.Data;
* @ClassName EmisCountry
* @Description 国家
* @author linfso
* @date 2024-03-20 08:33:37
* @date 2024-03-20 11:55:22
*/
@Data
public class EmisCountry extends BaseEntity
@ -39,10 +39,12 @@ public class EmisCountry extends BaseEntity
private String name;
/* 英文名称 */
private String nameEn;
/* 国家代码 */
/* 国家编码 */
private String code;
/* 电话区号代码 */
private String telAreaCode;
/* iso代码 */
private String isoCode;
/* 所属洲id */
private Integer continentId;
/* 显示顺序 */

11
emis-biz/src/main/resources/mapper/EmisContinentMapper.xml
View File

@ -8,6 +8,7 @@
<result property="id" column="id" />
<result property="name" column="name" />
<result property="nameEn" column="name_en" />
<result property="orderNum" column="order_num" />
<result property="parentId" column="parent_id" />
<result property="code" column="code" />
<result property="twoCode" column="two_code" />
@ -22,7 +23,7 @@
</resultMap>
<sql id="selectEmisContinentVo">
select id, name, name_en, parent_id, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_continent
select id, name, name_en, order_num, parent_id, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_continent
</sql>
<select id="selectEmisContinentList" parameterType="EmisContinent" resultMap="EmisContinentResult">
@ -31,6 +32,7 @@
<if test="id != null "> and id = #{id}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="nameEn != null and nameEn != ''"> and name_en like concat('%', #{nameEn}, '%')</if>
<if test="orderNum != null "> and order_num = #{orderNum}</if>
<if test="parentId != null "> and parent_id = #{parentId}</if>
<if test="code != null and code != ''"> and code like concat('%', #{code}, '%')</if>
<if test="twoCode != null and twoCode != ''"> and two_code like concat('%', #{twoCode}, '%')</if>
@ -43,11 +45,11 @@
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
</where>
order by create_time desc
order by orderNum desc
</select>
<select id="selectEmisContinentById" parameterType="Integer" resultMap="EmisContinentResult">
select id, name, name_en, parent_id, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
select id, name, name_en, order_num, parent_id, code, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
from emis_continent a
where a.id = #{id}
</select>
@ -58,6 +60,7 @@
<if test="id != null">id,</if>
<if test="name != null and name != ''">name,</if>
<if test="nameEn != null and nameEn != ''">name_en,</if>
<if test="orderNum != null">order_num,</if>
<if test="parentId != null">parent_id,</if>
<if test="code != null and code != ''">code,</if>
<if test="twoCode != null and twoCode != ''">two_code,</if>
@ -74,6 +77,7 @@
<if test="id != null">#{id},</if>
<if test="name != null and name != ''">#{name},</if>
<if test="nameEn != null and nameEn != ''">#{nameEn},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="parentId != null">#{parentId},</if>
<if test="code != null and code != ''">#{code},</if>
<if test="twoCode != null and twoCode != ''">#{twoCode},</if>
@ -93,6 +97,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="name != null and name != ''">name = #{name},</if>
<if test="nameEn != null and nameEn != ''">name_en = #{nameEn},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="parentId != null">parent_id = #{parentId},</if>
<if test="code != null and code != ''">code = #{code},</if>
<if test="twoCode != null and twoCode != ''">two_code = #{twoCode},</if>

11
emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
View File

@ -10,6 +10,7 @@
<result property="nameEn" column="name_en" />
<result property="code" column="code" />
<result property="telAreaCode" column="tel_area_code" />
<result property="isoCode" column="iso_code" />
<result property="continentId" column="continent_id" />
<result property="orderNum" column="order_num" />
<result property="twoCode" column="two_code" />
@ -24,7 +25,7 @@
</resultMap>
<sql id="selectEmisCountryVo">
select id, name, name_en, code, tel_area_code, continent_id, order_num, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_country
select id, name, name_en, code, tel_area_code, iso_code, continent_id, order_num, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_country
</sql>
<select id="selectEmisCountryList" parameterType="EmisCountry" resultMap="EmisCountryResult">
@ -35,6 +36,7 @@
<if test="nameEn != null and nameEn != ''"> and name_en like concat('%', #{nameEn}, '%')</if>
<if test="code != null and code != ''"> and code like concat('%', #{code}, '%')</if>
<if test="telAreaCode != null and telAreaCode != ''"> and tel_area_code like concat('%', #{telAreaCode}, '%')</if>
<if test="isoCode != null and isoCode != ''"> and iso_code like concat('%', #{isoCode}, '%')</if>
<if test="continentId != null "> and continent_id = #{continentId}</if>
<if test="orderNum != null "> and order_num = #{orderNum}</if>
<if test="twoCode != null and twoCode != ''"> and two_code like concat('%', #{twoCode}, '%')</if>
@ -47,11 +49,11 @@
<if test="updateBy != null and updateBy != ''"> and update_by like concat('%', #{updateBy}, '%')</if>
<if test="updateTime != null "> and update_time = #{updateTime}</if>
</where>
order by create_time desc
order by orderNum desc
</select>
<select id="selectEmisCountryById" parameterType="Integer" resultMap="EmisCountryResult">
select id, name, name_en, code, tel_area_code, continent_id, order_num, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
select id, name, name_en, code, tel_area_code, iso_code, continent_id, order_num, two_code, three_code, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
from emis_country a
where a.id = #{id}
</select>
@ -64,6 +66,7 @@
<if test="nameEn != null and nameEn != ''">name_en,</if>
<if test="code != null and code != ''">code,</if>
<if test="telAreaCode != null and telAreaCode != ''">tel_area_code,</if>
<if test="isoCode != null and isoCode != ''">iso_code,</if>
<if test="continentId != null">continent_id,</if>
<if test="orderNum != null">order_num,</if>
<if test="twoCode != null and twoCode != ''">two_code,</if>
@ -82,6 +85,7 @@
<if test="nameEn != null and nameEn != ''">#{nameEn},</if>
<if test="code != null and code != ''">#{code},</if>
<if test="telAreaCode != null and telAreaCode != ''">#{telAreaCode},</if>
<if test="isoCode != null and isoCode != ''">#{isoCode},</if>
<if test="continentId != null">#{continentId},</if>
<if test="orderNum != null">#{orderNum},</if>
<if test="twoCode != null and twoCode != ''">#{twoCode},</if>
@ -103,6 +107,7 @@
<if test="nameEn != null and nameEn != ''">name_en = #{nameEn},</if>
<if test="code != null and code != ''">code = #{code},</if>
<if test="telAreaCode != null and telAreaCode != ''">tel_area_code = #{telAreaCode},</if>
<if test="isoCode != null and isoCode != ''">iso_code = #{isoCode},</if>
<if test="continentId != null">continent_id = #{continentId},</if>
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="twoCode != null and twoCode != ''">two_code = #{twoCode},</if>