From 0864f009837acdfae5657ec81ca544e69ef227ae Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期一, 22 十二月 2025 16:03:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
service/src/main/java/com/ruoyi/cwgl/mapper/ReceivableFeeManagementLogMapper.java | 87 ++++++++++
service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementLogService.java | 102 ++++++++++++
service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagementLog.java | 59 +++++++
service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementLogServiceImpl.java | 181 ++++++++++++++++++++++
4 files changed, 429 insertions(+), 0 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagementLog.java b/service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagementLog.java
new file mode 100644
index 0000000..2e0c3da
--- /dev/null
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/ReceivableFeeManagementLog.java
@@ -0,0 +1,59 @@
+package com.ruoyi.cwgl.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.util.Date;
+import lombok.Data;
+/**
+ * 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織瀵硅薄 receivable_fee_management_log
+ *
+ * @author ruoyi
+ * @date 2025-12-22
+ */
+@Data
+public class ReceivableFeeManagementLog{
+
+
+ /** 鏃ュ織ID */
+ @TableField("id")
+ private Integer id;
+
+
+ /** 鍏宠仈鐨勫簲鏀惰垂鐢ㄧ鐞咺D */
+ @Excel(name = "鍏宠仈鐨勫簲鏀惰垂鐢ㄧ鐞咺D")
+
+ @TableField("receivable_fee_id")
+ private Integer receivableFeeId;
+
+
+ /** 鎿嶄綔浜猴紙鍒涘缓浜猴級 */
+ @Excel(name = "鎿嶄綔浜�", readConverterExp = "鍒�=寤轰汉")
+
+ @TableField("operator")
+ private String operator;
+
+
+ /** 鎿嶄綔鏃堕棿 */
+ @Excel(name = "鎿嶄綔鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("operation_time")
+ private Date operationTime;
+
+
+ /** 鎿嶄綔鎻忚堪 */
+ @Excel(name = "鎿嶄綔鎻忚堪")
+
+ @TableField("operation_desc")
+ private String operationDesc;
+
+
+ /** 璁板綍鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField("create_time")
+ private Date createTime;
+
+
+}
diff --git a/service/src/main/java/com/ruoyi/cwgl/mapper/ReceivableFeeManagementLogMapper.java b/service/src/main/java/com/ruoyi/cwgl/mapper/ReceivableFeeManagementLogMapper.java
new file mode 100644
index 0000000..5598783
--- /dev/null
+++ b/service/src/main/java/com/ruoyi/cwgl/mapper/ReceivableFeeManagementLogMapper.java
@@ -0,0 +1,87 @@
+package com.ruoyi.cwgl.mapper;
+
+import java.util.List;
+import com.ruoyi.cwgl.domain.ReceivableFeeManagementLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2025-12-22
+ */
+public interface ReceivableFeeManagementLogMapper extends BaseMapper<ReceivableFeeManagementLog>
+{
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織ID
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+ public ReceivableFeeManagementLog selectReceivableFeeManagementLogById(Integer id);
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織 璁板綍鏁�
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織闆嗗悎
+ */
+ public int selectReceivableFeeManagementLogCount(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織闆嗗悎
+ */
+ public List<ReceivableFeeManagementLog> selectReceivableFeeManagementLogList(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int insertReceivableFeeManagementLog(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織[鎵归噺]
+ *
+ * @param receivableFeeManagementLogs 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int insertReceivableFeeManagementLogBatch(List<ReceivableFeeManagementLog> receivableFeeManagementLogs);
+
+ /**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int updateReceivableFeeManagementLog(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織[鎵归噺]
+ *
+ * @param receivableFeeManagementLogs 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int updateReceivableFeeManagementLogBatch(List<ReceivableFeeManagementLog> receivableFeeManagementLogs);
+
+ /**
+ * 鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織ID
+ * @return 缁撴灉
+ */
+ public int deleteReceivableFeeManagementLogById(Integer id);
+
+ /**
+ * 鎵归噺鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @return 缁撴灉
+ */
+ public int deleteReceivableFeeManagementLogByIds(Integer[] ids);
+}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementLogService.java b/service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementLogService.java
new file mode 100644
index 0000000..040a81f
--- /dev/null
+++ b/service/src/main/java/com/ruoyi/cwgl/service/IReceivableFeeManagementLogService.java
@@ -0,0 +1,102 @@
+package com.ruoyi.cwgl.service;
+
+import java.util.List;
+import com.ruoyi.cwgl.domain.ReceivableFeeManagementLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+/**
+ * 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2025-12-22
+ */
+public interface IReceivableFeeManagementLogService extends IService<ReceivableFeeManagementLog>
+{
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織ID
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+ public ReceivableFeeManagementLog selectReceivableFeeManagementLogById(Integer id);
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織 璁板綍鏁�
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織闆嗗悎
+ */
+ public int selectReceivableFeeManagementLogCount(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織闆嗗悎
+ */
+ public List<ReceivableFeeManagementLog> selectReceivableFeeManagementLogList(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃 寮傛 瀵煎嚭
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織闆嗗悎
+ */
+ public void export(ReceivableFeeManagementLog receivableFeeManagementLog, String exportKey) ;
+
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int insertReceivableFeeManagementLog(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織[鎵归噺]
+ *
+ * @param receivableFeeManagementLogs 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int insertReceivableFeeManagementLogBatch(List<ReceivableFeeManagementLog> receivableFeeManagementLogs);
+
+ /**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int updateReceivableFeeManagementLog(ReceivableFeeManagementLog receivableFeeManagementLog);
+
+ /**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織[鎵归噺]
+ *
+ * @param receivableFeeManagementLogs 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ public int updateReceivableFeeManagementLogBatch(List<ReceivableFeeManagementLog> receivableFeeManagementLogs);
+ /**
+ * 鎵归噺鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @return 缁撴灉
+ */
+ public int deleteReceivableFeeManagementLogByIds(String ids);
+
+ /**
+ * 鎵归噺鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @return 缁撴灉
+ */
+ public int deleteReceivableFeeManagementLogByIds(Integer[] ids);
+
+ /**
+ * 鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織淇℃伅
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織ID
+ * @return 缁撴灉
+ */
+ public int deleteReceivableFeeManagementLogById(Integer id);
+}
diff --git a/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementLogServiceImpl.java b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementLogServiceImpl.java
new file mode 100644
index 0000000..beffa75
--- /dev/null
+++ b/service/src/main/java/com/ruoyi/cwgl/service/impl/ReceivableFeeManagementLogServiceImpl.java
@@ -0,0 +1,181 @@
+package com.ruoyi.cwgl.service.impl;
+
+import java.util.List;
+
+import com.ruoyi.common.utils.DateUtils;
+import javax.annotation.Resource;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.stereotype.Service;
+import org.springframework.scheduling.annotation.Async;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.core.service.BaseService;
+
+import com.ruoyi.cwgl.mapper.ReceivableFeeManagementLogMapper;
+import com.ruoyi.cwgl.domain.ReceivableFeeManagementLog;
+import com.ruoyi.cwgl.service.IReceivableFeeManagementLogService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2025-12-22
+ */
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class ReceivableFeeManagementLogServiceImpl extends BaseService<ReceivableFeeManagementLogMapper, ReceivableFeeManagementLog> implements IReceivableFeeManagementLogService
+{
+ protected final Logger logger = LoggerFactory.getLogger(getClass());
+ @Resource
+ private ReceivableFeeManagementLogMapper receivableFeeManagementLogMapper;
+
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織ID
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+ @DataSource(DataSourceType.SLAVE)
+ @Override
+ public ReceivableFeeManagementLog selectReceivableFeeManagementLogById(Integer id)
+ {
+ return receivableFeeManagementLogMapper.selectReceivableFeeManagementLogById(id);
+ }
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織 璁板綍鏁�
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織闆嗗悎
+ */
+ @DataSource(DataSourceType.SLAVE)
+ @Override
+ public int selectReceivableFeeManagementLogCount(ReceivableFeeManagementLog receivableFeeManagementLog)
+ {
+ return receivableFeeManagementLogMapper.selectReceivableFeeManagementLogCount(receivableFeeManagementLog);
+ }
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ */
+ @DataSource(DataSourceType.SLAVE)
+ @Override
+ public List<ReceivableFeeManagementLog> selectReceivableFeeManagementLogList(ReceivableFeeManagementLog receivableFeeManagementLog)
+ {
+ return receivableFeeManagementLogMapper.selectReceivableFeeManagementLogList(receivableFeeManagementLog);
+ }
+
+ /**
+ * 鏌ヨ搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織鍒楄〃 寮傛 瀵煎嚭
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @param exportKey 瀵煎嚭鍔熻兘鐨勫敮涓�鏍囪瘑
+ * @return 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織闆嗗悎
+ */
+ @DataSource(DataSourceType.SLAVE)
+ @Async
+ @Override
+ public void export(ReceivableFeeManagementLog receivableFeeManagementLog,String exportKey) {
+
+ super.export(ReceivableFeeManagementLog.class,exportKey,"receivableFeeManagementLogData",(pageNum)->{
+ PageUtils.startPage(pageNum, Constants.EXPORT_PATE_SIZE);
+ return selectReceivableFeeManagementLogList(receivableFeeManagementLog);
+ });
+ }
+
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertReceivableFeeManagementLog(ReceivableFeeManagementLog receivableFeeManagementLog)
+ {
+ receivableFeeManagementLog.setCreateTime(DateUtils.getNowDate());
+ return receivableFeeManagementLogMapper.insertReceivableFeeManagementLog(receivableFeeManagementLog);
+ }
+
+ /**
+ * 鏂板搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織[鎵归噺]
+ *
+ * @param receivableFeeManagementLogs 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ @Override
+ public int insertReceivableFeeManagementLogBatch(List<ReceivableFeeManagementLog> receivableFeeManagementLogs)
+ {
+ int rows = receivableFeeManagementLogMapper.insertReceivableFeeManagementLogBatch(receivableFeeManagementLogs);
+ return rows;
+ }
+
+ /**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ *
+ * @param receivableFeeManagementLog 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateReceivableFeeManagementLog(ReceivableFeeManagementLog receivableFeeManagementLog)
+ {
+ return receivableFeeManagementLogMapper.updateReceivableFeeManagementLog(receivableFeeManagementLog);
+ }
+
+ /**
+ * 淇敼搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織[鎵归噺]
+ *
+ * @param receivableFeeManagementLogs 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織
+ * @return 缁撴灉
+ */
+ @Override
+ public int updateReceivableFeeManagementLogBatch(List<ReceivableFeeManagementLog> receivableFeeManagementLogs){
+ return receivableFeeManagementLogMapper.updateReceivableFeeManagementLogBatch(receivableFeeManagementLogs);
+ }
+
+ /**
+ * 鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織瀵硅薄
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteReceivableFeeManagementLogByIds(String ids)
+ {
+ return deleteReceivableFeeManagementLogByIds(Convert.toIntArray(ids));
+ }
+
+ /**
+ * 鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織瀵硅薄
+ *
+ *
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteReceivableFeeManagementLogByIds(Integer[] ids)
+ {
+ return receivableFeeManagementLogMapper.deleteReceivableFeeManagementLogByIds(ids);
+ }
+
+ /**
+ * 鍒犻櫎搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織淇℃伅
+ *
+ * @param id 搴旀敹璐圭敤绠＄悊鎿嶄綔鏃ュ織ID
+ * @return 缁撴灉
+ */
+ @Override
+ public int deleteReceivableFeeManagementLogById(Integer id)
+ {
+ return receivableFeeManagementLogMapper.deleteReceivableFeeManagementLogById(id);
+ }
+}
--
Gitblit v1.8.0