From 9f20dd76651ce075d52e38cb32f76ec552dc2d8a Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Fri, 8 Mar 2019 10:31:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8A=A5=E8=A1=A8=20?= =?UTF-8?q?=E5=8D=95=E5=8F=B7=E7=94=9F=E6=88=90=E8=A7=84=E5=88=99=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=87=8D=E7=BD=AE=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/core/apiservice/util/ExcelUtil.java | 2 +- .../i3plus/core/apiservice/util/OrderNoMakeUtil.java | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java index e1945f9..c07d7c6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java @@ -423,7 +423,7 @@ public class ExcelUtil { for (SysFile sysFile:fileList) { letter.append(""); letter.append(sysFile.getFileOriginalName()); - letter.append(""); + letter.append("
"); } // 消息提示 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java index cbad512..3dca8cb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.util; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import com.alibaba.fastjson.JSON; import java.text.MessageFormat; import java.text.SimpleDateFormat; @@ -20,7 +21,7 @@ public class OrderNoMakeUtil { StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule()); String[] dateTime = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()).split("-"); - // 单号表达式的 + // 单号表达式 replace(orderNo, PlatformConstWords.YEAR, dateTime[0]); replace(orderNo, PlatformConstWords.MONTH, dateTime[1]); replace(orderNo, PlatformConstWords.DAY, dateTime[2]); @@ -28,14 +29,15 @@ public class OrderNoMakeUtil { replace(orderNo, PlatformConstWords.MINUTE, dateTime[4]); replace(orderNo, PlatformConstWords.SECOND, dateTime[5]); - // 流水号长度补全 - String serialNumberFormatStr = MessageFormat.format(PlatformConstWords.SERIAL_NO_FORMAT, orderNoRule.getSerialNoLength()); + // 流水号长度补全表达式 + String serialNoFormatStr = MessageFormat.format(PlatformConstWords.SERIAL_NO_FORMAT, orderNoRule.getSerialNoLength()); + // 判断是否首次生成（SerialNo初始值-1） if (orderNoRule.getSerialNo() > 0) { - Long serialNo = orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement(); - // 达到最大值后循环或继续 - if(orderNoRule.getSerialNoLength().intValue() < String.valueOf(serialNo).length() - && orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ + String newNo = orderNo.substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO)); + String oldNo = orderNoRule.getOrderNo().substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO)); + // 前缀（日期）不同后是否重置流水号 + if(!newNo.equals(oldNo) && orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed()); } else { orderNoRule.setSerialNo(orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement()); @@ -43,7 +45,7 @@ public class OrderNoMakeUtil { } else { orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed()); } - replace(orderNo, PlatformConstWords.SERIAL_NO, String.format(serialNumberFormatStr, orderNoRule.getSerialNo())); + replace(orderNo, PlatformConstWords.SERIAL_NO, String.format(serialNoFormatStr, orderNoRule.getSerialNo())); orderNoRule.setOrderNo(orderNo.toString()); return orderNoRule;