From d106d3908d54227e372fbac9d3e41e8985cacb7d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 8 Jan 2024 17:05:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=AF=BC=E5=85=A5BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessEsAnnualInitServiceImpl.java | 10 ++++------ .../ProcessEsAnnualReportServiceImpl.java | 10 ++++------ .../modules/activiti/util/ExcelUtils.java | 13 ++++++++++++- ...度制修订计划（各部门主动上报）导入模板.xls | Bin 27136 -> 27648 bytes .../年度制修订计划（标准化发起）导入模板.xls | Bin 27648 -> 27648 bytes 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index 74dc881f..af40a6f2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -667,7 +667,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl 50) { - errMsg.append("'新企标名称'过长（最多50字）。"); - } + errMsg.append(excelUtils.validStandardName(newEnStandardName)); return errMsg.toString(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 74d94d8f..898db8df 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -503,7 +503,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl 50) { - errMsg.append("'新企标名称'过长（最多50字）。"); - } + errMsg.append(excelUtils.validStandardName(newEnStandardName)); return errMsg.toString(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java index 46747dab..ac8dfe59 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java @@ -10,6 +10,7 @@ import com.jero.modules.laws.common.util.ImportUtil; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.system.entity.SysDictItem; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; @@ -77,7 +78,7 @@ public class ExcelUtils { public static List getHeaderFromExcel(InputStream is, Integer index) throws Exception { List headers = new ArrayList<>(); - Workbook workbook = new XSSFWorkbook(is); + Workbook workbook = new HSSFWorkbook(is); Sheet sheet = workbook.getSheetAt(0); // HeadRow在index 1 @@ -403,4 +404,14 @@ public class ExcelUtils { } return ""; } + + public String validStandardName(String value) { + if (StrUtil.isBlank(value)) { + return "新企标名称不能为空"; + } + if (value.length() > 50) { + return "'新企标名称'过长（最多50字）。"; + } + return ""; + } } diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划（各部门主动上报）导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划（各部门主动上报）导入模板.xls index f22389da7d9eb0bb2715f0f4c35c2812edf8b980..dc2bd1737311a1932af3ac6550c857e899d1dbc2 100644 GIT binary patch delta 3091 zcmcguZERCj7=BNCyWXx{zqWN0Vw_7H5Tj8uU1l^ICTaqk zUCcmqn&94!FA2^V6F(qi6eUWsK_u|cK->=^{O||*!w5f!CPd@vd+zD&+HTc^AKd1A zJkNXHkMo}Q-qW#pHg=sIR9O7Os8?D805g53St`wrGHf+$L%+TRPw0oSQF5bQa^V7v z`>B0H?N@3)P&+|wGqqQ!ZKvikC_xE)aF78o*bh4P$lkfPqEG=hL4xW6K6Sw0(Irge z`OmbSdhNO3|Cux%5TDSz()d6fXZ&vD<9#~D8**eZe`hlmrH}ISm*r0v;omL7A1lIt zoXb=GvJSq?73A8844VB3GtJfaU>+U^7;|e?VaemcrSWBpyq~5^`9FwNA5mRanydD+L7q~B@v6L^ z@>rl?TcRM&m%pl+K%b+JMmA6rH0A9|3)BR`WqF5YC+Tn;Hse)ueR;V?Erx=(&9$AC z8b1%u($uqPI<%~569fu*JY}g$h}><5(P&)5n5_Mhs_{~dZp7D)&xsT4|SC8MwTQfr*2V=eFksuw?%zwiON3;q$g0!HKvR)=lS z+8zFTRBnb*!Kdo1M@%e;-&J+75T>hk;sJLZPTTCP8E0&M{K9R=$Er*5d-nv3U~hGj zDR`?|VNtB~D25mr)#I$&gU@?b<9UzJjH{YAJ$AMhZ+p7%ve%AVy!+UCyy8vbFEtJL zc8w2%wGDWM##d>y)cWu&jeWH~wh2F}S&fHiwppFssP!4z$d3{GoIbR94Or)Ur#xp1 znf>*USH%_}q=Pd0Ug&97igosSoUW0)iyZ$1gcaqfz%%}!6%3$DeeQe7)G9$>OioWy zW+rno#&mL85Bok?NPafJ4I97$#!>*oz{T_`u8cY(1ku&lN!fd{aR+O{GmWb#ch?(3 zER0ehL0KCQOi*cUTLn3^ri0sh2&Bx2WHU@#bFEisRI8!g=a9 zCM2rFq;FNT^*)c~2`Yyc4zLNer>Z zJlqls=iyzkmAN=I9ea{ z_pSIRmV+8NIp}7w)WyM# jY;x#jY~Cv4?xAtrY#07Dw1+)}ufLeEgm?se%k=yU4zo*W delta 2670 zcmcguO>9(E6h3$6&2*+SogZkYZ>H^ZXbW|II={3J3z5vI(t6AUMeZ{c3agWDt@$|etPFv%FDc3P5g zhT3Ine^9$Y?Etl1rZ`~-UNXj|{vBI7m2XWxL&i)#|Cx1>)V}M12`Gh!#Amdq)IZd~ z*|@8C|A2wfW{u75-&a|W(#QJ!%kd)x_(KKwlLh!s=JT|Fxd7+qE9UVR3h;#zI#$5` z%RD?kKdDfFd=vi5{s9uo%)hF+ofyrNDGz)l%Ui{jznwj@>;)(ys6K_i^}I#n$6*sd zudH1dEAe&e1XTeZO;J2IAwWY9P8SC#>h|xvCz2pnfOy4vKP?`YnFHX^k3ps??88*@P$j2Tf@3f(ruyk8-1Wlhs%R zL3}!xW+6Ns+)k_jY8||b-UnKb`ULm;>t+7tF3ZEjm8qbkjgLh&-8$NHr zALFmtWIC5}YIgAAV~Lm!4<|fj??0D*VRB${h#%dY zk(*16%_Juqqa@3l>V0P$fHsB7Kiwfe18~Iw_89=aNGe@Tw{7ODtpI1*lx=NxR_g>( zz<#oK)9-rO99~5Ceyf8p4yCIN9Y(yIUXf`bV}N_W>l=d>Y8o;S;;w|wNXVE&5+Nyv zOoU81WG2M_X^446gm@7a$U=xeB!R5Zk^x?E1uP~dPeULZAznuXvJ>JvAW#V*UXuiJ zKr8TqBaoAHyeZK7Bv}0tEQ1tIk=&e9qIVa+B!{ znVp@jB_H^~9$5up4leAGtz2`D+RW(Y6g$%WvSsZ@caq!%zTVwus7>Q^_dZsGZ@iST L^ID{?n!0}hD*+QU diff --git a/laws-modules/src/main/resources/excelTemplate/年度制修订计划（标准化发起）导入模板.xls b/laws-modules/src/main/resources/excelTemplate/年度制修订计划（标准化发起）导入模板.xls index dce9dd3e0f101a18ff7fadd6d89485125133a7bd..ebc1b2af4936fab6524606fe1745b2a42dc9bb27 100644 GIT binary patch delta 2539 zcmcgtU2F_d6h3!$W;(mm{p+$+OP3ebV!KuKK$_~dyA^_1^7FWY%sKTBZPZm{v!3-E;!I$yy5nhVeNPb?(hHsMeH|Bz6|-m2D0+;Yj3 z36B}Pm$&>^W6O*NP!Z}!;ggduHu*`|43M2`HjE$nj6Oj(K-4q@auZ_sI+M>62%7#@ z0V8^%>{ROUEuL?2*yJaneHXwjDl`iiX%zz76 zfp`PV|tCGZQZT2<82$_S@p~Do~&P7IYFI4xx-!QPBk~x0ep5o}F!d?9Glgj|ZAw5|8%0H6Em$N%8jf VeI@i=N}-3kjtP5PwC`Oq`3+{-!`1)* delta 2489 zcmcgsO-K|`9RJVk?6|wrewwqcmTq1uQ};vN4nfqm>VlCHL0*!gL*zk1%$u!;AT5aK zWkpFJ(4kLC#*8{>hfW1W;Gs-HA|j{`WkCjg{NKEp*%_UU=->?R&HR4<&-Z`-_Xb{Y z124EcXB{N!5Xmn`4;d6>(k+ycxKk#b&Qj8hV_YaDGJc=p_ZNc+CUdS>zJ6nxN8!A+eg=QL06$cK zKUaXiXy&ngMu6*Pfr-CafG?EL=>qyUY z8-L66wTZCKHjD^sZF#Tm$5hvt|6M*NX8mv?a!TJe>)H# zOx59hCAB)TwGOaC0NY~#Ar4@793aZ$P~N8IC1>|$q{y4}{AxE02mP2lKtCFI@P%+5 z