From dcfaf0d7c20aec3ae32c14ce65a5584689398640 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期五, 13 二月 2026 17:56:09 +0800
Subject: [PATCH] 部分代码逻辑优化

---
 src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java                |    4 -
 src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java         |    3 -
 src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java |    3 -
 src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java               |    3 -
 src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java                   |    7 +--
 src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java             |    3 -
 src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java                  |    2 -
 src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java                             |    4 -
 src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java              |    3 -
 src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java                |   13 ++----
 src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java                    |   19 +++++++--
 src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java                             |    4 -
 src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java                               |    1 
 src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java                       |    5 +-
 src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java                        |    1 
 src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java                                      |    6 ---
 src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java                         |    7 +--
 17 files changed, 35 insertions(+), 53 deletions(-)

diff --git a/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java
index fa13fa9..83e82b4 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/NotificationManagementServiceImpl.java
@@ -17,8 +17,6 @@
 
     @Override
     public IPage<NotificationManagement> listpage(Page page, NotificationManagement notificationManagement) {
-//        // 1. 鍒涘缓 Page 瀹炰緥锛圛Page 瀹炵幇绫伙級锛屾寚瀹氶〉鐮佸拰姣忛〉鏉℃暟
-//        IPage<NotificationManagement> page1 = new Page<>(page.getCurrent(), page.getSize());
         return notificationManagementMapper.listpage(page,notificationManagement);
     }
 }
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
index 1cdd838..0592318 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/service/impl/NoticeServiceImpl.java
@@ -1,8 +1,6 @@
 package com.ruoyi.collaborativeApproval.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.collaborativeApproval.dto.NoticeDTO;
@@ -16,6 +14,8 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -42,12 +42,23 @@
 
     @Override
     public List<NoticeDTO> selectCount() {
-        List<Notice> notices = noticeMapper.selectList(Wrappers.lambdaQuery(Notice.class).groupBy(Notice::getType));
+        List<Notice> noticesList = noticeMapper.selectList(null);
+        Map<String, Notice> uniqueByType = noticesList.stream()
+                .collect(Collectors.toMap(
+                        Notice::getType,
+                        n -> n,
+                        (existing, replacement) -> existing
+                ));
+
+        List<Notice> notices = new ArrayList<>(uniqueByType.values());
+        Map<String, Long> countMap = noticesList.stream().collect(Collectors.groupingBy(Notice::getType, Collectors.counting()));
         List<NoticeDTO> result = new ArrayList<>();
         for (Notice notice : notices) {
             NoticeDTO notice1 = new NoticeDTO();
             BeanUtils.copyProperties(notice, notice1);
-            notice1.setCount(noticeMapper.selectCount(new LambdaQueryWrapper<Notice>().eq(Notice::getType, notice.getType())));
+            if (countMap.containsKey(notice.getType())) {
+                notice1.setCount(countMap.get(notice.getType()) == null ? 0 : countMap.get(notice.getType()));
+            }
             result.add(notice1);
         }
         return result;
diff --git a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
index 2e0d744..04a3c48 100644
--- a/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/compensationperformance/service/impl/CompensationPerformanceServiceImpl.java
@@ -24,7 +24,6 @@
 
     @Override
     public IPage<CompensationPerformance> listPage(Page page, CompensationPerformance compensationPerformance) {
-        IPage<CompensationPerformance> compensationPerformanceIPage = compensationPerformanceMapper.listPage(page, compensationPerformance);
-        return compensationPerformanceIPage;
+        return compensationPerformanceMapper.listPage(page, compensationPerformance);
     }
 }
