From 9ff7e9a2c0e6fc338d8a239566ef9346081fa672 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 21 五月 2026 09:47:41 +0800
Subject: [PATCH] refactor(account): 删除BorrowInfo借款信息相关代码及接口
---
/dev/null | 22 ----------------------
src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java | 16 ++--------------
src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java | 1 -
3 files changed, 2 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
deleted file mode 100644
index 7620c19..0000000
--- a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.ruoyi.account.controller;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.BorrowInfo;
-import com.ruoyi.account.service.BorrowInfoService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.Operation;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import jakarta.servlet.http.HttpServletResponse;
-import java.util.List;
-
-/**
- * <p>
- * 鍊熸淇℃伅琛� 鍓嶇鎺у埗鍣�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-01-15 02:57:29
- */
-@Tag(name = "鍊熸淇℃伅琛�")
-@RestController
-@RequestMapping("/borrowInfo")
-@AllArgsConstructor
-public class BorrowInfoController {
-
- private BorrowInfoService borrowInfoService;
-
- @GetMapping("/listPage")
- @Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
- return borrowInfoService.listPage(page,borrowInfo);
- }
-
- /**
- * 鏂板
- */
- @PostMapping("/add")
- @Transactional(rollbackFor = Exception.class)
- @Log(title = "鏂板鍊熸淇℃伅", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody BorrowInfo borrowInfo) {
- return borrowInfoService.add(borrowInfo);
- }
-
- /**
- * 淇敼
- */
- @PostMapping("/update")
- @Transactional(rollbackFor = Exception.class)
- @Log(title = "淇敼鍊熸淇℃伅", businessType = BusinessType.UPDATE)
- public AjaxResult updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
- return borrowInfoService.updateBorrowInfo(borrowInfo);
- }
-
-
- /**
- * 鍒犻櫎
- */
- @DeleteMapping("/delete")
- @Transactional(rollbackFor = Exception.class)
- @Log(title = "鍒犻櫎鍊熸淇℃伅", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- return borrowInfoService.delete(ids);
- }
-
- /**
- * 瀵煎嚭
- */
- @PostMapping("/export")
- @Operation(summary = "瀵煎嚭鍊熸淇℃伅")
- public void export(HttpServletResponse response, BorrowInfo borrowInfo) {
- List<BorrowInfo> list = borrowInfoService.list();
- ExcelUtil<BorrowInfo> util = new ExcelUtil<>(BorrowInfo.class);
- util.exportExcel(response,list, "鍊熸淇℃伅鏁版嵁");
- }
-
-
-}
diff --git a/src/main/java/com/ruoyi/account/mapper/BorrowInfoMapper.java b/src/main/java/com/ruoyi/account/mapper/BorrowInfoMapper.java
deleted file mode 100644
index bcac543..0000000
--- a/src/main/java/com/ruoyi/account/mapper/BorrowInfoMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.account.mapper;
-
-import com.ruoyi.account.pojo.BorrowInfo;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 鍊熸淇℃伅琛� Mapper 鎺ュ彛
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-01-15 02:57:29
- */
-@Mapper
-public interface BorrowInfoMapper extends BaseMapper<BorrowInfo> {
-
-}
diff --git a/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java b/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
deleted file mode 100644
index 8e4d809..0000000
--- a/src/main/java/com/ruoyi/account/pojo/BorrowInfo.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.ruoyi.account.pojo;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.dto.DateQueryDto;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-/**
- * <p>
- * 鍊熸淇℃伅琛�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-01-15 02:57:29
- */
-@Getter
-@Setter
-@TableName("borrow_info")
-@Schema(name = "BorrowInfo瀵硅薄", description = "鍊熸淇℃伅琛�")
-public class BorrowInfo extends DateQueryDto implements Serializable{
-
- private static final long serialVersionUID = 1L;
-
- @Schema(description = "鍊熸璁板綍涓婚敭ID")
- @TableId(value = "id", type = IdType.AUTO)
- private Long id;
-
- @Schema(description = "鍊熸浜哄鍚�")
- @Excel(name = "鍊熸浜哄鍚�")
- private String borrowerName;
-
- @Schema(description = "鍊熸閲戦锛堝厓锛�")
- @Excel(name = "鍊熸閲戦锛堝厓锛�")
- private BigDecimal borrowAmount;
-
- @Schema(description = "鍊熸鍒╃巼锛堝锛�5.85 浠ｈ〃5.85%锛�")
- @Excel(name = "鍊熸鍒╃巼")
- private BigDecimal interestRate;
-
- @Schema(description = "鍊熸鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍊熸鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private LocalDate borrowDate;
-
- @Schema(description = "瀹為檯杩樻鏃ユ湡锛堣繕娆惧悗濉厖锛�")
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "瀹為檯杩樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- private LocalDate repayDate;
-
- @Schema(description = "鍊熸鐘舵�侊細1=寰呰繕娆撅紝2=宸茶繕娆�")
- @Excel(name = "鍊熸鐘舵��", readConverterExp = "1=寰呰繕娆�,2=宸茶繕娆�")
- private Integer status;
-
- @Schema(description = "澶囨敞锛堝�熸璇存槑锛�")
- @Excel(name = "澶囨敞")
- private String remark;
-
- @Schema(description = "鍒涘缓鏃堕棿")
- @TableField(fill = FieldFill.INSERT)
- private LocalDateTime createTime;
-
- @Schema(description = "鍒涘缓鑰匢D")
- @TableField(fill = FieldFill.INSERT)
- private Integer createUser;
-
- @Schema(description = "淇敼鏃堕棿")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private LocalDateTime updateTime;
-
- @Schema(description = "淇敼鑰匢D")
- @TableField(fill = FieldFill.INSERT_UPDATE)
- private Integer updateUser;
-
- @Schema(description = "绉熸埛id")
- @TableField(fill = FieldFill.INSERT)
- private Long tenantId;
-
- @TableField(fill = FieldFill.INSERT)
- private Long deptId;
-}
diff --git a/src/main/java/com/ruoyi/account/service/BorrowInfoService.java b/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
deleted file mode 100644
index eb1c83b..0000000
--- a/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.ruoyi.account.service;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.account.pojo.BorrowInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍊熸淇℃伅琛� 鏈嶅姟绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-01-15 02:57:29
- */
-public interface BorrowInfoService extends IService<BorrowInfo> {
-
- AjaxResult listPage(Page page, BorrowInfo borrowInfo);
-
- AjaxResult add(BorrowInfo borrowInfo);
-
- AjaxResult updateBorrowInfo(BorrowInfo borrowInfo);
-
- AjaxResult delete(List<Long> ids);
-}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
index ab38285..01f5687 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
@@ -6,8 +6,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.bean.dto.DeviceTypeDetail;
import com.ruoyi.account.bean.dto.DeviceTypeDistributionVO;
-import com.ruoyi.account.mapper.BorrowInfoMapper;
-import com.ruoyi.account.pojo.BorrowInfo;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.framework.web.domain.AjaxResult;
@@ -38,7 +36,6 @@
public class AccountingServiceImpl {
private final DeviceLedgerMapper deviceLedgerMapper;
- private final BorrowInfoMapper borrowInfoMapper;
private final CustomStorageMapper customStorageMapper;
private final ProcurementRecordMapper procurementRecordMapper;
private final ProcurementRecordOutMapper procurementRecordOutMapper;
@@ -75,17 +72,8 @@
map.put("netValue",reduce.subtract(total));
}
// 璐熷��
- LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
- borrowInfoLambdaQueryWrapper.like(BorrowInfo::getCreateTime,year)
- .eq(BorrowInfo::getStatus,1);
- List<BorrowInfo> borrowInfos = borrowInfoMapper.selectList(borrowInfoLambdaQueryWrapper);
- if(CollectionUtils.isNotEmpty(borrowInfos)){
- BigDecimal reduce = borrowInfos.stream()
- .map(BorrowInfo::getBorrowAmount)
- .filter(Objects::nonNull)
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- map.put("debt",reduce);
- }
+ map.put("debt",BigDecimal.ZERO);
+
// 搴撳瓨璧勪骇
LambdaQueryWrapper<ProcurementRecordStorage> procurementRecordStorageLambdaQueryWrapper = new LambdaQueryWrapper<>();
procurementRecordStorageLambdaQueryWrapper.like(ProcurementRecordStorage::getCreateTime,year);
diff --git a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
deleted file mode 100644
index 4df1d44..0000000
--- a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.ruoyi.account.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.account.mapper.BorrowInfoMapper;
-import com.ruoyi.account.pojo.BorrowInfo;
-import com.ruoyi.account.service.BorrowInfoService;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 鍊熸淇℃伅琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-01-15 02:57:29
- */
-@Service
-@Slf4j
-@RequiredArgsConstructor
-public class BorrowInfoServiceImpl extends ServiceImpl<BorrowInfoMapper, BorrowInfo> implements BorrowInfoService {
-
- private final BorrowInfoMapper borrowInfoMapper;
-
- @Override
- public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
- LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if(borrowInfo != null){
- if(StringUtils.isNotEmpty(borrowInfo.getEntryDateStart()) && StringUtils.isNotEmpty(borrowInfo.getEntryDateEnd())){
- borrowInfoLambdaQueryWrapper.ge(BorrowInfo::getBorrowDate, borrowInfo.getEntryDateStart());
- borrowInfoLambdaQueryWrapper.le(BorrowInfo::getBorrowDate, borrowInfo.getEntryDateEnd());
- }
- if(borrowInfo.getStatus() != null){
- borrowInfoLambdaQueryWrapper.eq(BorrowInfo::getStatus, borrowInfo.getStatus());
- }
- if(StringUtils.isNotEmpty(borrowInfo.getBorrowerName())){
- borrowInfoLambdaQueryWrapper.like(BorrowInfo::getBorrowerName, borrowInfo.getBorrowerName());
- }
- }
- return AjaxResult.success(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
- }
-
- @Override
- public AjaxResult add(BorrowInfo borrowInfo) {
- int insert = borrowInfoMapper.insert(borrowInfo);
- if(insert > 0){
- return AjaxResult.success("娣诲姞鎴愬姛");
- }
- return AjaxResult.success("娣诲姞澶辫触");
- }
-
- @Override
- public AjaxResult updateBorrowInfo(BorrowInfo borrowInfo) {
- int update = borrowInfoMapper.updateById(borrowInfo);
- if(update > 0){
- return AjaxResult.success("淇敼鎴愬姛");
- }
- return AjaxResult.success("淇敼澶辫触");
- }
-
- @Override
- public AjaxResult delete(List<Long> ids) {
- int delete = borrowInfoMapper.deleteBatchIds(ids);
- if(delete > 0){
- return AjaxResult.success("鍒犻櫎鎴愬姛");
- }
- return AjaxResult.success("鍒犻櫎澶辫触");
- }
-}
diff --git a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
index 03b70d2..622750a 100644
--- a/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
+++ b/src/main/java/com/ruoyi/basic/enums/RecordTypeEnum.java
@@ -199,7 +199,6 @@
AFTER_SALES_SERVICE_FILE("after_sales_service_file"),
AFTER_SALES_NEAR_EXPIRY("after_sales_near_expiry"),
// Account
- BORROW_INFO("borrow_info"),
SALES_REFUND_AMOUNT_ORDER("sales_refund_amount_order"),
SALES_RECEIPT_RETURN("sales_receipt_return"),
FIN_VOUCHER("fin_voucher"),
diff --git a/src/main/resources/mapper/account/BorrowInfoMapper.xml b/src/main/resources/mapper/account/BorrowInfoMapper.xml
deleted file mode 100644
index f21c8d7..0000000
--- a/src/main/resources/mapper/account/BorrowInfoMapper.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.account.mapper.BorrowInfoMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.BorrowInfo">
- <id column="id" property="id" />
- <result column="borrower_name" property="borrowerName" />
- <result column="borrow_amount" property="borrowAmount" />
- <result column="interest_rate" property="interestRate" />
- <result column="borrow_date" property="borrowDate" />
- <result column="repay_date" property="repayDate" />
- <result column="status" property="status" />
- <result column="remark" property="remark" />
- <result column="create_time" property="createTime" />
- <result column="create_user" property="createUser" />
- <result column="update_time" property="updateTime" />
- <result column="update_user" property="updateUser" />
- <result column="tenant_id" property="tenantId" />
- </resultMap>
-
-</mapper>
--
Gitblit v1.9.3