Commit 6088dea5 authored by hongguangwu's avatar hongguangwu

1.7.19-我的待办、待办监控:合同待签署页签,增加“是否已建档”查询条件-是/否,允许叉掉

parent 08a0ad97
......@@ -201,9 +201,6 @@
<if test="tEmployeeContractPre.employeeName != null and tEmployeeContractPre.employeeName.trim() != ''">
AND a.employee_name = #{tEmployeeContractPre.employeeName}
</if>
<if test="tEmployeeContractPre.archivesIsCreate != null and tEmployeeContractPre.archivesIsCreate.trim() != ''">
AND a.archives_is_create = #{tEmployeeContractPre.archivesIsCreate}
</if>
<if test="tEmployeeContractPre.empIdcard != null and tEmployeeContractPre.empIdcard.trim() != ''">
AND a.emp_idcard like CONCAT('%',#{tEmployeeContractPre.empIdcard},'%')
</if>
......@@ -286,6 +283,18 @@
<where>
1=1
<include refid="tEmployeeContractPre_where"/>
<if test="tEmployeeContractPre != null">
<if test="tEmployeeContractPre.archivesIsCreate != null and tEmployeeContractPre.archivesIsCreate.trim() != ''">
<if test='tEmployeeContractPre.archivesIsCreate == "0" '>
AND b.id is not null
</if>
<if test='tEmployeeContractPre.archivesIsCreate == "1" '>
AND b.id is null
</if>
</if>
</if>
</where>
order by a.create_time desc
</select>
......@@ -308,9 +317,21 @@
SELECT
count(1)
FROM t_employee_contract_pre a
left join t_employee_project b on a.emp_idcard = b.EMP_IDCARD and a.DEPT_NO = b.DEPT_NO
and b.PROJECT_STATUS = 0 and b.DELETE_FLAG = '0'
<where>
1=1
<include refid="tEmployeeContractPre_where"/>
<if test="tEmployeeContractPre != null">
<if test="tEmployeeContractPre.archivesIsCreate != null and tEmployeeContractPre.archivesIsCreate.trim() != ''">
<if test='tEmployeeContractPre.archivesIsCreate == "0" '>
AND b.id is not null
</if>
<if test='tEmployeeContractPre.archivesIsCreate == "1" '>
AND b.id is null
</if>
</if>
</if>
</where>
</select>
......@@ -350,6 +371,16 @@
<where>
1=1
<include refid="tEmployeeContractPre_where"/>
<if test="tEmployeeContractPre != null">
<if test="tEmployeeContractPre.archivesIsCreate != null and tEmployeeContractPre.archivesIsCreate.trim() != ''">
<if test='tEmployeeContractPre.archivesIsCreate == "0" '>
AND b.id is not null
</if>
<if test='tEmployeeContractPre.archivesIsCreate == "1" '>
AND b.id is null
</if>
</if>
</if>
</where>
order by a.create_time desc
<if test="tEmployeeContractPre.limitStart != null">
......
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