commit
This commit is contained in:
+4
@@ -7,6 +7,7 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
|
||||
import cn.dev33.satoken.annotation.SaCheckLogin;
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.dev33.satoken.annotation.SaMode;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.budwk.app.base.constant.RoleConstant;
|
||||
import com.budwk.app.base.page.Pagination;
|
||||
@@ -237,6 +238,9 @@ public class UnionReimburseCollectController {
|
||||
item.setReimburseFundSource(typeDict.getName());
|
||||
}
|
||||
}
|
||||
if (StrUtil.isNotBlank(item.getCreateTime())) {
|
||||
item.setCreateTime(DateUtil.format(DateUtil.parse(item.getCreateTime()), "yyyy-MM-dd HH:mm:ss"));
|
||||
}
|
||||
|
||||
// 拼接备注字段(仿照系统代码逻辑,使用activityName和condolenceName字段)
|
||||
if (cn.hutool.core.util.StrUtil.isNotBlank(item.getActivityName())) {
|
||||
|
||||
+2
-2
@@ -227,7 +227,7 @@ public class UnionReimburseMineController {
|
||||
|
||||
tempFile.deleteOnExit();
|
||||
|
||||
docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd"));
|
||||
docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
|
||||
docData.put("unitName", unionReimburse.getUnitName());
|
||||
docData.put("userName", unionReimburse.getUserName());
|
||||
docData.put("loginName", unionReimburse.getLoginName());
|
||||
@@ -309,7 +309,7 @@ public class UnionReimburseMineController {
|
||||
.create();
|
||||
docData.put("qrcode", pictureRenderData);
|
||||
|
||||
docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd"));
|
||||
docData.put("createTime", DateUtil.format(unionReimburse.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
|
||||
docData.put("unitName", unionReimburse.getUnitName());
|
||||
docData.put("userName", unionReimburse.getUserName());
|
||||
docData.put("loginName", unionReimburse.getLoginName());
|
||||
|
||||
+12
-2
@@ -139,10 +139,10 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl<UnionReimburse> i
|
||||
}
|
||||
|
||||
if (oldRecord == null) {
|
||||
unionReimburse.setCreateTime(DateUtil.date());
|
||||
unionReimburse.setCreateTime(toSecondPrecision(DateUtil.date()));
|
||||
unionReimburse.setDocumentNo(generateDocumentNo());
|
||||
} else {
|
||||
unionReimburse.setCreateTime(oldRecord.getCreateTime());
|
||||
unionReimburse.setCreateTime(toSecondPrecision(oldRecord.getCreateTime()));
|
||||
unionReimburse.setDocumentNo(oldRecord.getDocumentNo());
|
||||
}
|
||||
unionReimburse.setStateId(stateId);
|
||||
@@ -156,6 +156,16 @@ public class UnionReimburseServiceImpl extends BaseServiceImpl<UnionReimburse> i
|
||||
return Result.success(stateId == 2 ? "提交成功" : "保存成功");
|
||||
}
|
||||
|
||||
/**
|
||||
* 申请时间统一保存到秒,避免数据库和页面出现毫秒级时间。
|
||||
*/
|
||||
private Date toSecondPrecision(Date date) {
|
||||
if (date == null) {
|
||||
return null;
|
||||
}
|
||||
return new Date((date.getTime() / 1000) * 1000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public UnionReimburse getApplyForm(String id) {
|
||||
UnionReimburse unionReimburse = this.fetch(id);
|
||||
|
||||
Reference in New Issue
Block a user