From b39cc2beacc1ec2e37cff349cae42e420105c8a6 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 05 Nov 2021 14:29:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
index ee58312..a39bc03 100644
--- a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
+++ b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.zc.mapper.ZcMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="zcResultMap" type="org.springblade.modules.zc.entity.Zc">
+ <resultMap id="zcResultMap" type="org.springblade.modules.zc.vo.ZcVO">
<id column="id" property="id"/>
<result column="username" property="username"/>
<result column="password" property="password"/>
@@ -13,18 +13,43 @@
<result column="zctime" property="zctime"/>
<result column="type" property="type"/>
<result column="deptid" property="deptid"/>
- <result column="parentId" property="parentId"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="jurisdiction" property="jurisdiction"/>
+ <result column="cardid" property="cardid"/>
+ <result column="examination_type" property="examination_type"/>
+ <result column="examination_mx" property="examination_mx"/>
+ <result column="audit_time" property="auditTime"/>
</resultMap>
<select id="selectZcPage" resultMap="zcResultMap">
- select * from act_zc where is_deleted = 0
+ select * from act_zc where
+ 1 = 1
+ <if test="zc.username != null and zc.username != '' ">
+ and username like CONCAT('%',#{zc.username},'%')
+ </if>
+ <if test="zc.sname != null and zc.sname != '' ">
+ and sname like CONCAT('%',#{zc.sname},'%')
+ </if>
+ <if test="zc.sex != null and zc.sex != '' ">
+ and sex like CONCAT('%',#{zc.sex},'%')
+ </if>
+ <if test="zc.type != null and zc.type != '' ">
+ and type like CONCAT('%',#{zc.type},'%')
+ </if>
+ <if test="zc.cardid != null and zc.cardid != '' ">
+ and cardid like CONCAT('%',#{zc.cardid},'%')
+ </if>
+ <if test="zc.examination_type != null and zc.examination_type != '' ">
+ and examination_type = #{zc.examination_type}
+ </if>
+ and type != 1 ORDER BY zctime DESC
</select>
<!--注册新增-->
- <insert id="inster">
- insert into act_zc(username,password,sname,sex,phone,zctime,deptid) values(#{username},#{password},#{sname},#{sex},#{phone},#{zctime},#{deptid})
+ <insert id="inster" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
+ insert into act_zc(username,password,sname,sex,phone,zctime,deptid,parent_id,jurisdiction,cardid) values(#{username},#{password},#{sname},#{sex},#{phone},#{zctime},#{deptid},#{parentId},#{jurisdiction},#{cardid})
</insert>
<select id="selectType" resultType="String">
--
Gitblit v1.9.3