Commit b989b140 authored by hongguangwu's avatar hongguangwu

MVP1.7.7-花名册

parent 1e1d4727
...@@ -34,7 +34,7 @@ import java.time.LocalDate; ...@@ -34,7 +34,7 @@ import java.time.LocalDate;
*/ */
@Data @Data
@ColumnWidth(30) @ColumnWidth(30)
public class EmployeeProjectScpVO extends RowIndex implements Serializable { public class EmployeeProjectScpVO implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -72,7 +72,7 @@ public class EmployeeProjectScpVO extends RowIndex implements Serializable { ...@@ -72,7 +72,7 @@ public class EmployeeProjectScpVO extends RowIndex implements Serializable {
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "入/离职日期") @ExcelProperty(value = "入/离职日期")
@ExcelAttribute(name = "入/离职日期") @ExcelAttribute(name = "入/离职日期")
private LocalDate enjoinDateAndLeaveTime; private String enjoinDateAndLeaveTime;
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value = "合同签订状态") @ExcelProperty(value = "合同签订状态")
......
...@@ -78,6 +78,8 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee ...@@ -78,6 +78,8 @@ public class TEmployeeProjectBelongDeptServiceImpl extends ServiceImpl<TEmployee
// 没传项目id,置为-1,不给查询 // 没传项目id,置为-1,不给查询
tEmployeeProjectBelongDept.setDeptId("-1"); tEmployeeProjectBelongDept.setDeptId("-1");
} }
// empDeptId == -1,则查项目下所有 所属部门 为空的(逻辑在XML的where里)
// 2025-3-3 11:52:18 倩倩与宇茜沟通后确定的,宇茜说 所属部门树的顶级的数字,是底下加上的,所以没有 包含空的
if (Common.isNotNull(tEmployeeProjectBelongDept.getEmpDeptId()) && !"-1".equals(tEmployeeProjectBelongDept.getEmpDeptId())) { if (Common.isNotNull(tEmployeeProjectBelongDept.getEmpDeptId()) && !"-1".equals(tEmployeeProjectBelongDept.getEmpDeptId())) {
tEmployeeProjectBelongDept.setEmpDeptIdArray(tEmployeeProjectBelongDept.getEmpDeptId().split(",")); tEmployeeProjectBelongDept.setEmpDeptIdArray(tEmployeeProjectBelongDept.getEmpDeptId().split(","));
} }
......
...@@ -31,6 +31,13 @@ ...@@ -31,6 +31,13 @@
</resultMap> </resultMap>
<sql id="tEmployeeProjectBelongDept_where"> <sql id="tEmployeeProjectBelongDept_where">
<if test="tEmployeeProjectBelongDept != null"> <if test="tEmployeeProjectBelongDept != null">
<if test="tEmployeeProjectBelongDept.deptId != null and tEmployeeProjectBelongDept.deptId.trim() != ''">
AND a.DEPT_ID = #{tEmployeeProjectBelongDept.deptId}
</if>
<if test="tEmployeeProjectBelongDept.empDeptId != null and tEmployeeProjectBelongDept.empDeptId.trim() != ''
and tEmployeeProjectBelongDept.empDeptId.trim() == '-1'">
AND b.id is null
</if>
<if test="tEmployeeProjectBelongDept.empName != null and tEmployeeProjectBelongDept.empName.trim() != ''"> <if test="tEmployeeProjectBelongDept.empName != null and tEmployeeProjectBelongDept.empName.trim() != ''">
AND a.EMP_NAME like concat('%',#{tEmployeeProjectBelongDept.empName},'%') AND a.EMP_NAME like concat('%',#{tEmployeeProjectBelongDept.empName},'%')
</if> </if>
...@@ -47,6 +54,13 @@ ...@@ -47,6 +54,13 @@
#{param} #{param}
</foreach> </foreach>
</if> </if>
<if test="tEmployeeProjectBelongDept.empDeptIdArray != null and tEmployeeProjectBelongDept.empDeptIdArray.length > 0">
AND b.emp_deptid in
<foreach item="idStr" index="index" collection="tEmployeeProjectBelongDept.empDeptIdArray" open="("
separator="," close=")">
#{idStr}
</foreach>
</if>
<if test="tEmployeeProjectBelongDept.contractStatusArray != null and tEmployeeProjectBelongDept.contractStatusArray.length > 0"> <if test="tEmployeeProjectBelongDept.contractStatusArray != null and tEmployeeProjectBelongDept.contractStatusArray.length > 0">
AND a.CONTRACT_STATUS in AND a.CONTRACT_STATUS in
<foreach item="idStr" index="index" collection="tEmployeeProjectBelongDept.contractStatusArray" open="(" <foreach item="idStr" index="index" collection="tEmployeeProjectBelongDept.contractStatusArray" open="("
...@@ -143,7 +157,7 @@ ...@@ -143,7 +157,7 @@
a.DELETE_FLAG ='0' a.DELETE_FLAG ='0'
<include refid="tEmployeeProjectBelongDept_where"/> <include refid="tEmployeeProjectBelongDept_where"/>
</where> </where>
<if test="tEmployeeProjectBelongDept_where != null"> <if test="tEmployeeProjectBelongDept != null">
<if test="tEmployeeProjectBelongDept.limitStart != null"> <if test="tEmployeeProjectBelongDept.limitStart != null">
limit #{tEmployeeProjectBelongDept.limitStart},#{tEmployeeProjectBelongDept.limitEnd} limit #{tEmployeeProjectBelongDept.limitStart},#{tEmployeeProjectBelongDept.limitEnd}
</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