Skip to content

Y
yifu-mvp
Commit 2e157dd8 authored by hongguangwu's avatar hongguangwu
Browse files
Options

单个编辑，手机号校验

parent 64b208a7
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 31 deletions
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeInfoMapper.xml
View file @ 2e157dd8
...@@ -396,15 +396,6 @@ ...@@ -396,15 +396,6 @@
<if test="tEmployeeInfo.contactAddress != null and tEmployeeInfo.contactAddress.trim() != ''"> <if test="tEmployeeInfo.contactAddress != null and tEmployeeInfo.contactAddress.trim() != ''">
AND a.CONTACT_ADDRESS = #{tEmployeeInfo.contactAddress} AND a.CONTACT_ADDRESS = #{tEmployeeInfo.contactAddress}
</if> </if>
<if test="tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''">
AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
</if>
<if test="tEmployeeInfo.deptName != null and tEmployeeInfo.deptName.trim() != ''">
AND b.DEPT_NAME like concat('%',#{tEmployeeInfo.deptName},'%')
</if>
<if test="tEmployeeInfo.deptNo != null and tEmployeeInfo.deptNo.trim() != ''">
AND b.DEPT_NO = #{tEmployeeInfo.deptNo}
</if>
</if> </if>
</if> </if>
</sql> </sql>
...@@ -423,21 +414,33 @@ ...@@ -423,21 +414,33 @@
<!-- hgw 分页查询 --> <!-- hgw 分页查询 -->
<select id="getLeavePage" resultMap="tEmployeeExportMap"> <select id="getLeavePage" resultMap="tEmployeeExportMap">
SELECT SELECT * from (
a.ID, SELECT
<include refid="Base_Export_List"/> a.ID,
,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME <include refid="Base_Export_List"/>
,GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO ,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME
,a.LEAVE_TIME ,GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO
,a.LEAVE_USER_NAME ,a.LEAVE_TIME
,a.LEAVE_USER ,a.LEAVE_USER_NAME
,a.LEAVE_REASON ,a.LEAVE_USER
from t_employee_info a ,a.LEAVE_REASON
left join t_employee_project b on a.id = b.EMP_ID from t_employee_info a
where a.DELETE_FLAG = '0' left join t_employee_project b on a.id = b.EMP_ID
<include refid="employeeInfo_where"/> where a.DELETE_FLAG = '0'
${sql} <include refid="employeeInfo_where"/>
group by a.id order by a.CREATE_TIME desc ${sql}
group by a.id order by a.CREATE_TIME desc
) b
where 1=1
<if test="tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''">
AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
</if>
<if test="tEmployeeInfo.deptName != null and tEmployeeInfo.deptName.trim() != ''">
AND b.DEPT_NAME like concat('%',#{tEmployeeInfo.deptName},'%')
</if>
<if test="tEmployeeInfo.deptNo != null and tEmployeeInfo.deptNo.trim() != ''">
AND b.DEPT_NO = #{tEmployeeInfo.deptNo}
</if>
</select> </select>
<!-- hgw list查询 --> <!-- hgw list查询 -->
...@@ -543,14 +546,15 @@ ...@@ -543,14 +546,15 @@
<!--tEmployeeInfo离职档案导出查询--> <!--tEmployeeInfo离职档案导出查询-->
<select id="getTEmployeeLeaveExportList" resultMap="tEmployeeExportMap"> <select id="getTEmployeeLeaveExportList" resultMap="tEmployeeExportMap">
select * from (
SELECT SELECT
<include refid="Base_Export_List"/> <include refid="Base_Export_List"/>,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME
,GROUP_CONCAT(DISTINCT b.unit_name) UNIT_NAME ,
,GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO GROUP_CONCAT(DISTINCT b.unit_no) UNIT_NO
,a.LEAVE_TIME ,a.LEAVE_TIME
,a.LEAVE_USER ,a.LEAVE_USER
,a.LEAVE_USER_NAME ,a.LEAVE_USER_NAME
,a.LEAVE_REASON ,a.LEAVE_REASON
from t_employee_info a from t_employee_info a
left join t_employee_project b on a.id = b.EMP_ID left join t_employee_project b on a.id = b.EMP_ID
<where> <where>
...@@ -558,6 +562,17 @@ ...@@ -558,6 +562,17 @@
<include refid="employeeInfo_where"/> <include refid="employeeInfo_where"/>
</where> </where>
GROUP BY a.id GROUP BY a.id
) b
where 1=1
<if test="tEmployeeInfo.unitName != null and tEmployeeInfo.unitName.trim() != ''">
AND b.UNIT_NAME like concat('%',#{tEmployeeInfo.unitName},'%')
</if>
<if test="tEmployeeInfo.deptName != null and tEmployeeInfo.deptName.trim() != ''">
AND b.DEPT_NAME like concat('%',#{tEmployeeInfo.deptName},'%')
</if>
<if test="tEmployeeInfo.deptNo != null and tEmployeeInfo.deptNo.trim() != ''">
AND b.DEPT_NO = #{tEmployeeInfo.deptNo}
</if>
</select> </select>
<!-- 获取当日最大的编码 --> <!-- 获取当日最大的编码 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment