From 9a06ee9dce80eab19a4e693e887a936848f3f5d7 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Wed, 9 Jan 2019 15:44:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=85=8D=E7=BD=AE=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E2=80=98=E5=8C=B9=E9=85=8D=E5=8C=BA=E5=9F=9F=E2=80=99?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=BB=98=E8=AE=A4=E5=80=BC=E9=97=AE=E9=A2=98?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/excel/ExportExcel.java | 12 ++++++++---- .../excel/thread/CheckComplexStringFormatThread.java | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 1d7daf7a1..7eb9f2345 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -250,6 +250,13 @@ public class ExportExcel { index++; } } + if("redirect_url".equals(headerStr)) { + commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n"; + index++; + //1、非空 + commentStr=commentStr+"▶"+msgProp.getProperty("required")+"\n"; + index++; + } /*** HTTP(s)阻断 应答码 ***/ if("response_code".equals(headerStr)){ commentStr=""; @@ -1071,10 +1078,7 @@ public class ExportExcel { index++; commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n"; index++; - //1、非空说明 - commentStr=commentStr+"▶"+msgProp.getProperty("required")+"\n"; - index++; - //2、默认值说明 + //1、默认值说明 if(!StringUtil.isEmpty(defaultValue)){ commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n"; index++; diff --git a/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java index fa2a07844..39c971897 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckComplexStringFormatThread.java @@ -217,14 +217,15 @@ public class CheckComplexStringFormatThread implements Callable{ } if (StringUtils.isNotBlank(dirtrictP)) { if (StringUtils.isBlank(district)) { - if (dirtrictP.indexOf(",") == -1) { + /*if (dirtrictP.indexOf(",") == -1) { baseStringCfg.setDistrict(dirtrictP); } else { // baseStringCfg.setDistrict(dirtrictP.split(",")[0]); errInfo.append( String.format(prop.getProperty("can_not_null"), prop.getProperty("district") + " ") + ";"); - } + }*/ + baseStringCfg.setDistrict(dirtrictP.split(",")[0]); } else if (dirtrictP.indexOf(district) == -1) { errInfo.append( String.format(prop.getProperty("is_incorrect"), prop.getProperty("district") + " ")