From 06e83c6b0282234dc30970499972381578738da9 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 15 八月 2025 14:50:17 +0800
Subject: [PATCH] 修改
---
service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java
index d3fa8a3..a493210 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.cwgl.service.impl;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -7,7 +8,9 @@
import com.ruoyi.common.utils.DateUtils;
import javax.annotation.Resource;
+import com.ruoyi.common.utils.RandomUtils;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.cwgl.domain.EstimatedReceivableBill;
import com.ruoyi.cwgl.mapper.EstimatedReceivableLogMapper;
import com.ruoyi.cwgl.service.IEstimatedReceivableLogService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -110,7 +113,13 @@
@Override
public int insertEstimatedReceivable(EstimatedReceivable estimatedReceivable)
{
- estimatedReceivable.setCreateTime(DateUtils.getNowDate());
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyMMdd");
+
+ Date nowDate = DateUtils.getNowDate();
+ String datePart = dateFormat.format(nowDate);
+ estimatedReceivable.setCreateTime(nowDate);
+ estimatedReceivable.setFeeSystemNo("YF"+datePart+ RandomUtils.random(5));
+ estimatedReceivable.setFeeType(0);
return estimatedReceivableMapper.insertEstimatedReceivable(estimatedReceivable);
}
@@ -136,6 +145,11 @@
@Override
public int updateEstimatedReceivable(EstimatedReceivable estimatedReceivable)
{
+ Integer id = estimatedReceivable.getId();
+ EstimatedReceivable estimatedReceivable1 = estimatedReceivableMapper.selectEstimatedReceivableById(id);
+ if (estimatedReceivable1.getRelatedBillStatus().equals(2)||estimatedReceivable1.getRelatedBillStatus().equals(3)){
+ throw new ServiceException("缁撶畻涓垨宸茬粨绠楁棤娉曚慨鏀�");
+ }
estimatedReceivable.setUpdateTime(DateUtils.getNowDate());
String username = SecurityUtils.getUsername();
logService.insertEstimatedReceivableLog("淇敼搴旀敹",estimatedReceivable.getId(),username);
--
Gitblit v1.8.0