From fe02b114eb68ff8b9de5180c79e487501e10e515 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 11 Jan 2024 15:59:47 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisProblemType.java      | 12 +++++----
 .../mapper/EmisProblemTypeMapper.xml          | 27 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
index 1b14d57b6..8e3e4a931 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisProblemType.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * @Project: emis
  * @Title: EmisProblemType.java
  * @author linfso
- * @date 2024-01-11 05:46:42
+ * @date 2024-01-11 07:58:44
  * @Copyright: ShangHai Duta 2022 All rights reserved.
- * @version v1.0  
+ * @version v1.0
  * @Description: <p> 问题件类型 实体类 </p>
  */
 
@@ -25,15 +25,17 @@ import lombok.Data;
  * @ClassName EmisProblemType
  * @Description 问题件类型
  * @author linfso
- * @date 2024-01-11 05:46:42
+ * @date 2024-01-11 07:58:44
  */
- @Data
+@Data
 public class EmisProblemType extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /* 序号 */
     private Long id;
+    /* 类型编号 */
+    private String typeCode;
     /* 类型名称 */
     private String typeName;
     /* 英文名称 */
diff --git a/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml b/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml
index 6226f15cf..e5649b8bf 100644
--- a/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisProblemTypeMapper.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisProblemTypeMapper">
-    
+
     <resultMap type="EmisProblemType" id="EmisProblemTypeResult">
         <result property="id"    column="id"    />
+        <result property="typeCode"    column="type_code"    />
         <result property="typeName"    column="type_name"    />
         <result property="typeNameEn"    column="type_name_en"    />
         <result property="isSendSms"    column="is_send_sms"    />
@@ -22,13 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectEmisProblemTypeVo">
-        select id, type_name, type_name_en, is_send_sms, object_type, delay_day, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_problem_type
+        select id, type_code, type_name, type_name_en, is_send_sms, object_type, delay_day, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_problem_type
     </sql>
 
     <select id="selectEmisProblemTypeList" parameterType="EmisProblemType" resultMap="EmisProblemTypeResult">
         <include refid="selectEmisProblemTypeVo"/>
-        <where>  
+        <where>
             <if test="id != null "> and id = #{id}</if>
+            <if test="typeCode != null  and typeCode != ''"> and type_code like concat('%', #{typeCode}, '%')</if>
             <if test="typeName != null  and typeName != ''"> and type_name like concat('%', #{typeName}, '%')</if>
             <if test="typeNameEn != null  and typeNameEn != ''"> and type_name_en like concat('%', #{typeNameEn}, '%')</if>
             <if test="isSendSms != null "> and is_send_sms = #{isSendSms}</if>
@@ -45,17 +47,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by create_time desc
     </select>
-  
+
     <select id="selectEmisProblemTypeById" parameterType="Long" resultMap="EmisProblemTypeResult">
-        select id, type_name, type_name_en, is_send_sms, object_type, delay_day, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time 
+        select id, type_code, type_name, type_name_en, is_send_sms, object_type, delay_day, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
         from emis_problem_type a
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertEmisProblemType" parameterType="EmisProblemType">
         insert into emis_problem_type
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
+            <if test="typeCode != null and typeCode != ''">type_code,</if>
             <if test="typeName != null and typeName != ''">type_name,</if>
             <if test="typeNameEn != null and typeNameEn != ''">type_name_en,</if>
             <if test="isSendSms != null">is_send_sms,</if>
@@ -69,9 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null and updateBy != ''">update_by,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
+            <if test="typeCode != null and typeCode != ''">#{typeCode},</if>
             <if test="typeName != null and typeName != ''">#{typeName},</if>
             <if test="typeNameEn != null and typeNameEn != ''">#{typeNameEn},</if>
             <if test="isSendSms != null">#{isSendSms},</if>
@@ -85,12 +89,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateEmisProblemType" parameterType="EmisProblemType">
         update emis_problem_type
         <trim prefix="SET" suffixOverrides=",">
+            <if test="typeCode != null and typeCode != ''">type_code = #{typeCode},</if>
             <if test="typeName != null and typeName != ''">type_name = #{typeName},</if>
             <if test="typeNameEn != null and typeNameEn != ''">type_name_en = #{typeNameEn},</if>
             <if test="isSendSms != null">is_send_sms = #{isSendSms},</if>
@@ -113,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteEmisProblemTypeByIds" parameterType="String">
-        delete from emis_problem_type where id in 
+        delete from emis_problem_type where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>