From 1d899eda72d0cc3202162ceff3768f281df78b14 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 14 Apr 2022 15:44:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4--=E5=90=8C=E6=AD=A5=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryInfoEOServiceImpl.java | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

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 c64dbc3ea..73dc81ec1 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
@@ -53,6 +53,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	@Override
 	public IPage<DummyInventoryInfoEO> getPageInfo(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
 		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO, req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		Page<DummyInventoryInfoEO> page = new Page<DummyInventoryInfoEO>(dummyInventoryInfoEO.getPageNo(), dummyInventoryInfoEO.getPageSize());
 		IPage<DummyInventoryInfoEO> pageInfo = this.page(page, queryWrapper);
 		//技术领域处理
@@ -122,8 +123,25 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	 */
 	@Override
     public void deleteByIds(List<String> ids) {
-        removeByIds(ids);
-    }
+        //文件同步删除
+		LambdaQueryWrapper<DummyInventoryInfoEO> wrapper = new LambdaQueryWrapper<>();
+		wrapper.in(DummyInventoryInfoEO::getId,ids);
+		List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(wrapper);
+		List<String> fileIdList = new ArrayList<>();
+		for (DummyInventoryInfoEO dummyInventoryInfoEO : dummyInventoryInfoEOList) {
+			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){
+				fileIdList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(",")));
+			}
+			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){
+				fileIdList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(",")));
+			}
+			if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){
+				fileIdList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(",")));
+			}
+		}
+		iOSSFileService.removeByIds(fileIdList);
+		removeByIds(ids);
+	}
 
 	/**
 	 * 通过id查询
@@ -144,6 +162,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	@Override
     public List<DummyInventoryInfoEO> queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) {
 		QueryWrapper<DummyInventoryInfoEO> queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap());
+		queryWrapper.orderByDesc("create_time");
 		List<DummyInventoryInfoEO> dummyInventoryInfoEOList = this.list(queryWrapper);
 		//技术领域处理
 		treeDict(dummyInventoryInfoEO, dummyInventoryInfoEOList);
@@ -175,6 +194,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl<DummyInventoryI
 	 */
 	@Override
 	public void setBatch(List<DummyInventoryInfoEO> dummyInventoryInfoEOList) {
+		this.updateBatchById(dummyInventoryInfoEOList);
 
 	}