소스 검색

政策-政策创建时间

yangzian 3 년 전
부모
커밋
3775ab6c7e

+ 6 - 12
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/controller/CwjsPolicyInfoController.java

@@ -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("修改成功!");

+ 1 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/entity/CwjsPolicyApprovalLog.java

@@ -50,7 +50,7 @@ public class CwjsPolicyApprovalLog {
 	private String createUserId;
 	/**创建时间*/
     @ApiModelProperty(value = "创建时间")
-	private Date createTime;
+	private String createTime;
 	/**更新时间*/
     @ApiModelProperty(value = "更新时间")
 	private Date updateTime;

+ 2 - 1
jeecg-boot-finance/src/main/java/org/jeecg/ctop/finance/policy/service/impl/CwjsPolicyInfoServiceImpl.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.entity.SysUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.ctop.finance.policy.entity.CwjsPolicyApprovalLog;
 import org.jeecg.ctop.finance.policy.entity.CwjsPolicyInfo;
 import org.jeecg.ctop.finance.policy.mapper.CwjsPolicyInfoMapper;
@@ -189,7 +190,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
         policyApprovalLog.setCreateUserId(cwjsPolicyInfo.getCreateUserId());
         policyApprovalLog.setApprovalStatus(2);//0-审核通过  1-审核不通过 2-转给领导
         policyApprovalLog.setApprovalContent("转审领导。");
-        policyApprovalLog.setCreateTime(new Date());
+        policyApprovalLog.setCreateTime(DateUtils.formatDateTime());
         policyApprovalLogService.save(policyApprovalLog);
     }