From cce6c3d3e166887344035c3e244c9d06f382abf7 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 16:28:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java | 135 +++++++++++++++++++++++++++++++++++++-------
service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementService.java | 10 +++
service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java | 13 ++++
3 files changed, 134 insertions(+), 24 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
index 4af3ce9..1e53121 100644
--- a/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
+++ b/service/src/main/java/com/ruoyi/cwgl/controller/ReceivableFeeManagementController.java
@@ -129,4 +129,15 @@
return toAjax(receivableFeeManagementService.createReceivableBill(billCreateVo));
}
-}
+
+ /**
+ * 浣滃簾搴旀敹璐圭敤绠＄悊璁板綍
+ */
+ @PreAuthorize("@ss.hasPermi('cwgl:receivableFeeManagement:void')")
+ @Log(title = "搴旀敹璐圭敤绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping("/void/{id}")
+ public AjaxResult voidReceivableFee(@PathVariable Integer id)
+ {
+ return toAjax(receivableFeeManagementService.voidReceivableFeeManagement(id));
+ }
+}
\ No newline at end of file
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementService.java b/service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementService.java
index 8d71f9c..1e07a07 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementService.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementService.java
@@ -111,5 +111,13 @@
* @return 鍒涘缓鐨勫簲鏀惰处鍗旾D
*/
public Integer createReceivableBill(ReceivableBillCreateVo billCreateVo);
-
+
+ /**
+ * 浣滃簾搴旀敹璐圭敤绠＄悊璁板綍
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊ID
+ * @return 缁撴灉
+ */
+ public int voidReceivableFeeManagement(Integer id);
}
+
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
index 7e7c7ef..ff20ac5 100644
--- a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementServiceImpl.java
@@ -9,10 +9,11 @@
import com.ruoyi.common.enums.SystemDataNoEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
-import javax.annotation.Resource;
-
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.cwgl.domain.ReceivableFeeDetail;
+import com.ruoyi.cwgl.domain.ReceivableFeeManagementLog;
import com.ruoyi.cwgl.domain.vo.ReceivableFeeStatisticsVo;
+import com.ruoyi.cwgl.service.*;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISystemDataNoService;
@@ -32,12 +33,10 @@
import com.ruoyi.cwgl.domain.ReceivableFeeManagement;
import com.ruoyi.cwgl.domain.ReceivableBillManagement;
import com.ruoyi.cwgl.domain.ReceivableBillSettlementDetail;
-import com.ruoyi.cwgl.service.IReceivableFeeDetailService;
-import com.ruoyi.cwgl.service.IReceivableFeeManagementService;
-import com.ruoyi.cwgl.service.IReceivableBillManagementService;
-import com.ruoyi.cwgl.service.IReceivableBillSettlementDetailService;
import com.ruoyi.cwgl.domain.vo.ReceivableBillCreateVo;
import com.ruoyi.common.core.text.Convert;
+
+import javax.annotation.Resource;
/**
* 搴旀敹璐圭敤绠＄悊Service涓氬姟灞傚鐞�
@@ -62,11 +61,13 @@
@Autowired
private IReceivableBillManagementService receivableBillManagementService;
- @Autowired
- private IReceivableBillSettlementDetailService receivableBillSettlementDetailService;
+
@Autowired
ISystemDataNoService systemDataNoService;
+
+ @Autowired
+ private IReceivableFeeManagementLogService logService;
/**
* 鏌ヨ搴旀敹璐圭敤绠＄悊
@@ -165,20 +166,18 @@
receivableFeeDetailService.insertReceivableFeeDetailBatch(receivableFeeManagement.getReceivableFeeDetailList());
}
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(receivableFeeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("鏂板搴旀敹璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + receivableFeeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
+ }
+
return result;
- }
-
- /**
- * 鏂板搴旀敹璐圭敤绠＄悊[鎵归噺]
- *
- * @param receivableFeeManagements 搴旀敹璐圭敤绠＄悊
- * @return 缁撴灉
- */
- @Override
- public int insertReceivableFeeManagementBatch(List<ReceivableFeeManagement> receivableFeeManagements)
- {
- int rows = receivableFeeManagementMapper.insertReceivableFeeManagementBatch(receivableFeeManagements);
- return rows;
}
/**
@@ -213,7 +212,73 @@
receivableFeeDetailService.insertReceivableFeeDetailBatch(receivableFeeManagement.getReceivableFeeDetailList());
}
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(receivableFeeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("淇敼搴旀敹璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + receivableFeeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
+ }
+
return result;
+ }
+
+ /**
+ * 浣滃簾搴旀敹璐圭敤绠＄悊璁板綍
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int voidReceivableFeeManagement(Integer id) {
+ // 鏌ヨ璐圭敤绠＄悊璁板綍
+ ReceivableFeeManagement feeManagement = receivableFeeManagementMapper.selectReceivableFeeManagementById(id);
+ if (feeManagement == null) {
+ throw new ServiceException("璐圭敤绠＄悊璁板綍涓嶅瓨鍦�");
+ }
+
+ // 鍒ゆ柇鐘舵�佹槸鍚︿负0锛堝緟鐢熸垚璐﹀崟锛夛紝鍙湁鐘舵�佷负0鎵嶈兘浣滃簾
+ if (!"0".equals(feeManagement.getStatus())) {
+ throw new ServiceException("鍙湁鐘舵�佷负寰呯敓鎴愯处鍗曠殑璁板綍鎵嶈兘浣滃簾");
+ }
+
+ // 璁剧疆鐘舵�佷负浣滃簾锛堝亣璁剧敤"2"琛ㄧず浣滃簾鐘舵�侊級
+ feeManagement.setStatus("2");
+ feeManagement.setUpdateTime(DateUtils.getNowDate());
+
+ // 鏇存柊璁板綍
+ int result = receivableFeeManagementMapper.updateReceivableFeeManagement(feeManagement);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ if (result > 0) {
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(id);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("浣滃簾搴旀敹璐圭敤绠＄悊璁板綍锛岀郴缁熺紪鍙凤細" + feeManagement.getSystemNo());
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
+ }
+
+ return result;
+ }
+
+
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊[鎵归噺]
+ *
+ * @param receivableFeeManagements 搴旀敹璐圭敤绠＄悊
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertReceivableFeeManagementBatch(List<ReceivableFeeManagement> receivableFeeManagements)
+ {
+ int rows = receivableFeeManagementMapper.insertReceivableFeeManagementBatch(receivableFeeManagements);
+ return rows;
}
/**
@@ -325,6 +390,18 @@
public Integer createReceivableBill(ReceivableBillCreateVo billCreateVo) {
// 1. 鍑嗗鏁版嵁
ReceivableFeeStatisticsVo statisticsVo = billCreateVo.getStatisticsData();
+
+ // 妫�鏌ヨ垂鐢ㄧ鐞嗚〃鐨勭姸鎬侊紝鍙湁鐘舵�佷负0鎵嶈兘鍒涘缓璐﹀崟
+ Integer[] feeIds = statisticsVo.getIds();
+ if (feeIds != null && feeIds.length > 0) {
+ for (Integer feeId : feeIds) {
+ ReceivableFeeManagement feeManagement = receivableFeeManagementMapper.selectReceivableFeeManagementById(feeId);
+ if (feeManagement != null && !"0".equals(feeManagement.getStatus())) {
+ throw new ServiceException("璐圭敤璁板綍ID涓�" + feeId + "鐨勭姸鎬佷笉鏄緟鐢熸垚璐﹀崟锛屾棤娉曞垱寤鸿处鍗�");
+ }
+ }
+ }
+
Integer billType = billCreateVo.getBillType();
// 2. 鍒涘缓搴旀敹璐﹀崟涓昏褰�
@@ -366,6 +443,15 @@
feeManagement.setRelatedBillNo(billSystemNo);
feeManagement.setStatus("1");
receivableFeeManagementMapper.updateReceivableFeeManagement(feeManagement);
+
+ // 璁板綍鎿嶄綔鏃ュ織
+ ReceivableFeeManagementLog log = new ReceivableFeeManagementLog();
+ log.setReceivableFeeId(feeId);
+ log.setOperator(SecurityUtils.getUsername());
+ log.setOperationTime(DateUtils.getNowDate());
+ log.setOperationDesc("鐢熸垚搴旀敹璐﹀崟锛岃处鍗曠紪鍙凤細" + billSystemNo);
+ log.setCreateTime(DateUtils.getNowDate());
+ logService.insertReceivableFeeManagementLog(log);
}
// 璋冪敤鎵归噺鏇存柊鏂规硶
@@ -374,4 +460,9 @@
return i;
}
-}
\ No newline at end of file
+
+
+
+
+
+ }
\ No newline at end of file
--
Gitblit v1.8.0