From 8f05e1918866cbe2a336cdcddd9ef08d6d4001c1 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 4 Apr 2023 21:32:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E6=A0=87=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E6=96=B0=E5=A2=9E=E5=A4=9A=E9=80=89=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 98 ++++++++++++------- 1 file changed, 65 insertions(+), 33 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index d1684aa3..65b078c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2391,35 +2391,67 @@ public class SarBussionessStandServiceImpl extends ServiceImpl 100) { - return Result.error("第"+ count +"行输入的起草部门过长"); + if (StringUtils.isNotBlank(qcdw)){ + String str = ""; + String qcbm = ""; + String qcdws = ""; + String[] split = qcdw.split(","); + for (int j = 0; j < split.length; j++) { + str = split[j]; + qcbm = tsInstitutionDao.selectByName(str); + if (str != null && !str.equals("")){ + if (!str.equals(qcbm)){ + return Result.error("第"+ count +"行输入的起草部门不存在"); + } + if (StringUtils.isNotBlank(str)) { + if (str.length() > 100) { + return Result.error("第"+ count +"行输入的起草部门过长"); + } + } + if (StringUtils.isNotBlank(qcdws)){ + qcdws += "," + str; + }else { + qcdws = str; } } - sarBussStandAttrInfo.setQcdw(qcdw); + } + sarBussStandAttrInfo.setQcdw(qcdws); } + String qcrbuss = rowList.get("起草人"); - String account = tsUserDao.selectByAccount(qcrbuss); - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(qcrbuss != null,"UNAME",qcrbuss) - .eq(account != null,"ACCOUNT",account); - TsUser tsUser = tsUserDao.selectOne(queryWrapper); - if (qcrbuss != null && !qcrbuss.equals("")) { - if (!account.equals(tsUser.getAccount()) && !qcrbuss.equals(tsUser.getUname())){ - return Result.error("第"+ count +"行输入的起草人名称不存在"); + String[] split3 = qcrbuss.split(","); + String account = ""; + String str = ""; + String qcrs = ""; + if (StringUtils.isNotBlank(qcrbuss)){ + for (int j = 0; j < split3.length; j++) { + str = split3[j]; + account = tsUserDao.selectByAccount(str); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq(str != null,"UNAME",str) + .eq(account != null,"ACCOUNT",account); + TsUser tsUser = tsUserDao.selectOne(queryWrapper); + String acc = tsUser.getAccount(); + String qcr = tsUser.getUname(); + if (str != null && !str.equals("")) { + if (!account.equals(acc) && !str.equals(qcr)){ + return Result.error("第"+ count +"行输入的起草人名称不存在"); + } + if (str.length() > 100) { + return Result.error("第"+ count +"行输入的起草人过长"); + } + if (StringUtils.isNotBlank(qcrs)){ + qcrs += "," + str + "(" + account +")"; + }else { + qcrs = str + "(" + account +")"; + } } - if (qcrbuss.length() > 100) { - return Result.error("第"+ count +"行输入的起草人过长"); - } - sarBussStandAttrInfo.setQcrbuss(qcrbuss + "(" + account + ")"); + } + sarBussStandAttrInfo.setQcrbuss(qcrs); } + String sycxclass = rowList.get("适用车型"); if (StringUtils.isNotBlank(sycxclass) && !sycxclass.equals("")){ String[] strings = sycxclass.split(","); @@ -2569,8 +2601,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl