From 16da5eda8324f43b42fdd6749ed77eca84bc0ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 30 Jun 2022 15:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E3=80=81=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xm/core/entity/XmEnvList.java  |  5 ++++-
 .../mybatis/mapper/xm/core/dao/XmEnvListMapper.xml   | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java
index 1aaab31d..e9a19148 100644
--- a/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java
+++ b/xm-core/src/main/java/com/xm/core/entity/XmEnvList.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;
 /**
  * 组织 com  顶级模块 xm 大模块 core  小模块 <br> 
  * 实体 XmEnvList所有属性名: <br>
- *	"id","主键","remark","备注说明","ipAddress","内网ip地址","port","内网访问端口","branchId","归属机构","accessUserid","访问用户编号","accessPassword","访问密码","accessUrl","访问链接","supplier","供应商","webIpAddress","外网ip地址","webPort","外网端口","createUserid","添加人员","createUsername","添加人员姓名","createTime","添加时间","envState","状态0不可用1已启用2已过期","startTime","有效日期开始","endTime","有效日期结束","feeAmount","费用","feeRule","计费规则","projectId","归属项目编号","readQx","0-全部可看，1-同机构可看，2-同机构同项目可看，3-同项目上级可看，9-仅自己可看","writeQx","0-全部可写，1-同机构可写，2-同机构同项目可写，3-同项目上级可写，9-仅自己可修改","ltime","修改时间","luserid","修改人编号","lusername","修改人姓名";<br>
+ *	"id","主键","remark","备注说明","ipAddress","内网ip地址","port","内网访问端口","branchId","归属机构","accessUserid","访问用户编号","accessPassword","访问密码","accessUrl","访问链接","supplier","供应商","webIpAddress","外网ip地址","webPort","外网端口","createUserid","添加人员","createUsername","添加人员姓名","createTime","添加时间","envState","状态0不可用1已启用2已过期","startTime","有效日期开始","endTime","有效日期结束","feeAmount","费用","feeRule","计费规则","projectId","归属项目编号","readQx","0-全部可看，1-同机构可看，2-同机构同项目可看，3-同项目上级可看，9-仅自己可看","writeQx","0-全部可写，1-同机构可写，2-同机构同项目可写，3-同项目上级可写，9-仅自己可修改","ltime","修改时间","luserid","修改人编号","lusername","修改人姓名","name","名称";<br>
  * 当前主键(包括多主键):<br>
  *	id;<br>
  */
@@ -94,6 +94,9 @@ public class XmEnvList  implements java.io.Serializable {
 	
 	@ApiModelProperty(notes="修改人姓名",allowEmptyValue=true,example="",allowableValues="")
 	String lusername;
+	
+	@ApiModelProperty(notes="名称",allowEmptyValue=true,example="",allowableValues="")
+	String name;
 
 	/**
 	 *主键
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml
index a8fea31f..084df014 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmEnvListMapper.xml
@@ -70,7 +70,7 @@
 		insert into xm_env_list(
 			<include refid="columns"/>
 		) values (
-		#{id},#{remark},#{ipAddress},#{port},#{branchId},#{accessUserid},#{accessPassword},#{accessUrl},#{supplier},#{webIpAddress},#{webPort},#{createUserid},#{createUsername},#{createTime},#{envState},#{startTime},#{endTime},#{feeAmount},#{feeRule},#{projectId},#{readQx},#{writeQx},#{ltime},#{luserid},#{lusername}
+		#{id},#{remark},#{ipAddress},#{port},#{branchId},#{accessUserid},#{accessPassword},#{accessUrl},#{supplier},#{webIpAddress},#{webPort},#{createUserid},#{createUsername},#{createTime},#{envState},#{startTime},#{endTime},#{feeAmount},#{feeRule},#{projectId},#{readQx},#{writeQx},#{ltime},#{luserid},#{lusername},#{name}
 		)
 	</insert>
 	
@@ -145,7 +145,7 @@
 	
 	<!--sql片段 列-->
 	<sql id="columns">
-		id,remark,ip_address,port,branch_id,access_userid,access_password,access_url,supplier,web_ip_address,web_port,create_userid,create_username,create_time,env_state,start_time,end_time,fee_amount,fee_rule,project_id,read_qx,write_qx,ltime,luserid,lusername
+		id,remark,ip_address,port,branch_id,access_userid,access_password,access_url,supplier,web_ip_address,web_port,create_userid,create_username,create_time,env_state,start_time,end_time,fee_amount,fee_rule,project_id,read_qx,write_qx,ltime,luserid,lusername,name
 	</sql>
 
 	<!--sql片段 动态条件 YYYY-MM-DD HH24:MI:SS-->
@@ -175,6 +175,7 @@
 		<if test="ltime != null">      and date_format(res.ltime,'%Y-%m-%d') = date_format(#{ltime},'%Y-%m-%d')     </if>
 		<if test="luserid != null and luserid != ''">      and res.luserid = #{luserid}     </if>
 		<if test="lusername != null and lusername != ''">      and res.lusername = #{lusername}     </if>
+		<if test="name != null and name != ''">      and res.name = #{name}     </if>
 	</sql>
 	<!--sql片段 更新字段 -->
 	<sql id="set">
@@ -201,7 +202,8 @@
 		write_qx = #{writeQx},
 		ltime = #{ltime},
 		luserid = #{luserid},
-		lusername = #{lusername}
+		lusername = #{lusername},
+		name = #{name}
 	</sql>
 	<sql id="someFieldSet">
 		<if test="remark != null and remark != ''"> remark = #{remark},     </if>
@@ -228,6 +230,7 @@
 		<if test="ltime != null"> ltime = #{ltime},     </if>
 		<if test="luserid != null and luserid != ''"> luserid = #{luserid},     </if>
 		<if test="lusername != null and lusername != ''"> lusername = #{lusername},     </if>
+		<if test="name != null and name != ''"> name = #{name},     </if>
 	</sql>
 	<!--sql片段 批量更新 -->
 	<sql id="batchSet">
@@ -254,6 +257,7 @@
 			write_qx = #{item.writeQx},
 			ltime = #{item.ltime},
 			luserid = #{item.luserid},
-			lusername = #{item.lusername}
+			lusername = #{item.lusername},
+			name = #{item.name}
 	</sql>
 </mapper>
\ No newline at end of file