From 3cdd7777e63ddc18e23b31d37eadb04c3e1ea9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 23 Oct 2024 16:43:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=89=B9=E9=87=8F=E8=A1=A8=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F=E6=98=BE=E7=A4=BA,?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F=E5=88=97?= =?UTF-8?q?,=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F=E5=88=97?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java | 3 +++ src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java | 2 ++ src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java | 3 +++ .../dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java index 9ebb6b9..6156498 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmCzplpNew.java @@ -172,6 +172,8 @@ public class DmCzplpNew implements Serializable { private String xfqLqb1; + private int dataOrder; + public static DmCzplpNew createByExcel(String dcCh, String fd, ZrcAndPlb item){ DmCzplpNew plp = new DmCzplpNew(); plp.setDcCh(dcCh); @@ -191,6 +193,7 @@ public class DmCzplpNew implements Serializable { plp.setXfqDhqd(item.getDhqd()); plp.setBcdq(item.getGldq()); plp.setZt("0"); + plp.setDataOrder(item.getDataOrder()); return plp; } } diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java index 4024734..6b88d0e 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/ZrcAndPlb.java @@ -37,4 +37,6 @@ public class ZrcAndPlb { @ExcelProperty(value = "备注") public String bz; + + public int dataOrder; } diff --git a/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java b/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java index cd09012..8cfa701 100644 --- a/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java +++ b/src/main/java/com/dsic/gj_erp/listeners/ExcelZrcAndPlb.java @@ -8,15 +8,18 @@ import lombok.Getter; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; @Getter public class ExcelZrcAndPlb extends AnalysisEventListener { private List list; + private final AtomicInteger dataOrder=new AtomicInteger(0); @Override public void invoke(ZrcAndPlb zrcAndPlb, AnalysisContext analysisContext) { zrcAndPlb.setDcPl(StrUtil.padPre(zrcAndPlb.getDcPl(),3,"0")); + zrcAndPlb.setDataOrder(dataOrder.getAndIncrement()); list.add(zrcAndPlb); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java index 896cd06..4b3d943 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java @@ -410,7 +410,7 @@ public class DmCzplpNewServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); qw.eq(StrUtil.isNotEmpty((String) map.get("dcch")), "dc_ch", (String) map.get("dcch")); qw.eq(StrUtil.isNotEmpty((String) map.get("dcpl")), "dc_pl", (String) map.get("dcpl")); - qw.orderBy(true, true, "len(dc_pl)","dc_pl"); + qw.orderBy(true, true, "data_order"); if((Boolean) map.get("flag")){ List list= dmCbxxpService.list(new QueryWrapper()