From 656d84011dfae275cb8209dad601fcb61a22ee17 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 01 十二月 2023 09:34:35 +0800
Subject: [PATCH] feat: 退回单增加机构字段
---
consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java | 57 +++++++++++++++++++++++++++++----------------------------
1 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
index 6449cb7..29710be 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormScrappedServiceImpl.java
@@ -9,6 +9,7 @@
import com.consum.base.pojo.LWhFormScrappedGoodsInfoParam;
import com.consum.base.pojo.LWhFormScrappedGoodsModelParams;
import com.consum.base.pojo.LWhFormScrappedParam;
+import com.consum.base.pojo.excel.ScrappedInfoExcelTemplate;
import com.consum.base.pojo.query.LWhFormScrappedQry;
import com.consum.base.pojo.response.FormScrappedGoodsDetailVO;
import com.consum.base.pojo.response.FormScrappedGoodsVO;
@@ -190,7 +191,7 @@
scrappedGoodsList.add(scrappedGoods);
}
- int flag2 = this.scrappedGoodsService.insert(scrappedGoodsList);
+ int flag2 = this.scrappedGoodsService.insertBatch(scrappedGoodsList);
if (flag2 != scrappedGoodsList.size()) {
log.error("鏂板鎶ュ簾鍗曠墿鍝佽褰� 澶辫触");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -363,37 +364,37 @@
return pageUtil;
}
- public List<Map<String, Object>> export(Long id) {
-
+ public List<ScrappedInfoExcelTemplate> export(Long id) {
String sql =
- "SELECT BUSINESS_FORM_CODE, fs.DEAL_TIME, OPERATOR_NAME, AGENCY_NAME, GOODS_TEMPLATE_NAME, BASE_GOODS_MODELS_NAME, DEPARTMENT_NAME, COUNTS, SCRAPPED_NAME, BEIZ "
- + "FROM l_wh_form_scrapped_goods fsg LEFT JOIN l_wh_form_scrapped fs ON fs.id = fsg.FORM_SCRAPPED_ID WHERE "
- + "fs.ID = :id and STATES = 1";
+ "SELECT\n"
+ + "\tBUSINESS_FORM_CODE,\n"
+ + "\tfs.DEAL_TIME,\n"
+ + "\tOPERATOR_NAME,\n"
+ + "\tAGENCY_NAME tenantName,\n"
+ + "\tGOODS_TEMPLATE_NAME templateName,\n"
+ + "\tBASE_GOODS_MODELS_NAME baseModelName,\n"
+ + "\tCOUNTS num,\n"
+ + "\tSCRAPPED_NAME deception,\n"
+ + "\tBEIZ remark\n"
+ + "FROM\n"
+ + "\tl_wh_form_scrapped_goods fsg\n"
+ + "\tLEFT JOIN l_wh_form_scrapped fs ON fs.id = fsg.FORM_SCRAPPED_ID\n"
+ + "WHERE\n"
+ + "\tfs.ID = :id\n"
+ + "\tAND STATES = 1";
Map<String, Object> param = new HashMap<>();
param.put("id", id);
List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
- return select;
+ if (CollectionUtils.isEmpty(select)) {
+ return null;
+ }
+ List<ScrappedInfoExcelTemplate> list = Lists.newArrayList();
+ select.forEach(item -> {
+ ScrappedInfoExcelTemplate inventoryExcelTemplate = MapUtils.convertMapToObj(item, ScrappedInfoExcelTemplate.class);
+ list.add(inventoryExcelTemplate);
+ });
+ return list;
}
- /**
- * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
- * @Author 鍗㈠簡闃�
- * @Date 2023/11/2
- */
-// public LWhFormScrappedExtendVO export(Long id, FinSysTenantUser sysInfo) {
-// LWhFormScrappedExtendVO scrappedExtend = new LWhFormScrappedExtendVO();
-// //1.鏌ヨ鎶ュ簾鍗�
-// LWhFormScrapped lWhFormScrapped = this.get(new LWhFormScrapped(id));
-// if (lWhFormScrapped != null) {
-// lWhFormScrapped.setDealTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-// lWhFormScrapped.setOperatorName(sysInfo.getUserName());
-// BeanUtils.copyProperties(lWhFormScrapped, scrappedExtend);
-// }
-// //2.鏌ヨ鎶ュ簾鍗曠墿鍝�
-// List<LWhFormScrappedGoods> scrappedGoodsList = this.scrappedGoodsService.getByFormScrappedId(id);
-// if (!CollectionUtils.isEmpty(scrappedGoodsList)) {
-// scrappedExtend.setScrappedGoodsList(scrappedGoodsList);
-// }
-// return scrappedExtend;
-// }
+
}
--
Gitblit v1.9.1