From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java | 69 ++++++++++++++++++++++++++++++----
1 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java
index e8e3126..9c1843c 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionAccountServiceImpl.java
@@ -1,20 +1,73 @@
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.bean.dto.ProductionAccountDto;
+import com.ruoyi.production.bean.dto.ProductionProductMainDto;
+import com.ruoyi.production.bean.vo.ProductionAccountVo;
import com.ruoyi.production.mapper.ProductionAccountMapper;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
import com.ruoyi.production.pojo.ProductionAccount;
import com.ruoyi.production.service.ProductionAccountService;
+import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
-/**
- * <p>
- * 鐢熶骇鏍哥畻琛� 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
- * @since 2026-04-21 03:55:52
- */
+import java.time.LocalDate;
+
@Service
+@RequiredArgsConstructor
public class ProductionAccountServiceImpl extends ServiceImpl<ProductionAccountMapper, ProductionAccount> implements ProductionAccountService {
+
+ private final ProductionProductMainMapper productionProductMainMapper;
+
+ @Override
+ public IPage<ProductionAccountVo> listPage(Page<ProductionAccountDto> page, ProductionAccountDto dto) {
+ ProductionAccountDto queryDto = normalizeDateQuery(dto);
+ return baseMapper.listPage(page, queryDto);
+ }
+
+ @Override
+ public IPage<ProductionProductMainDto> listProductionDetails(ProductionAccountDto dto, Page page) {
+ return productionProductMainMapper.listProductionDetails(normalizeDateQuery(dto), page);
+ }
+
+ private ProductionAccountDto normalizeDateQuery(ProductionAccountDto dto) {
+ if (dto == null) {
+ return new ProductionAccountDto();
+ }
+ LocalDate[] dateRange = dto.getDateRange();
+ if ((dto.getEntryDateStart() == null || dto.getEntryDateEnd() == null)
+ && dateRange != null
+ && dateRange.length > 0) {
+ if (dto.getEntryDateStart() == null) {
+ dto.setEntryDateStart(dateRange[0]);
+ }
+ if (dto.getEntryDateEnd() == null) {
+ dto.setEntryDateEnd(dateRange.length > 1 ? dateRange[1] : dateRange[0]);
+ }
+ }
+
+ String dateType = dto.getDateType();
+ if ("day".equalsIgnoreCase(dateType)) {
+ if (dto.getEntryDate() == null && dateRange != null && dateRange.length > 0) {
+ dto.setEntryDate(dateRange[0]);
+ }
+ if (dto.getEntryDate() == null) {
+ dto.setEntryDate(dto.getEntryDateStart());
+ }
+ dto.setEntryDateStart(null);
+ dto.setEntryDateEnd(null);
+ } else if ("month".equalsIgnoreCase(dateType)) {
+ if ((dto.getEntryDateStart() == null || dto.getEntryDateEnd() == null) && dto.getEntryDate() != null) {
+ LocalDate monthDate = dto.getEntryDate();
+ dto.setEntryDateStart(monthDate.withDayOfMonth(1));
+ dto.setEntryDateEnd(monthDate.withDayOfMonth(monthDate.lengthOfMonth()));
+ }
+ dto.setEntryDate(null);
+ }
+ return dto;
+ }
+
}
--
Gitblit v1.9.3