|
|
@@ -180,7 +180,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
policyApprovalLog.setApprovalContent("提交政策");
|
|
|
- policyApprovalLog.setCreateTime(new Date());
|
|
|
+ policyApprovalLog.setCreateTime(DateUtils.formatDateTime());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
}
|
|
|
@@ -279,7 +279,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
- policyApprovalLog.setCreateTime(new Date());
|
|
|
+ policyApprovalLog.setCreateTime(DateUtils.formatDateTime());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
}
|
|
|
@@ -298,7 +298,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setPolicyId(id);
|
|
|
policyApprovalLog.setCreateUserId(userId);
|
|
|
policyApprovalLog.setApprovalContent(approvalContent);
|
|
|
- policyApprovalLog.setCreateTime(new Date());
|
|
|
+ policyApprovalLog.setCreateTime(DateUtils.formatDateTime());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
|
|
|
@@ -588,8 +588,7 @@ public class CwjsPolicyInfoController {
|
|
|
SysUser sysUser = sysUserService.getById(cwjsPolicyInfo.getCreateUserId());
|
|
|
cwjsPolicyInfo.setCreateUserName(sysUser.getRealname());
|
|
|
|
|
|
- log.info("政策创建时间是--------------{}",cwjsPolicyInfo.getCreateTime());
|
|
|
-
|
|
|
+ cwjsPolicyInfo.setCreateTime(new Date());
|
|
|
cwjsPolicyInfoService.save(cwjsPolicyInfo);
|
|
|
JSONArray products = cwjsPolicyInfo.getPolicyProductName();
|
|
|
List<CwjsPolicyProduct> policyProductList = new ArrayList<>();
|
|
|
@@ -630,12 +629,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
policyApprovalLog.setApprovalContent("创建政策");
|
|
|
- policyApprovalLog.setCreateTime(new Date());
|
|
|
-
|
|
|
- log.info("时间是===========1========={}",new Date());
|
|
|
- log.info("时间是==========2=========={}",DateUtils.formatDateTime());
|
|
|
-
|
|
|
-
|
|
|
+ policyApprovalLog.setCreateTime(DateUtils.formatDateTime());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
result.success("添加成功!");
|
|
|
@@ -695,7 +689,7 @@ public class CwjsPolicyInfoController {
|
|
|
policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
|
|
|
policyApprovalLog.setApprovalStatus(0);
|
|
|
policyApprovalLog.setApprovalContent("修改政策");
|
|
|
- policyApprovalLog.setCreateTime(new Date());
|
|
|
+ policyApprovalLog.setCreateTime(DateUtils.formatDateTime());
|
|
|
policyApprovalLogService.save(policyApprovalLog);
|
|
|
|
|
|
result.success("修改成功!");
|