XA/xa-master-prod
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

兴安代码提交

Browse Source
This commit is contained in:
zc
2025-07-02 00:44:19 +08:00
parent 3f9d1b1fa7
commit f439594100
9 changed files with 238 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/SysPeopleMapper.xml
View File

@@ -291,7 +291,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where p.phone = #{phone} and p.name = #{userName} limit 1
</select>
<select id="queryPeopleName" resultType="com.dcsoft.system.domain.SysPeople">
select phone, name, id, branch_id branchId, position, id
select phone, name, id, branch_id branchId, position, id, carry_stuff_examine carryStuffExamine
from sys_people
where del_flag = '0'
and phone = #{phone}

62
dcsoft-modules/dcsoft-system/src/main/resources/mapper/system/visitor/VisCarryStuffMapper.xml
View File

@@ -23,6 +23,7 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<result property="vehicle" column="vehicle"/>
<result property="currentNode" column="current_node"/>
</resultMap>
<sql id="selectVisCarryStuffVo">
@@ -44,10 +45,33 @@
create_time,
update_by,
update_time,
vehicle
vehicle,
current_node
from vis_carry_stuff_out
</sql>
<update id="updateStaff">
update vis_carry_stuff_out
<trim prefix="SET" suffixOverrides=",">
<if test="userId != null">user_id = #{userId},</if>
<if test="name != null and name != ''"> `name` = #{name},</if>
<if test="visitingUnit != null and visitingUnit != ''">visiting_unit = #{visitingUnit},</if>
<if test="stuffName != null and stuffName != ''">stuff_name = #{stuffName},</if>
<if test="stuffType != null and stuffType != ''">stuff_type = #{stuffType},</if>
<if test="stuffNumber != null and stuffNumber != ''">stuff_number = #{stuffNumber},</if>
<if test="imgUrls != null and imgUrls != ''">img_urls = #{imgUrls},</if>
<if test="visTime != null">vis_time = #{visTime},</if>
<if test="reviewer1 != null">reviewer1 = #{reviewer1},</if>
<if test="reviewer2 != null">reviewer2 = #{reviewer2},</if>
<if test="reviewer3 != null">reviewer3 = #{reviewer3},</if>
<if test="examineState != null and examineState != ''">examine_state = #{examineState},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="vehicle != null">vehicle = #{vehicle},</if>
<if test="currentNode != null">current_node = #{currentNode},</if>
</trim>
where id = #{id}
</update>
<select id="selectList" resultType="com.dcsoft.system.visitor.domain.VisCarryStuffVo">
<include refid="selectVisCarryStuffVo"/>
<where>
@@ -73,6 +97,29 @@
limit 1
</select>
<select id="queryVisitorReviewProcessList" resultType="com.dcsoft.system.visitor.domain.VisitorReviewProcessVo">
select reviewer,
state,
sp.position type,
date_format(created_time, '%Y-%m-%d %H:%i:%s') createdTime,
sp.name reviewerName
from vis_visitor_review_process vvrp
left join sys_people sp on vvrp.reviewer = sp.id and sp.del_flag = '0'
where stuff_id = #{id}
order by ifnull(createdTime, 'zzz')
</select>
<select id="queryReviewProcessNew" resultType="com.dcsoft.system.visitor.domain.VisitorReviewProcessVo">
select
reviewer,
state,
reject_reason
from vis_visitor_review_process
where stuff_id = #{id}
order by created_time desc
limit 1
</select>
<insert id="insertVisCarryStuff" useGeneratedKeys="true" keyProperty="id">
insert into vis_carry_stuff_out
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -91,6 +138,7 @@
<if test="examineState != null and examineState != ''">examine_state,</if>
<if test="createBy != null">create_by,</if>
<if test="vehicle != null">vehicle,</if>
<if test="currentNode != null">current_node,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">#{id},</if>
@@ -108,7 +156,19 @@
<if test="examineState != null and examineState != ''">#{examineState},</if>
<if test="createBy != null">#{createBy},</if>
<if test="vehicle != null">#{vehicle},</if>
<if test="currentNode != null">#{currentNode},</if>
</trim>
</insert>
<insert id="saveVisitorReviewProcess">
insert into vis_visitor_review_process (id, stuff_id, reviewer
<if test="state != null and state != ''">
,state
</if>
)
VALUES (REPLACE(uuid(), '-', ''), #{id}, #{reviewer}
<if test="state != null and state != ''">
,#{state}
</if>)
</insert>
</mapper>