product_platform/yxt-yyth-biz
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1/10

Browse Source
This commit is contained in:
wangpengfei
2024-01-10 15:18:04 +08:00
parent 50584ff739
commit 6836410a07
5 changed files with 38 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java
View File

@@ -32,4 +32,7 @@ public class LpkReserveOrderVo implements Vo {
private String goodsName;
private String goodsNumber;
private String serialNumber;
private String linker;
private String linkPhone;
private String address;
}

10
src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByBank.java
View File

@@ -27,6 +27,16 @@ public class ReserveOrderExportByBank {
@ColumnWidth(20)
@ExcelProperty(value = "商品数量(份)",index = 3)
private String goodsNumber;
@ColumnWidth(20)
@ExcelProperty(value = "联系人",index = 4)
private String linker;
@ColumnWidth(20)
@ExcelProperty(value = "联系电话",index = 5)
private String linkPhone;
@ColumnWidth(50)
@ExcelProperty(value = "地址",index = 6)
private String address;
@ExcelIgnore
private String storeSid;
@ExcelIgnore

9
src/main/java/com/yxt/yyth/api/lpkreserveorder/ReserveOrderExportByStore.java
View File

@@ -35,6 +35,15 @@ public class ReserveOrderExportByStore {
@ColumnWidth(20)
@ExcelProperty(value = "商品数量(份)",index = 4)
private String goodsNumber;
@ColumnWidth(20)
@ExcelProperty(value = "联系人",index = 5)
private String linker;
@ColumnWidth(20)
@ExcelProperty(value = "联系电话",index = 6)
private String linkPhone;
@ColumnWidth(50)
@ExcelProperty(value = "地址",index = 7)
private String address;
@ExcelIgnore
private String storeSid;

20
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.xml
View File

@@ -96,7 +96,10 @@
s.sid as storeSid,
d.name as bankName,
t.goodsSid as goodsSid,
sum(t.goodsNumber) as goodsNumber
sum(t.goodsNumber) as goodsNumber,
d.linker,
d.linkPhone,
d.address
from lpk_reserve_order as o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
left join lpk_store as s on o.storeSid = s.sid
@@ -115,7 +118,10 @@
s.sid as storeSid,
d.name as bankName,
t.goodsSid as goodsSid,
sum(t.goodsNumber) as goodsNumber
sum(t.goodsNumber) as goodsNumber,
s.linker,
s.phone as linkPhone,
s.address
from lpk_reserve_order as o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
left join lpk_store as s on o.storeSid = s.sid
@@ -323,7 +329,10 @@
s.sid as storeSid,
d.name as bankName,
t.goodsSid as goodsSid,
sum(t.goodsNumber) as goodsNumber
sum(t.goodsNumber) as goodsNumber,
d.linker,
d.linkPhone,
d.address
from lpk_reserve_order as o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
left join lpk_store as s on o.storeSid = s.sid
@@ -342,7 +351,10 @@
s.sid as storeSid,
d.name as bankName,
t.goodsSid as goodsSid,
sum(t.goodsNumber) as goodsNumber
sum(t.goodsNumber) as goodsNumber,
s.linker,
s.phone as linkPhone,
s.address
from lpk_reserve_order as o
LEFT JOIN lpk_reserve_order_goods AS t ON t.orderSid = o.sid
left join lpk_store as s on o.storeSid = s.sid

164
src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java
View File

@@ -175,38 +175,6 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
records.forEach(s -> {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
s.setGoodsName(lpkGoods.getName());
// List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),sdf.format(s.getReserveDate()));
// List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selInOrderSid(list);
// List<String> a=new ArrayList<>();
// if (!orderGoods.isEmpty()) {
// StringBuffer sb = new StringBuffer();
// for (LpkReserveOrderGoods orderGood : orderGoods) {
// String num = "";
// String goodsName = "";
// String finWord = "";
// String unitName = "";
// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
// if (null != lpkGoods) {
// goodsName = lpkGoods.getName();
// if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
// unitName = lpkGoods.getUnitName();
// }
// }
// }
// if (orderGood.getGoodsNumber() != 0) {
// num = String.valueOf((int) orderGood.getGoodsNumber());
// }
// finWord = goodsName + num + unitName ;
// a.add(finWord);
//// sb.append(finWord).append("、");
// }
// if (sb.length() > 0) {
// sb.delete(sb.length() - 1, sb.length());
// s.setGoodsInfo(sb.toString());
// }
// }
// s.setGoods(a);
});
}
PagerVo<LpkReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
@@ -247,38 +215,6 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
records.forEach(s -> {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
s.setGoodsName(lpkGoods.getName());
// List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),sdf.format(s.getReserveDate()));
// List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selInOrderSid(list);
// List<String> a=new ArrayList<>();
// if (!orderGoods.isEmpty()) {
// StringBuffer sb = new StringBuffer();
// for (LpkReserveOrderGoods orderGood : orderGoods) {
// String num = "";
// String goodsName = "";
// String finWord = "";
// String unitName = "";
// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
// if (null != lpkGoods) {
// goodsName = lpkGoods.getName();
// if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
// unitName = lpkGoods.getUnitName();
// }
// }
// }
// if (orderGood.getGoodsNumber() != 0) {
// num = String.valueOf((int) orderGood.getGoodsNumber());
// }
// finWord = goodsName + num + unitName ;
// a.add(finWord);
// sb.append(finWord).append("、");
// }
// if (sb.length() > 0) {
// sb.delete(sb.length() - 1, sb.length());
// s.setGoodsInfo(sb.toString());
// }
// }
// s.setGoods(a);
});
}
PagerVo<LpkReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
@@ -322,38 +258,6 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
records.forEach(s -> {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
s.setGoodsName(lpkGoods.getName());
// List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),sdf.format(s.getReserveDate()));
// List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selInOrderSid(list);
// List<String> a=new ArrayList<>();
// if (!orderGoods.isEmpty()) {
// StringBuffer sb = new StringBuffer();
// for (LpkReserveOrderGoods orderGood : orderGoods) {
// String num = "";
// String goodsName = "";
// String finWord = "";
// String unitName = "";
// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
// if (null != lpkGoods) {
// goodsName = lpkGoods.getName();
// if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
// unitName = lpkGoods.getUnitName();
// }
// }
// }
// if (orderGood.getGoodsNumber() != 0) {
// num = String.valueOf((int) orderGood.getGoodsNumber());
// }
// finWord = goodsName + num + unitName ;
// a.add(finWord);
// sb.append(finWord).append("、");
// }
// if (sb.length() > 0) {
// sb.delete(sb.length() - 1, sb.length());
// s.setGoodsInfo(sb.toString());
// }
// }
// s.setGoods(a);
});
}
PagerVo<LpkReserveOrderVo> p = PagerUtil.pageToVo(pagging, null);
@@ -563,40 +467,6 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
exportList.forEach(s -> {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
s.setGoodsName(lpkGoods.getName());
// List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),s.getReserveDate());
// List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selInOrderSid(list);
// if (!orderGoods.isEmpty()) {
// int i=0;
// for (LpkReserveOrderGoods orderGood : orderGoods) {
// String num = "";
// String goodsName = "";
// String finWord = "";
// String unitName = "";
// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
// if (null != lpkGoods) {
// goodsName = lpkGoods.getName();
// if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
// unitName = lpkGoods.getUnitName();
// }
// }
// }
// if (orderGood.getGoodsNumber() != 0) {
// num = String.valueOf((int) orderGood.getGoodsNumber());
// }
// finWord = goodsName+ num + unitName;
// i++;
// if(i>1){
// ReserveOrderExportByStore en=new ReserveOrderExportByStore();
// BeanUtil.copyProperties(s,en , "id");
// en.setGoodsInfo(finWord);
// exportList1.add(en);
// }else{
// s.setGoodsInfo(finWord);
// exportList1.add(s);
// }
// }
// }
});
}
//定义导出的excel名字
@@ -659,40 +529,6 @@ public class LpkReserveOrderService extends MybatisBaseService<LpkReserveOrderMa
exportList.forEach(s -> {
LpkGoods lpkGoods = lpkGoodsService.fetchBySid(s.getGoodsSid());
s.setGoodsName(lpkGoods.getName());
// List<String> list=baseMapper.getOrderByStore(s.getStoreSid(),s.getReserveDate());
// List<LpkReserveOrderGoods> orderGoods = lpkReserveOrderGoodsService.selInOrderSid(list);
// if (!orderGoods.isEmpty()) {
// int i=0;
// for (LpkReserveOrderGoods orderGood : orderGoods) {
// String num = "";
// String goodsName = "";
// String finWord = "";
// String unitName = "";
// if (StringUtils.isNotBlank(orderGood.getGoodsSid())) {
// LpkGoods lpkGoods = lpkGoodsService.fetchBySid(orderGood.getGoodsSid());
// if (null != lpkGoods) {
// goodsName = lpkGoods.getName();
// if (StringUtils.isNotBlank(lpkGoods.getUnitName())) {
// unitName = lpkGoods.getUnitName();
// }
// }
// }
// if (orderGood.getGoodsNumber() != 0) {
// num = String.valueOf((int) orderGood.getGoodsNumber());
// }
// finWord = goodsName+ num + unitName;
// i++;
// if(i>1){
// ReserveOrderExportByBank en=new ReserveOrderExportByBank();
// BeanUtil.copyProperties(s,en , "id");
// en.setGoodsInfo(finWord);
// exportList1.add(en);
// }else{
// s.setGoodsInfo(finWord);
// exportList1.add(s);
// }
// }
// }
});
}
//定义导出的excel名字