Commit ce9d3064 authored by hongguangwu's avatar hongguangwu

MVP1.5.1-收入证明等

parent ded502c2
...@@ -94,7 +94,7 @@ public class TProveRecord extends Model<TProveRecord> { ...@@ -94,7 +94,7 @@ public class TProveRecord extends Model<TProveRecord> {
@ExcelAttribute(name = "开具日期") @ExcelAttribute(name = "开具日期")
@ExcelProperty("开具日期") @ExcelProperty("开具日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDate creatDate; private Date creatDate;
/** /**
* 开始月份 * 开始月份
*/ */
......
...@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -31,6 +31,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Date;
import java.util.List; import java.util.List;
...@@ -151,7 +152,7 @@ public class SalaryProveController { ...@@ -151,7 +152,7 @@ public class SalaryProveController {
record.setEmployeeName(em.getEmpName()); record.setEmployeeName(em.getEmpName());
record.setEmployeeIdCard(em.getEmpIdcard()); record.setEmployeeIdCard(em.getEmpIdcard());
record.setEmployeeInfo(emId); record.setEmployeeInfo(emId);
record.setCreatDate(LocalDate.now()); record.setCreatDate(new Date());
record.setEmployeeSettleDepartName(em.getDeptName()); record.setEmployeeSettleDepartName(em.getDeptName());
record.setPost(em.getPost()); record.setPost(em.getPost());
count = LocalDateTimeUtils.getBeginOfMonth(endDate.concat("01"), startDate.concat("01"), "yyyyMMdd") + 1; count = LocalDateTimeUtils.getBeginOfMonth(endDate.concat("01"), startDate.concat("01"), "yyyyMMdd") + 1;
......
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