From 259f95deb2ea38287d488d12060d7600c36cd92a Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 21 五月 2024 17:00:47 +0800
Subject: [PATCH] Merge branch 'master' of http://117.78.1.188:8089/r/dkyChenJiang
---
javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/ProjectPersonMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 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 b878eed..11b176d 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
@@ -14,6 +14,11 @@
<result property="idCard" column="id_card" />
<result property="personGroup" column="person_group" />
<result property="responsibility" column="responsibility" />
+ <result property="inSiteTime" column="in_site_time" />
+ <result property="outSiteTime" column="out_site_time" />
+ <result property="documentType" column="document_type" />
+ <result property="documentCode" column="document_code" />
+ <result property="documentPath" column="document_path" />
<result property="status" column="status" />
<result property="isDeleted" column="is_deleted" />
<result property="createBy" column="create_by" />
@@ -24,17 +29,25 @@
</resultMap>
<sql id="selectProjectPersonVo">
- 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
+ select ids, project_id, hole_id, name, type, phone, id_card , person_group , responsibility, in_site_time, out_site_time, document_type, document_code, document_path, status, is_deleted, create_by, create_time, update_by, update_time, remark from js_project_person
</sql>
<select id="selectProjectPersonList" parameterType="ProjectPerson" resultMap="ProjectPersonResult">
<include refid="selectProjectPersonVo"/>
<where>
<if test="projectId != null and projectId != ''"> and project_id = #{projectId}</if>
+ <if test="holeId != null and holeId != ''"> and hole_id = #{holeId}</if>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="phone != null and phone != ''"> and phone = #{phone}</if>
- <if test="remark != null and remark != ''"> and remark = #{remark}</if>
+ <if test="idCard != null and idCard != ''"> and id_card = #{idCard}</if>
+ <if test="personGroup != null and personGroup != ''"> and person_group = #{personGroup}</if>
+ <if test="responsibility != null and responsibility != ''"> and responsibility = #{responsibility}</if>
+ <if test="inSiteTime != null "> and in_site_time = #{inSiteTime}</if>
+ <if test="outSiteTime != null "> and out_site_time = #{outSiteTime}</if>
+ <if test="documentType != null and documentType != ''"> and document_type = #{documentType}</if>
+ <if test="documentCode != null and documentCode != ''"> and document_code = #{documentCode}</if>
+ <if test="documentPath != null and documentPath != ''"> and document_path = #{documentPath}</if>
</where>
</select>
@@ -55,6 +68,11 @@
<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="inSiteTime != null ">in_site_time,</if>
+ <if test="outSiteTime != null ">out_site_time,</if>
+ <if test="documentType != null and documentType != ''">document_type,</if>
+ <if test="documentCode != null and documentCode != ''">document_code,</if>
+ <if test="documentPath != null and documentPath != ''">document_path,</if>
<if test="status != null and status != ''">status,</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
@@ -73,6 +91,11 @@
<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="inSiteTime != null ">#{inSiteTime},</if>
+ <if test="outSiteTime != null ">#{outSiteTime},</if>
+ <if test="documentType != null and documentType != ''">#{documentType},</if>
+ <if test="documentCode != null and documentCode != ''">#{documentCode},</if>
+ <if test="documentPath != null and documentPath != ''">#{documentPath},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="isDeleted != null and isDeleted != ''">#{isDeleted},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
@@ -94,6 +117,11 @@
<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="inSiteTime != null ">in_site_time = #{inSiteTime},</if>
+ <if test="outSiteTime != null ">out_site_time = #{outSiteTime},</if>
+ <if test="documentType != null and documentType != ''">document_type = #{documentType},</if>
+ <if test="documentCode != null and documentCode != ''">document_code = #{documentCode},</if>
+ <if test="documentPath != null and documentPath != ''">document_path = #{documentPath},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="isDeleted != null and isDeleted != ''">is_deleted = #{isDeleted},</if>
<if test="createBy != null and createBy != ''">create_by = #{createBy},</if>
--
Gitblit v1.9.1