Commit 21c92c01 authored by huyuchen's avatar huyuchen

huych-入离职登记提交

parent 43447079
...@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.csp.vo; ...@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.csp.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -18,7 +17,7 @@ import java.util.Date; ...@@ -18,7 +17,7 @@ import java.util.Date;
*/ */
@Data @Data
@ColumnWidth(12) @ColumnWidth(12)
public class EmployeeRegistrationExportVo extends RowIndex implements Serializable { public class EmployeeRegistrationExportVo implements Serializable {
@ExcelAttribute(name = "员工姓名") @ExcelAttribute(name = "员工姓名")
@Schema(description = "员工姓名") @Schema(description = "员工姓名")
......
...@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.csp.vo; ...@@ -3,7 +3,6 @@ package com.yifu.cloud.plus.v1.csp.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.vo.RowIndex;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -18,7 +17,7 @@ import java.util.Date; ...@@ -18,7 +17,7 @@ import java.util.Date;
*/ */
@Data @Data
@ColumnWidth(12) @ColumnWidth(12)
public class EmployeeRegistrationHrExportVo extends RowIndex implements Serializable { public class EmployeeRegistrationHrExportVo implements Serializable {
@ExcelAttribute(name = "项目编码") @ExcelAttribute(name = "项目编码")
@Schema(description = "项目编码") @Schema(description = "项目编码")
......
...@@ -7,7 +7,6 @@ import io.swagger.v3.oas.annotations.media.Schema; ...@@ -7,7 +7,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
...@@ -56,12 +55,12 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration { ...@@ -56,12 +55,12 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
//开始时间(查询专用) //开始时间(查询专用)
@Schema(description = "入离职开始时间") @Schema(description = "入离职开始时间")
@TableField(exist = false) @TableField(exist = false)
private Date joinTimeStart; private LocalDateTime joinTimeStart;
//截止时间(查询专用) //截止时间(查询专用)
@Schema(description = "入离职截止时间") @Schema(description = "入离职截止时间")
@TableField(exist = false) @TableField(exist = false)
private Date joinTimeEnd; private LocalDateTime joinTimeEnd;
@Schema(description = "就职岗位数组") @Schema(description = "就职岗位数组")
@TableField(exist = false) @TableField(exist = false)
...@@ -71,4 +70,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration { ...@@ -71,4 +70,8 @@ public class EmployeeRegistrationSearchVo extends EmployeeRegistration {
@TableField(exist = false) @TableField(exist = false)
private List<String> statusList; private List<String> statusList;
@Schema(description = "登记类型数组")
@TableField(exist = false)
private List<String> typeList;
} }
...@@ -62,9 +62,9 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable { ...@@ -62,9 +62,9 @@ public class EmployeeRegistrationVo extends RowIndex implements Serializable {
/** /**
* 反馈类型 1入职 2离职 * 反馈类型 1入职 2离职
*/ */
@ExcelAttribute(name = "反馈类型", readConverterExp = "1=入职,2=离职") @ExcelAttribute(name = "登记类型", readConverterExp = "1=入职,2=离职")
@Schema(description = "反馈类型") @Schema(description = "登记类型")
@ExcelProperty("反馈类型") @ExcelProperty("登记类型")
private String feedbackType; private String feedbackType;
/** /**
......
...@@ -444,16 +444,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -444,16 +444,16 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
if (sendUser != null) { if (sendUser != null) {
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
Map<String, Object> requestMap = new HashMap<>(); Map<String, Object> requestMap = new HashMap<>();
// String authUrl = null; String authUrl = null;
Map<String, Object> textcard = new HashMap<>(); Map<String, Object> textcard = new HashMap<>();
// authUrl = String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName()+"/auth/oauth/wxLogin", "01"+registration.getId()); authUrl = String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName()+"/auth/oauth/wxLogin", "01"+registration.getId());
StringBuilder description = new StringBuilder(); StringBuilder description = new StringBuilder();
String title = ""; String title = "";
if (CommonConstants.ONE_STRING.equals(type) || CommonConstants.TWO_STRING.equals(type)) { if (CommonConstants.ONE_STRING.equals(type) || CommonConstants.TWO_STRING.equals(type)) {
title = "人员入职提醒"; title = "人员入职提醒";
description.append(CommonConstants.ONE_STRING.equals(type) ? "入职日期:":"离职日期:") description.append(CommonConstants.ONE_STRING.equals(type) ? "入职日期:":"离职日期:")
.append(registration.getJoinLeaveDate()).append("<br>"); .append(DateUtil.dateToString(registration.getJoinLeaveDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT)).append("<br>");
description.append("项目名称:").append(registration.getDeptName()).append("<br>"); description.append("项目名称:").append(registration.getDeptName()).append("<br>");
description.append("项目编码:").append(registration.getDeptNo()).append("<br>"); description.append("项目编码:").append(registration.getDeptNo()).append("<br>");
description.append("员工姓名:").append(registration.getEmployeeName()).append("<br>"); description.append("员工姓名:").append(registration.getEmployeeName()).append("<br>");
...@@ -467,7 +467,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -467,7 +467,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
description.append("离职人数:").append(registration.getOutNum()).append("<br>"); description.append("离职人数:").append(registration.getOutNum()).append("<br>");
} }
textcard.put("title", title); textcard.put("title", title);
// textcard.put("url", authUrl); textcard.put("url", authUrl);
textcard.put("description", description.toString()); textcard.put("description", description.toString());
requestMap.put("touser", sendUser); requestMap.put("touser", sendUser);
requestMap.put("agentid", wxConfig.getAgentid()); requestMap.put("agentid", wxConfig.getAgentid());
......
...@@ -100,15 +100,18 @@ ...@@ -100,15 +100,18 @@
<if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''"> <if test="employeeRegistration.empPhone != null and employeeRegistration.empPhone.trim() != ''">
AND a.emp_phone like CONCAT(#{employeeRegistration.empPhone},'%') AND a.emp_phone like CONCAT(#{employeeRegistration.empPhone},'%')
</if> </if>
<if test="employeeRegistration.postList != null"> <if test="employeeRegistration.postList != null and employeeRegistration.postList.size() > 0 ">
AND a.position in AND a.position in
<foreach item="item" index="index" collection="employeeRegistration.postList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="employeeRegistration.postList" open="(" separator="," close=")">
'${item}' '${item}'
</foreach> </foreach>
</if> </if>
<if test="employeeRegistration.feedbackType != null and employeeRegistration.feedbackType.trim() != ''"> <if test="employeeRegistration.typeList != null and employeeRegistration.typeList.size() > 0 ">
AND a.feedback_type = #{employeeRegistration.feedbackType} AND a.feedback_type in
</if> <foreach item="item" index="index" collection="employeeRegistration.typeList" open="(" separator="," close=")">
'${item}'
</foreach>
</if>
<if test="employeeRegistration.createTimeStart != null"> <if test="employeeRegistration.createTimeStart != null">
AND a.CREATE_TIME <![CDATA[ >= ]]> #{employeeRegistration.createTimeStart} AND a.CREATE_TIME <![CDATA[ >= ]]> #{employeeRegistration.createTimeStart}
</if> </if>
...@@ -124,7 +127,7 @@ ...@@ -124,7 +127,7 @@
<if test="employeeRegistration.joinLeaveDate != null"> <if test="employeeRegistration.joinLeaveDate != null">
AND a.join_leave_date = #{employeeRegistration.joinLeaveDate} AND a.join_leave_date = #{employeeRegistration.joinLeaveDate}
</if> </if>
<if test="employeeRegistration.statusList != null"> <if test="employeeRegistration.statusList != null and employeeRegistration.statusList.size() > 0 ">
AND a.process_status in AND a.process_status in
<foreach item="item" index="index" collection="employeeRegistration.statusList" open="(" separator="," close=")"> <foreach item="item" index="index" collection="employeeRegistration.statusList" open="(" separator="," close=")">
'${item}' '${item}'
......
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