From 8722d2bb39c6c0697647e77a879d14b28d3ef0f5 Mon Sep 17 00:00:00 2001
From: zmk <496160012@qq.com>
Date: 星期五, 17 五月 2024 19:16:36 +0800
Subject: [PATCH] Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml
index 800a99a..b878eed 100644
--- a/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml
+++ b/javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml
@@ -11,7 +11,8 @@
<result property="name" column="name" />
<result property="type" column="type" />
<result property="phone" column="phone" />
- <result property="address" column="address" />
+ <result property="idCard" column="id_card" />
+ <result property="personGroup" column="person_group" />
<result property="responsibility" column="responsibility" />
<result property="status" column="status" />
<result property="isDeleted" column="is_deleted" />
@@ -23,7 +24,7 @@
</resultMap>
<sql id="selectProjectPersonVo">
- select ids, project_id, hole_id, name, type, phone, address, responsibility, status, is_deleted, create_by, create_time, update_by, update_time, remark from js_project_person
+ select ids, project_id, hole_id, name, type, phone, id_card , person_group , responsibility, status, is_deleted, create_by, create_time, update_by, update_time, remark from js_project_person
</sql>
<select id="selectProjectPersonList" parameterType="ProjectPerson" resultMap="ProjectPersonResult">
@@ -51,7 +52,8 @@
<if test="name != null and name != ''">name,</if>
<if test="type != null and type != ''">type,</if>
<if test="phone != null and phone != ''">phone,</if>
- <if test="address != null and address != ''">address,</if>
+ <if test="idCard != null and idCard != ''">id_card,</if>
+ <if test="personGroup != null and personGroup != ''">person_group,</if>
<if test="responsibility != null and responsibility != ''">responsibility,</if>
<if test="status != null and status != ''">status,</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted,</if>
@@ -68,7 +70,8 @@
<if test="name != null and name != ''">#{name},</if>
<if test="type != null and type != ''">#{type},</if>
<if test="phone != null and phone != ''">#{phone},</if>
- <if test="address != null and address != ''">#{address},</if>
+ <if test="idCard != null and idCard != ''">#{idCard},</if>
+ <if test="personGroup != null and personGroup != ''">#{personGroup},</if>
<if test="responsibility != null and responsibility != ''">#{responsibility},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
@@ -88,7 +91,8 @@
<if test="name != null and name != ''">name = #{name},</if>
<if test="type != null and type != ''">type = #{type},</if>
<if test="phone != null and phone != ''">phone = #{phone},</if>
- <if test="address != null and address != ''">address = #{address},</if>
+ <if test="idCard != null and idCard != ''">id_card = #{idCard},</if>
+ <if test="personGroup != null and personGroup != ''">person_group = #{personGroup},</if>
<if test="responsibility != null and responsibility != ''">responsibility = #{responsibility},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted = #{isDeleted},</if>
--
Gitblit v1.9.1