| src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/ruoyi/staff/service/impl/StaffOnJobServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/resources/application.yml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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); } 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") 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 = "修改用户") 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.定义需要填充的变里 src/main/resources/application.yml
@@ -1,4 +1,4 @@ # Spring配置 spring: profiles: active: demo active: hckx