From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java | 77 ++++++--------------------------------
1 files changed, 12 insertions(+), 65 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
index 6399b32..e937ba4 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerProductionAccountingServiceImpl.java
@@ -1,78 +1,25 @@
package com.ruoyi.production.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.production.dto.ProductionProductMainDto;
-import com.ruoyi.production.dto.SalesLedgerProductionAccountingDto;
-import com.ruoyi.production.mapper.ProductionProductMainMapper;
-import com.ruoyi.production.mapper.SalesLedgerProductionAccountingMapper;
-import com.ruoyi.production.pojo.SalesLedgerProductionAccounting;
+import com.ruoyi.production.bean.dto.UserAccountDto;
+import com.ruoyi.production.bean.dto.UserProductionAccountingDto;
+import com.ruoyi.production.mapper.ProductionAccountMapper;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import java.math.BigDecimal;
-
-/**
- * @author :yys
- * @date : 2025/7/21 14:41
- */
@Service
@RequiredArgsConstructor
-@Slf4j
-public class SalesLedgerProductionAccountingServiceImpl extends ServiceImpl<SalesLedgerProductionAccountingMapper, SalesLedgerProductionAccounting> implements SalesLedgerProductionAccountingService {
-
- private final SalesLedgerProductionAccountingMapper salesLedgerProductionAccountingMapper;
- private final ProductionProductMainMapper productionProductMainMapper;
+public class SalesLedgerProductionAccountingServiceImpl implements SalesLedgerProductionAccountingService {
+
+ private final ProductionAccountMapper productionAccountMapper;
@Override
- public IPage<SalesLedgerProductionAccountingDto> listPage(Page page, SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto) {
- IPage<SalesLedgerProductionAccountingDto> list = salesLedgerProductionAccountingMapper.listPage(page, salesLedgerProductionAccountingDto);
- list.getRecords().forEach(item -> {
- String[] split = item.getSpecificationModel().split("\\*");
- if(split.length == 2 && isNumeric(split[1])){
- // 璁＄畻宸ヨ祫 = 宸ユ椂瀹氶 * 鏁伴噺 * 瑙勬牸
- item.setWages(item.getWages().multiply(new BigDecimal(split[1])));
- }
- });
- return list;
- }
-
- @Override
- public IPage<SalesLedgerProductionAccountingDto> pageProductionAccounting(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page) {
- // TODO 绠＄悊鍛樻煡璇㈡墍鏈夛紝鍏朵粬浜哄彧鑳芥煡鑷繁
- if (salesLedgerProductionAccountingDto.getDateType().equals("month")) {
- salesLedgerProductionAccountingDto.setEntryDate(null);
- }else {
- salesLedgerProductionAccountingDto.setEntryDateStart(null);
- salesLedgerProductionAccountingDto.setEntryDateEnd(null);
+ public UserAccountDto getByUserId(UserProductionAccountingDto dto) {
+ // 鎸夌敤鎴锋煡璇㈢敓浜ф牳绠椾俊鎭�
+ if (dto == null || dto.getUserId() == null || dto.getDate() == null || dto.getDate().trim().isEmpty()) {
+ return new UserAccountDto();
}
- return salesLedgerProductionAccountingMapper.pageProductionAccounting(page, salesLedgerProductionAccountingDto);
- }
-
- @Override
- public IPage<ProductionProductMainDto> listProductionDetails(SalesLedgerProductionAccountingDto salesLedgerProductionAccountingDto, Page page) {
- if (salesLedgerProductionAccountingDto.getDateType().equals("month")) {
- salesLedgerProductionAccountingDto.setEntryDate(null);
- }else {
- salesLedgerProductionAccountingDto.setEntryDateStart(null);
- salesLedgerProductionAccountingDto.setEntryDateEnd(null);
- }
- return productionProductMainMapper.listProductionDetails(salesLedgerProductionAccountingDto, page);
- }
-
- public static boolean isNumeric(String str) {
- if (str == null || str.isEmpty()) {
- return false;
- }
- // 閬嶅巻瀛楃涓茬殑姣忎釜瀛楃锛屾鏌ユ槸鍚︿负鏁板瓧
- for (int i = 0; i < str.length(); i++) {
- if (!Character.isDigit(str.charAt(i))) {
- return false;
- }
- }
- return true;
+ UserAccountDto result = productionAccountMapper.selectUserAccount(dto.getUserId(), dto.getDate());
+ return result == null ? new UserAccountDto() : result;
}
}
--
Gitblit v1.9.3