From d76150bdd83f9730694c8b74dcf2af461ab0296d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Mon, 28 Oct 2024 11:20:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=97=A5=E7=A8=8B?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E5=AF=BC=E5=85=A5=E9=A1=BA=E5=BA=8F=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java | 6 ++++++ .../gj_erp/service/jcsj/impl/DmCzplpNewServiceImpl.java | 2 +- .../dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java | 2 +- src/main/resources/application.properties | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java index f6a8032..6efc216 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java @@ -140,6 +140,8 @@ public class DmZrcjh implements Serializable { @ApiModelProperty(value = "编制日期 yyyy/MM/dd") private String bzrq; + private int dataOrder; + public static DmZrcjh createByExcel(String dcCh, String fd, ZrcAndPlb item){ DmZrcjh dmZrcjh = new DmZrcjh(); dmZrcjh.setDcCh(dcCh); @@ -151,13 +153,17 @@ public class DmZrcjh implements Serializable { throw new ServiceException(10001,"吨位不是数字"); } dmZrcjh.setGjks(item.getGjks()); + dmZrcjh.setKssjDz(item.getGjks()); + dmZrcjh.setKssjXz(item.getGjks()); dmZrcjh.setGjjsDz(item.getGjjs()); dmZrcjh.setGjjsXz(item.getGjjs()); + dmZrcjh.setJssjXz(item.getGjjs()); dmZrcjh.setXfqTlt(item.getTlt()); dmZrcjh.setXfqLqb(item.getBclqb()); dmZrcjh.setXfqDhqd(item.getDhqd()); dmZrcjh.setBcdq(item.getGldq()); dmZrcjh.setZt("0"); + dmZrcjh.setDataOrder(item.getDataOrder()); return dmZrcjh; } } 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 4b3d943..da7a62a 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, "data_order"); + qw.orderBy(true, true, "CONVERT(date, gjks, 20),data_order"); if((Boolean) map.get("flag")){ List list= dmCbxxpService.list(new QueryWrapper() diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java index 2a1e753..6c373e5 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java @@ -73,7 +73,7 @@ public class DmZrcjhServiceImpl extends ServiceImpl impl if (StringUtils.isNotEmpty(json.getString("dcCh"))) { queryWrapper.eq("DC_CH", json.getString("dcCh")); } - queryWrapper.orderByAsc("DC_CH,cast(DC_PL as int)"); + queryWrapper.orderByAsc("DC_CH,CONVERT(date, gjks, 20),data_order"); // queryWrapper.orderByAsc("DC_PL"); List dmZrcjhs = dmZrcjhMapper.selectList(queryWrapper); return dmZrcjhs; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 8ad0969..db0265a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -22,8 +22,8 @@ spring.servlet.multipart.enabled = true server.port=8081 spring.datasource.master.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver -spring.datasource.master.url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP -spring.datasource.master.jdbc-url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP +spring.datasource.master.url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP_java +spring.datasource.master.jdbc-url=jdbc:sqlserver://192.127.0.3:1433;DatabaseName=GJ_ERP_java spring.datasource.master.username=sa spring.datasource.master.password=gjerp spring.datasource.master.initialize=true