From ce80b4856af879484f039c3176843e29978b436f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 07 十一月 2025 11:47:15 +0800
Subject: [PATCH] yys 劳动合同word模板导出
---
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 9 +++++++++
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 7 +++++++
src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | 6 ++++--
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 7 ++++++-
src/main/resources/application.yml | 2 +-
5 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index f3d27f4..981684d 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -8,12 +8,15 @@
import com.ruoyi.staff.pojo.StaffOnJob;
import com.ruoyi.staff.service.IStaffJoinLeaveRecordService;
import com.ruoyi.staff.service.IStaffOnJobService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
import java.util.List;
/**
@@ -21,6 +24,7 @@
*/
@RestController
@RequestMapping("/staff/staffOnJob")
+@Api(tags = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
public class StaffOnJobController {
@Resource
@@ -85,7 +89,8 @@
* @param staffOnJob
*/
@PostMapping("/exportCopy")
- public String exportCopy(HttpServletResponse response,StaffOnJob staffOnJob) throws Exception{
+ @ApiOperation("word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
+ public String exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception{
return staffOnJobService.exportCopy(response, staffOnJob);
}
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index 58adbe0..0e78067 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -151,6 +151,13 @@
private Date trialStartDate;
/**
+ * 璇曠敤缁撴潫鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "璇曠敤缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date trialEndDate;
+
+ /**
* 绛捐鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index a158056..1ee4e5b 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -122,6 +123,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍚堝悓鍒版湡鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractExpireTime;
/**
@@ -129,6 +131,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "缁撴潫璇曠敤鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialEndDate;
/**
@@ -136,6 +139,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "寮�濮嬭瘯鐢ㄦ棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date trialStartDate;
/**
@@ -143,6 +147,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "绛捐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date signDate;
/**
@@ -173,6 +178,8 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
@@ -181,6 +188,8 @@
@ApiModelProperty(value = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@ApiModelProperty(value = "淇敼鐢ㄦ埛")
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
index 3a331d2..d53cb8e 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java
@@ -19,6 +19,7 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -82,11 +83,12 @@
}
}
+
@Override
public String exportCopy(HttpServletResponse response, StaffOnJob staffOnJob) throws Exception {
- String url = "D:\\files\\寮犱笁-鍔冲姩鍚堝悓2024.docx";
+ String url = "/javaWork/product-inventory-management/file/prod/uploads/" + staffOnJob.getStaffName() + "-鍔冲姩鍚堝悓涔�.docx";
Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
- // 璁剧疆妯℃澘鏂囦欢鎵�鍦ㄧ洰褰曪紙缁濆璺緞锛屼緥濡傦細D:/templates/锛�
+ // 璁剧疆妯℃澘鏂囦欢鎵�鍦ㄧ洰褰曪紙缁濆璺緞锛屼緥濡傦細/templates/锛�
cfg.setClassForTemplateLoading(StaffOnJobServiceImpl.class, "/static");
cfg.setDefaultEncoding("UTF-8");
//2.瀹氫箟闇�瑕佸～鍏呯殑鍙橀噷
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 33d6165..6a88940 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,4 @@
# Spring閰嶇疆
spring:
profiles:
- active: demo
+ active: hckx
--
Gitblit v1.9.3