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 | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 b53a4b7..a39bc03 100644
--- a/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
+++ b/src/main/java/org/springblade/modules/zc/mapper/ZcMapper.xml
@@ -13,7 +13,12 @@
<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>
@@ -32,13 +37,19 @@
<if test="zc.type != null and zc.type != '' ">
and type like CONCAT('%',#{zc.type},'%')
</if>
- and type != 1
+ <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