From 254a2998c07916de66c464928bbb1beeacfe72d6 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期五, 15 八月 2025 10:50:27 +0800
Subject: [PATCH] 新增移除

---
 service/src/main/java/com/ruoyi/cwgl/service/impl/EstimatedReceivableServiceImpl.java |   88 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 86 insertions(+), 2 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 765e21a..b2b434a 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,9 +1,19 @@
 package com.ruoyi.cwgl.service.impl;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
+import com.ruoyi.common.exception.ServiceException;
 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;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.stereotype.Service;
 import org.springframework.scheduling.annotation.Async;
@@ -33,7 +43,8 @@
     protected final Logger logger = LoggerFactory.getLogger(getClass());
     @Resource
     private EstimatedReceivableMapper estimatedReceivableMapper;
-
+    @Autowired
+    private IEstimatedReceivableLogService logService;
 
     /**
      * 鏌ヨ棰勪及搴旀敹绠＄悊
@@ -102,7 +113,12 @@
     @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));
         return estimatedReceivableMapper.insertEstimatedReceivable(estimatedReceivable);
     }
 
@@ -128,7 +144,14 @@
     @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);
         return estimatedReceivableMapper.updateEstimatedReceivable(estimatedReceivable);
     }
 
@@ -179,4 +202,65 @@
     {
         return estimatedReceivableMapper.deleteEstimatedReceivableById(id);
     }
+
+    @Override
+    public int confirm(Integer id) {
+        EstimatedReceivable estimatedReceivable = estimatedReceivableMapper.selectEstimatedReceivableById(id);
+        if (estimatedReceivable==null){
+            throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+        }
+        if (estimatedReceivable.getIsConfirmed().equals(2)) {
+            throw new ServiceException("璇ユ暟鎹凡浣滃簾");
+
+        }
+        if (estimatedReceivable.getIsConfirmed().equals(1)) {
+            throw new ServiceException("鏃犻渶閲嶅纭");
+
+        }
+        String username = SecurityUtils.getUsername();
+
+        logService.insertEstimatedReceivableLog("纭搴旀敹",id,username);
+        estimatedReceivable.setIsConfirmed(1);
+        estimatedReceivable.setConfirmBy(username);
+        estimatedReceivable.setConfirmTime(new Date());
+        return estimatedReceivableMapper.updateEstimatedReceivable(estimatedReceivable);
+    }
+
+    @Override
+    public int cancel(Integer id) {
+        EstimatedReceivable estimatedReceivable = estimatedReceivableMapper.selectEstimatedReceivableById(id);
+        if (estimatedReceivable==null){
+            throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+        }
+        if (estimatedReceivable.getIsConfirmed().equals(2)) {
+            throw new ServiceException("璇ユ暟鎹凡浣滃簾");
+
+        }
+        if (estimatedReceivable.getIsConfirmed().equals(0)) {
+            throw new ServiceException("鏃犻渶閲嶅鍙栨秷");
+
+        }
+        String username = SecurityUtils.getUsername();
+
+        logService.insertEstimatedReceivableLog("鍙栨秷搴旀敹",id,username);
+        estimatedReceivable.setIsConfirmed(0);
+        return estimatedReceivableMapper.updateEstimatedReceivable(estimatedReceivable);
+    }
+
+    @Override
+    public int invalid(Integer id) {
+        EstimatedReceivable estimatedReceivable = estimatedReceivableMapper.selectEstimatedReceivableById(id);
+        if (estimatedReceivable==null){
+            throw new ServiceException("鏁版嵁涓嶅瓨鍦�");
+        }
+        if (estimatedReceivable.getIsConfirmed().equals(2)) {
+            throw new ServiceException("鏃犻渶閲嶅浣滃簾");
+
+        }
+        String username = SecurityUtils.getUsername();
+
+        logService.insertEstimatedReceivableLog("浣滃簾搴旀敹",id,username);
+        estimatedReceivable.setIsConfirmed(2);
+        return estimatedReceivableMapper.updateEstimatedReceivable(estimatedReceivable);
+    }
 }

--
Gitblit v1.8.0