diff --git a/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java b/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
index 722ab60..434cc20 100644
--- a/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
+++ b/src/main/java/com/ruoyi/customervisits/pojo/CustomerVisits.java
@@ -1,18 +1,12 @@
 package com.ruoyi.customervisits.pojo;
 
 import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Builder;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.Date;
 
 /**
  * @author :yys
diff --git a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
index 319d478..d63fcb8 100644
--- a/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
+++ b/src/main/java/com/ruoyi/customervisits/service/impl/CustomerVisitsServiceImpl.java
@@ -30,22 +30,21 @@
         if (customerVisits != null && !StringUtils.isEmpty(customerVisits.getCustomerName())) {
             customerVisitsLambdaQueryWrapper.like(CustomerVisits::getCustomerName, customerVisits.getCustomerName());
         }
-        Page page1 = customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
-        return page1;
+        return customerVisitsMapper.selectPage(page, customerVisitsLambdaQueryWrapper);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean updateCustomerVisit(CustomerVisits customerVisits) {
         if (customerVisits == null || customerVisits.getId() == null) {
-            return false;
+            throw new RuntimeException("瀹㈡埛ID涓嶈兘涓虹┖");
         }
 
         if (StringUtils.isEmpty(customerVisits.getCustomerName())
                 || StringUtils.isEmpty(customerVisits.getPurposeVisit())
                 || StringUtils.isEmpty(customerVisits.getVisitAddress())
                 || StringUtils.isEmpty(customerVisits.getPurposeDate())) {
-            return false;
+            throw new RuntimeException("瀹㈡埛鍚嶇О銆佹嫓璁跨洰鐨勩�佹嫓璁垮湴鍧�銆佹嫓璁挎椂闂翠笉鑳戒负绌�");
         }
 
         return updateById(customerVisits);
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
index 10c4f5f..b0e9c0d 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -52,10 +52,9 @@
     public boolean updateByDDR(DeviceDefectRecord deviceDefectRecord) {
         String status = deviceDefectRecord.getStatus();
         if (status.equals("涓ラ噸缂洪櫡")) {
-//            deviceDefectRecord.setStatus("姝e父");
-//            deviceDefectRecord.setEliminateTime(LocalDateTime.now());
             throw new RuntimeException("涓ラ噸缂洪櫡-璁惧缁翠慨鍚庢洿鏂颁负姝e父鐘舵��");
-        } else if (status.equals("涓�鑸己闄�")) {
+        }
+        if (status.equals("涓�鑸己闄�")) {
             deviceDefectRecord.setStatus("姝e父");
         }
         deviceDefectRecord.setEliminateTime(LocalDateTime.now());
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index b614149..0e2d317 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -82,9 +82,7 @@
             util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鍙拌处瀵煎嚭");
         }else  {
             ArrayList<Long> arrayList = new ArrayList<>();
-            Arrays.stream(ids).map(id -> {
-                return arrayList.add( id);
-            });
+            Arrays.stream(ids).map(arrayList::add);
             List<DeviceLedger> supplierManageList = deviceLedgerMapper.selectBatchIds(arrayList);
             ArrayList<DeviceLedgerExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
             supplierManageList.stream().forEach(deviceLedger -> {
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 6e90b28..4370b51 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -59,7 +59,6 @@
             DeviceMaintenanceExeclDto deviceRepairExeclDto = new DeviceMaintenanceExeclDto();
             BeanUtils.copyProperties(deviceMaintenance,deviceRepairExeclDto);
             deviceRepairExeclDto.setStatus(deviceMaintenance.getStatus() == 0 ? "寰呯淮淇�" : deviceMaintenance.getStatus() == 1 ? "瀹岀粨" : "澶辫触");
-//            deviceRepairExeclDto.setMaintenanceResult(deviceMaintenance.getMaintenanceResult() != null && deviceMaintenance.getMaintenanceResult() == 0 ? "缁翠慨" : "瀹屽ソ");
             deviceLedgerExeclDtos.add(deviceRepairExeclDto);
         });
         ExcelUtil<DeviceMaintenanceExeclDto> util = new ExcelUtil<DeviceMaintenanceExeclDto>(DeviceMaintenanceExeclDto.class);
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index feab01b..ffdedbf 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -90,9 +90,7 @@
             util.exportExcel(response, deviceLedgerExeclDtos, "璁惧鎶ヤ慨瀵煎嚭");
         }else {
             ArrayList<Long> arrayList = new ArrayList<>();
-            Arrays.stream(ids).map(id -> {
-                return arrayList.add( id);
-            });
+            Arrays.stream(ids).map(arrayList::add);
             List<DeviceRepair> supplierManageList = deviceRepairMapper.selectBatchIds(arrayList);
             ArrayList<DeviceRepairExeclDto> deviceLedgerExeclDtos = new ArrayList<>();
             supplierManageList.stream().forEach(deviceRepair -> {
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
index 4eabf91..cf7805f 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EnergyPeriodServiceImpl.java
@@ -18,7 +18,6 @@
 
     @Override
     public IPage<EnergyPeriod> listPage(Page page, EnergyPeriod energyPeriod) {
-        IPage<EnergyPeriod> listPage = energyPeriodMapper.listPage(page, energyPeriod);
-        return listPage;
+        return energyPeriodMapper.listPage(page, energyPeriod);
     }
 }
diff --git a/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java b/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java
index b462f36..f4ce6cf 100644
--- a/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java
+++ b/src/main/java/com/ruoyi/oA/service/impl/OaProjectPhaseServiceImpl.java
@@ -41,7 +41,6 @@
         List<OaProjectPhaseDto> collect = oaProjectPhases.stream().map(oaProjectPhase -> {
             OaProjectPhaseDto oaProjectPhaseDto = new OaProjectPhaseDto();
             BeanUtils.copyProperties(oaProjectPhase, oaProjectPhaseDto);
-//            List<OaProjectPhaseTask> oaProjectPhaseTasks = oaProjectPhaseTaskService.listByPhaseId(oaProjectPhaseDto.getPhaseId());
             oaProjectPhaseDto.setOaProjectPhaseTasks(oaProjectPhaseTaskService.listByPhaseId(oaProjectPhaseDto.getPhaseId()));
             return oaProjectPhaseDto;
         }).collect(Collectors.toList());
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
index 772869b..886c7b5 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/GasTankWarningServiceImpl.java
@@ -1,12 +1,11 @@
 package com.ruoyi.procurementrecord.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.procurementrecord.dto.ProcurementPageDto;
 import com.ruoyi.procurementrecord.mapper.GasTankWarningMapper;
 import com.ruoyi.procurementrecord.pojo.GasTankWarning;
 import com.ruoyi.procurementrecord.service.GasTankWarningService;
@@ -14,7 +13,6 @@
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -28,12 +26,11 @@
 
     @Override
     public void export(HttpServletResponse response, List<Long> ids) {
-        List<GasTankWarning> list = new ArrayList<>();
-        if(CollectionUtils.isEmpty(ids)){
-            list = gasTankWarningMapper.selectList(null);
-        }else {
-            list = gasTankWarningMapper.selectBatchIds(ids);
+        LambdaQueryWrapper<GasTankWarning> objectLambdaQueryWrapper = new LambdaQueryWrapper<GasTankWarning>();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            objectLambdaQueryWrapper.in(GasTankWarning::getId, ids);
         }
+        List<GasTankWarning> list = gasTankWarningMapper.selectList(objectLambdaQueryWrapper);
         ExcelUtil<GasTankWarning> util = new ExcelUtil<>(GasTankWarning.class);
         util.exportExcel(response, list, "鍌ㄦ皵缃愰璀�.xlsx");
     }
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java
index 5e8fa72..23226fd 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/InboundManagementServiceImpl.java
@@ -23,7 +23,6 @@
 
     @Override
     public IPage<InboundManagement> listPage(Page page, InboundManagement inboundManagement) {
-        IPage<InboundManagement> result = inboundManagementMapper.listPage(page, inboundManagement);
-        return result;
+        return inboundManagementMapper.listPage(page, inboundManagement);
     }
 }
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java
index 81216db..1e6671b 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementPlanServiceImpl.java
@@ -28,8 +28,7 @@
 
     @Override
     public IPage<ProcurementPlan> listPage(Page page, ProcurementPlan procurementPlan) {
-        IPage<ProcurementPlan> result = procurementPlanMapper.listPage(page, procurementPlan);
-        return result;
+        return procurementPlanMapper.listPage(page, procurementPlan);
     }
 
     @Override
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index ef3f242..366484e 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -23,7 +23,6 @@
 
     @Override
     public IPage<ReturnManagement> listPage(Page page, ReturnManagement returnManagement) {
-        IPage<ReturnManagement> returnManagementIPage =  returnManagementMapper.listPage(page, returnManagement);
-        return returnManagementIPage;
+        return returnManagementMapper.listPage(page, returnManagement);
     }
 }
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
index b3beded..8a090ad 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.production.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,21 +9,17 @@
 import com.ruoyi.production.mapper.ProcessRouteItemMapper;
 import com.ruoyi.production.mapper.ProcessRouteMapper;
 import com.ruoyi.production.mapper.ProductOrderMapper;
-import com.ruoyi.production.mapper.ProductProcessRouteMapper;
 import com.ruoyi.production.pojo.ProcessRoute;
 import com.ruoyi.production.pojo.ProcessRouteItem;
 import com.ruoyi.production.pojo.ProductOrder;
-import com.ruoyi.production.pojo.ProductProcessRoute;
 import com.ruoyi.production.service.ProcessRouteService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
 import java.util.List;
 
 @Service
@@ -60,7 +57,7 @@
     public int batchDelete(List<Long> ids) {
         //鍏堝垽鏂槸鍚﹀凡缁忓紩鐢ㄤ簡
         List<ProductOrder> productOrders = productOrderMapper.selectList(Wrappers.<ProductOrder>lambdaQuery().in(ProductOrder::getRouteId, ids));
-        if (productOrders.size()>0){
+        if (CollectionUtils.isNotEmpty(productOrders)){
             throw new RuntimeException("璇ュ伐鑹鸿矾绾跨敓浜у凡寮曠敤锛屼笉鑳藉垹闄�");
         }
         //鍒犻櫎宸ヨ壓璺嚎璇︽儏
diff --git a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
index 81fd76f..929bed2 100644
--- a/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/SalesLedgerSchedulingServiceImpl.java
@@ -4,7 +4,6 @@
 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.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.security.LoginUser;
@@ -25,7 +24,6 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -151,7 +149,7 @@
             }
             // 鑾峰彇绌轰綑鐐掓満
             String[] split = productionDispatchAddDto.getSpeculativeTradingName().split(",");
-            if(split != null && split.length == 0){
+            if(split.length == 0){
                 i++;
                 continue;
             }

--
Gitblit v1.9.3