1.增加中日程按照导入顺序显示

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

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, "data_order");
+        qw.orderBy(true, true, "CONVERT(date, gjks, 20),data_order");
 
         if((Boolean) map.get("flag")){
             List<DmCbxxp> list= dmCbxxpService.list(new QueryWrapper<DmCbxxp>()

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmZrcjhServiceImpl.java

@@ -73,7 +73,7 @@ public class DmZrcjhServiceImpl extends ServiceImpl<DmZrcjhMapper, DmZrcjh> 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<DmZrcjh> dmZrcjhs = dmZrcjhMapper.selectList(queryWrapper);
         return dmZrcjhs;

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.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
+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