From e664ecea34426fdfa934b76ecee4a293fe6204b1 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 13 Apr 2022 17:49:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95---?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/BussDocumentLibraryEO.java | 4 +- .../dummy/entity/DummyInventoryInfoEO.java | 13 ++++++- .../impl/DummyInventoryInfoEOServiceImpl.java | 39 +++++++++++++++---- 3 files changed, 45 insertions(+), 11 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java index 4e7368d63..c464e2147 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/entity/BussDocumentLibraryEO.java @@ -68,14 +68,14 @@ public class BussDocumentLibraryEO implements Serializable { @ApiModelProperty(value = "新车型实施日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - private java.lang.String xin1Che1Xing2Shi2Shi1Ri4Qi1; + private java.util.Date xin1Che1Xing2Shi2Shi1Ri4Qi1; /**在产车实施日期*/ @Excel(name = "在产车实施日期", width = 15) @ApiModelProperty(value = "在产车实施日期") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") - private java.lang.String implementTime; + private java.util.Date implementTime; /**对应标准*/ @Excel(name = "对应标准", width = 15) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java index c156f194c..4fd9a5884 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEO.java @@ -85,6 +85,7 @@ public class DummyInventoryInfoEO implements Serializable { /**状态*/ @Excel(name = "状态", width = 15) @ApiModelProperty(value = "状态") + @Dict(dicCode ="state") private java.lang.String state; /**技术领域*/ @@ -95,12 +96,16 @@ public class DummyInventoryInfoEO implements Serializable { /**新车型实施日期*/ @Excel(name = "新车型实施日期", width = 15) @ApiModelProperty(value = "新车型实施日期") - private java.lang.String xin1Che1Xing2Shi2Shi1Ri4Qi1; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private java.util.Date xin1Che1Xing2Shi2Shi1Ri4Qi1; /**在产车实施日期*/ @Excel(name = "在产车实施日期", width = 15) @ApiModelProperty(value = "在产车实施日期") - private java.lang.String implementTime; + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + private java.util.Date implementTime; /**对应标准*/ @Excel(name = "对应标准", width = 15) @@ -205,4 +210,8 @@ public class DummyInventoryInfoEO implements Serializable { @TableField(exist = false) private String cut; + /**文档库id*/ + @TableField(exist = false) + private String ids; + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index edbdd64d0..3524b4d16 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1,15 +1,24 @@ package com.jero.modules.dummy.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.jero.modules.document.entity.BussDocumentLibraryEO; +import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.mapper.DummyInventoryInfoEOMapper; import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; -import java.util.Date; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.UUID; /** * @Description: 虚拟清单详情表 @@ -20,6 +29,9 @@ import javax.servlet.http.HttpServletResponse; @Service public class DummyInventoryInfoEOServiceImpl extends ServiceImpl implements IDummyInventoryInfoEOService { + + @Autowired + private IBussDocumentLibraryEOService iBussDocumentLibraryEOService; /** * 保存 * @@ -28,10 +40,23 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.in(BussDocumentLibraryEO::getId, Arrays.asList(dummyInventoryInfoEO.getIds().split(","))); + List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(wrapper); + + List list = new ArrayList<>(); + for (BussDocumentLibraryEO bussDocumentLibraryEO : bussDocumentLibraryEOList) { + DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO(); + BeanUtils.copyProperties(bussDocumentLibraryEO,dummyInventoryInfoEOTemp); + String id = UUID.randomUUID().toString().replace("-", ""); + dummyInventoryInfoEOTemp.setId(id); + dummyInventoryInfoEOTemp.setCreateTime(new Date()); + dummyInventoryInfoEOTemp.setUpdateTime(new Date()); + list.add(dummyInventoryInfoEOTemp); + } + this.saveBatch(list); + } } /**