1.批量表按照导入顺序显示,增加导入顺序列,调整查询逻辑按照导入顺序列排序

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;
     }
 }

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;
 }

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<ZrcAndPlb> {
 
     private List<ZrcAndPlb> 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);
     }
 

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java

@@ -410,7 +410,7 @@ public class DmCzplpNewServiceImpl extends ServiceImpl<DmCzplpNewMapper, DmCzplp
         QueryWrapper<DmCzplpNew> 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<DmCbxxp> list= dmCbxxpService.list(new QueryWrapper<DmCbxxp>()