Commit 15235f21 authored by chenyuxi's avatar chenyuxi

feat: 花名册查询调整

parent a644cf68
...@@ -30,8 +30,7 @@ ...@@ -30,8 +30,7 @@
<result property="empDeptid" column="emp_deptid"/> <result property="empDeptid" column="emp_deptid"/>
</resultMap> </resultMap>
<sql id="tEmployeeProjectBelongDept_where"> <sql id="tEmployeeProjectBelongDept_where">
/* 派单审核通过,或其他路径 */ /* 派单审核通过,或其他路径 2025-3-19 15:22:08 倩倩要求去掉审核条件*/
and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1')
<if test="tEmployeeProjectBelongDept != null"> <if test="tEmployeeProjectBelongDept != null">
<if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"> <if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''">
AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId} AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId}
...@@ -215,7 +214,7 @@ ...@@ -215,7 +214,7 @@
from t_employee_project a from t_employee_project a
LEFT JOIN t_employee_project_belong_dept b on a.id=b.id LEFT JOIN t_employee_project_belong_dept b on a.id=b.id
<where> <where>
a.DELETE_FLAG ='0' and ((a.PROJECT_SOURCE = '1' and a.STATUS = 1) or a.PROJECT_SOURCE != '1') and b.id is null a.DELETE_FLAG ='0' and b.id is null
<if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''"> <if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''">
AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId} AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId}
</if> </if>
......
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