From a80905ecb4d344231fc469741b4bede9c3b9411e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Tue, 5 Mar 2024 09:28:34 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8Dbug=E3=80=91172?= =?UTF-8?q?=EF=BC=88=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E6=9C=AA=E5=8C=85?= =?UTF-8?q?=E5=90=AB=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E5=BD=93=E5=A4=A9?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nflg/product/util/DateUtils.java | 15 +++++++ .../java/com/nflg/product/DateTimeTest.java | 40 +++++++++++++++++++ .../service/BomNewMbomParentService.java | 5 +-- .../service/OptionalMbomMaterialService.java | 17 +------- .../domain/EBom/VirtualPackageBase.java | 3 -- .../mapper/master/BomNewMbomParentMapper.xml | 4 +- .../master/OptionalEbomConfigMapper.xml | 2 +- .../mapper/master/OptionalEbomMainMapper.xml | 2 +- .../master/OptionalMbomMaterialMapper.xml | 2 +- 9 files changed, 63 insertions(+), 27 deletions(-) create mode 100644 nflg_project_dev/bom/src/test/java/com/nflg/product/DateTimeTest.java diff --git a/nflg_project_dev/bom/src/main/java/com/nflg/product/util/DateUtils.java b/nflg_project_dev/bom/src/main/java/com/nflg/product/util/DateUtils.java index c85e98c0..20d261bc 100644 --- a/nflg_project_dev/bom/src/main/java/com/nflg/product/util/DateUtils.java +++ b/nflg_project_dev/bom/src/main/java/com/nflg/product/util/DateUtils.java @@ -660,4 +660,19 @@ public class DateUtils extends PropertyEditorSupport { String result = sdf.format(Date.parse(str)); return result; } + + /** + * 在给定的日期上增加指定的时间单位数量。 + * + * @param date 初始日期，操作的基础日期。 + * @param field 时间单位，例如Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH等。 + * @param amount 要增加的数量，可以为负数以表示减少。 + * @return 返回操作后的新日期。 + */ + public static Date add(Date date, int field, int amount) { + Calendar cal = getCalendar(); + cal.setTime(date); + cal.add(field, amount); + return cal.getTime(); + } } \ No newline at end of file diff --git a/nflg_project_dev/bom/src/test/java/com/nflg/product/DateTimeTest.java b/nflg_project_dev/bom/src/test/java/com/nflg/product/DateTimeTest.java new file mode 100644 index 00000000..b68dfe05 --- /dev/null +++ b/nflg_project_dev/bom/src/test/java/com/nflg/product/DateTimeTest.java @@ -0,0 +1,40 @@ +package com.nflg.product; + +import com.nflg.product.util.DateUtils; +import org.junit.Test; +import java.util.Calendar; +import java.util.Date; +import static org.junit.Assert.assertEquals; + +/** + * @author 曹鹏飞 + * @date 2024-03-04 14:07:45 + */ +public class DateTimeTest { + + @Test + public void test1() { + Calendar calendar = Calendar.getInstance(); + calendar.set(2024, 2, 4); + Date date1 = calendar.getTime(); + Date d1 = DateUtils.add(date1, Calendar.DAY_OF_MONTH, 1); + System.out.println("d1: " + DateUtils.date2Str(d1, DateUtils.date_sdf.get())); + calendar.set(2024, 2, 5); + Date d2 = calendar.getTime(); + System.out.println("d2: " + DateUtils.date2Str(d2, DateUtils.date_sdf.get())); + assertEquals(d1, d2); + } + + @Test + public void test2() { + Calendar calendar = Calendar.getInstance(); + calendar.set(2024, Calendar.FEBRUARY, 29); + Date date1 = calendar.getTime(); + Date d1 = DateUtils.add(date1, Calendar.DAY_OF_MONTH, 1); + System.out.println("d1: " + DateUtils.date2Str(d1, DateUtils.date_sdf.get())); + calendar.set(2024, Calendar.MARCH, 1); + Date d2 = calendar.getTime(); + System.out.println("d2: " + DateUtils.date2Str(d2, DateUtils.date_sdf.get())); + assertEquals(d1, d2); + } +} diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java index 869e4766..251903d8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewMbomParentService.java @@ -13,12 +13,11 @@ import com.nflg.product.bomnew.pojo.entity.BomNewMbomParentEntity; import com.nflg.product.bomnew.pojo.query.BomNewMbomParentQuery; import com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO; import com.nflg.product.bomnew.service.domain.MBom.IndexListTree; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** @@ -60,7 +59,7 @@ public class BomNewMbomParentService extends ServiceImpl(query.getPage(), query.getPageSize()), query); if (CollectionUtil.isNotEmpty(page.getRecords())) { - List indexList = page.getRecords().stream().collect(Collectors.toList()); + List indexList = new ArrayList<>(page.getRecords()); page.getRecords().clear(); for (BomNewMbomMiddleVO item : diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index 8eaef66a..f2b8f69c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java @@ -10,39 +10,25 @@ import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.spring.SpringUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.util.TypeUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -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.google.common.collect.ImmutableList; import com.mzt.logapi.context.LogRecordContext; import com.nflg.product.base.core.conmon.util.SessionUtil; import com.nflg.product.base.core.exception.NflgBusinessException; -import com.nflg.product.base.core.vo.PageVO; import com.nflg.product.bomnew.constant.BomConstant; -import com.nflg.product.bomnew.constant.EBomConstant; import com.nflg.product.bomnew.constant.OptionalBomConstant; import com.nflg.product.bomnew.mapper.master.OptionalMbomMaterialMapper; - import com.nflg.product.bomnew.pojo.dto.OptionalMbomMaterialAddDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.ImportSapParamDTO; import com.nflg.product.bomnew.pojo.dto.sap.impart2.T1DTO; import com.nflg.product.bomnew.pojo.entity.MaterialMainEntity; import com.nflg.product.bomnew.pojo.entity.OptionalEbomConfigEntity; import com.nflg.product.bomnew.pojo.entity.OptionalMbomMaterialEntity; - -import com.nflg.product.bomnew.pojo.query.BomNewEbomMaterialQuery; import com.nflg.product.bomnew.pojo.query.OptionalMbomMaterialListQuery; - import com.nflg.product.bomnew.pojo.query.OptionalMbomMaterialQuery; -import com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO; -import com.nflg.product.bomnew.pojo.vo.BomNewMbomMiddleVO; import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialListVO; -import com.nflg.product.bomnew.pojo.vo.OptionalMbomMaterialVO; - import lombok.extern.slf4j.Slf4j; import nflg.product.common.constant.STATE; import nflg.product.common.vo.ResultVO; @@ -51,7 +37,6 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -73,7 +58,7 @@ public class OptionalMbomMaterialService extends ServiceImpl(query.getPage(), query.getPageSize()), query); if (CollectionUtil.isNotEmpty(page.getRecords())) { - List indexList = page.getRecords().stream().collect(Collectors.toList()); + List indexList = new ArrayList<>(page.getRecords()); page.getRecords().clear(); for(OptionalMbomMaterialListVO item : diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java index 87c4a5a0..ac2c8408 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java @@ -10,7 +10,6 @@ import com.nflg.product.bomnew.constant.EBomSourceEnum; import com.nflg.product.bomnew.constant.EbomEditStatusEnum; import com.nflg.product.bomnew.constant.ProjectTypeInputTypeEnum; import com.nflg.product.bomnew.constant.VirtualPackageTypeEnum; -import com.nflg.product.bomnew.pojo.dto.AddMaterialMainDTO; import com.nflg.product.bomnew.pojo.dto.AddVirtrualMaterialDTO; import com.nflg.product.bomnew.pojo.entity.BomNewEbomChildEntity; import com.nflg.product.bomnew.pojo.entity.BomNewEbomParentEntity; @@ -23,8 +22,6 @@ import com.nflg.product.bomnew.service.MaterialService; import com.nflg.product.bomnew.util.VersionUtil; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; -import org.apache.catalina.authenticator.jaspic.CallbackHandlerImpl; -import sun.security.krb5.internal.PAData; import java.io.IOException; import java.math.BigDecimal; diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml index 6db99766..9eafcf22 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml @@ -66,7 +66,7 @@ - = #{query.startDate} and created_time <=#{query.endDate}]]> + @@ -88,7 +88,7 @@ - = #{query.startDate} and sysn_sap_time <=#{query.endDate}]]> + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml index 2e2c8845..0ad9c8b1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomConfigMapper.xml @@ -63,7 +63,7 @@ - = #{query.startDate} and t1.created_time <= #{query.endDate} ]]> + order by t1.created_time desc diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml index 8468eb3c..0ecf460c 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalEbomMainMapper.xml @@ -42,7 +42,7 @@ - = #{query.startDate} and created_time <= #{query.endDate}]]> + diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml index 07a4bba5..f6d3fb50 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/OptionalMbomMaterialMapper.xml @@ -78,7 +78,7 @@ row_id,parent_row_id,level_row_id,material_no,material_name,material_desc,drawin - = #{query.startDate} and t1.created_time <= #{query.endDate}]]> +