开始和结束时间格式化
parent
e798929d95
commit
d00e6d654d
|
@ -97,7 +97,7 @@ public class ProjectController extends BaseController {
|
||||||
Map<String, String> searchInfo = getSearchInfo(keywords);
|
Map<String, String> searchInfo = getSearchInfo(keywords);
|
||||||
downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream");
|
downloadHeader(httpServletResponse, Utils.generateExcelName("项目报表"), "application/octet-stream");
|
||||||
String[] headers = {"项目名称", "项目类型", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
|
String[] headers = {"项目名称", "项目类型", "项目状态", "审核状态", "当前审核人", "项目创建者", "部门名称", "项目开始时间", "项目结束时间", "最后更新时间"};
|
||||||
String[] exportColumns = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDate", "endDate", "lastUpdateTime"};
|
String[] exportColumns = {"name", "typeDesc", "statusDesc", "approveStatusDesc", "approveName", "creatorName", "deptName", "startDateYM", "endDateYM", "lastUpdateTime"};
|
||||||
ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
|
ExportUtils.exportToExcel(headers, exportColumns, 1, 10000,
|
||||||
httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList());
|
httpServletResponse.getOutputStream(), (pN, pS) -> projectService.list(searchInfo, pN, pS).getList());
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,6 +2,7 @@ package cn.palmte.work.model;
|
||||||
|
|
||||||
import cn.palmte.work.bean.ApproveStatusEnum;
|
import cn.palmte.work.bean.ApproveStatusEnum;
|
||||||
import org.hibernate.annotations.GenericGenerator;
|
import org.hibernate.annotations.GenericGenerator;
|
||||||
|
import top.jfunc.common.datetime.DatetimeUtils;
|
||||||
|
|
||||||
import javax.persistence.*;
|
import javax.persistence.*;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
@ -436,4 +437,11 @@ public class Project {
|
||||||
public void setApproveId(int approveId) {
|
public void setApproveId(int approveId) {
|
||||||
this.approveId = approveId;
|
this.approveId = approveId;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getStartDateYM(){
|
||||||
|
return DatetimeUtils.toStr(this.startDate,"yyyy-MM");
|
||||||
|
}
|
||||||
|
public String getEndDateYM(){
|
||||||
|
return DatetimeUtils.toStr(this.endDate,"yyyy-MM");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
<i class="am-icon-calendar"></i>
|
<i class="am-icon-calendar"></i>
|
||||||
<input type="text" class="am-form-field am-input-sm" id="startDate"
|
<input type="text" class="am-form-field am-input-sm" id="startDate"
|
||||||
name="startDate" autocomplete="off"
|
name="startDate" autocomplete="off"
|
||||||
value="${project.startDate}" placeholder="项目计划开始时间"
|
value="${project.startDate?string("yyyy-MM")}" placeholder="项目计划开始时间"
|
||||||
data-am-datepicker>
|
data-am-datepicker>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -55,7 +55,7 @@
|
||||||
<i class="am-icon-calendar"></i>
|
<i class="am-icon-calendar"></i>
|
||||||
<input type="text" class="am-form-field am-input-sm" id="endDate"
|
<input type="text" class="am-form-field am-input-sm" id="endDate"
|
||||||
name="endDate" autocomplete="off"
|
name="endDate" autocomplete="off"
|
||||||
value="${project.endDate}" placeholder="项目计划结束时间"
|
value="${project.endDate?string("yyyy-MM")}" placeholder="项目计划结束时间"
|
||||||
data-am-datepicker>
|
data-am-datepicker>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue