From 1273b380f20b7d2c5000eacba4c9a14b22ed45bd Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 5 Apr 2023 14:20:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BC=81=E4=B8=9A?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=AF=BC=E5=85=A5=E5=A2=9E=E5=8A=A0=E5=AF=B9?= =?UTF-8?q?Excel=E6=96=87=E6=A1=A3=E9=87=8D=E5=A4=8D=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E5=90=8D=E7=A7=B0=E7=9A=84=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarBussionessStandServiceImpl.java | 43 +++++++++++++------ 1 file changed, 30 insertions(+), 13 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 8eb894ea..4a59830c 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 @@ -2775,6 +2775,22 @@ public class SarBussionessStandServiceImpl extends ServiceImpl map = new HashMap<>(); + int count = 2; + for (String str : jsonList) { + count++; + SarBussStandAttrInfoExecl se = com.alibaba.fastjson.JSONObject.parseObject(str,SarBussStandAttrInfoExecl.class); + if(ObjectUtils.isNotEmpty(se)){ + String key = se.getStandCode()+se.getStandName(); + if(map.containsKey(key)){ + logger.info("导入失败,第" + count +" 行需要导入的企标标号或企标名称重复"); + return Result.error("导入失败,第" + count + " 行需要导入的企标标号或企标名称重复"); + }else{ + map.put(key,se); + } + } + } //入库 try { for (String infoJson : jsonList) { @@ -2818,6 +2834,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl1){ valIdFlag = stand.getValidFlag(); if (valIdFlag == 0){ + logger.info("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); } } @@ -2887,19 +2904,19 @@ public class SarBussionessStandServiceImpl extends ServiceImplqueryWrapper = new QueryWrapper<>(); - queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) - .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); - List list = iSarBussionessStandService.list(queryWrapper); - Integer valIdFlag = 0; - for (SarBussionessStand stand :list){ - if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ - valIdFlag = stand.getValidFlag(); - if (valIdFlag == 0){ - throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); - } - } - } +// QueryWrapperqueryWrapper = new QueryWrapper<>(); +// queryWrapper.eq(sarBussionessStand.getStandCode() != null,"STAND_CODE",sarBussionessStand.getStandCode()) +// .eq(sarBussionessStand.getStandName() != null,"STAND_NAME",sarBussionessStand.getStandName()); +// List list = iSarBussionessStandService.list(queryWrapper); +// Integer valIdFlag = 0; +// for (SarBussionessStand stand :list){ +// if ((list.size() ==1 && !list.get(0).getId().equals(stand.getId())) || list.size() >1){ +// valIdFlag = stand.getValidFlag(); +// if (valIdFlag == 0){ +// throw new AdcDaBaseException("企标标准号"+ sarBussionessStand.getStandCode() +"或企标名称"+ sarBussionessStand.getStandName() +"已存在"); +// } +// } +// } //此处判断是否是带入的标准 if(StringUtils.isNotBlank(sarBussionessStand.getId())) { From a34f14d52fda31a966b0b294108015c8e91377ec Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 5 Apr 2023 15:08:04 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SarFileSplitInfoEOServiceImpl.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java index 0a2b0c06..d81c75d9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitInfoEOServiceImpl.java @@ -746,32 +746,32 @@ public class SarFileSplitInfoEOServiceImpl implements SarFileSplitInfoEOService } } - List arrayList = new ArrayList<>(); - List dictionaryEOS = dicEODao.selectbyInfo("lawsTextState"); - List dictionaryEOInfo = dicEODao.selectbyInfo("WBZTCLASS"); - List dictionaryEOSByInfo = dicEODao.selectbyInfo("TEXTSTATUSBUSS"); - if(!dictionaryEOS.isEmpty() && !dictionaryEOInfo.isEmpty() && !dictionaryEOSByInfo.isEmpty()){ - DictionaryEO dictionaryEO = dictionaryEOS.get(0); - DictionaryEO dictionaryEOYInfo = dictionaryEOInfo.get(0); - DictionaryEO dictionaryEOByInfo = dictionaryEOSByInfo.get(0); + List dicTypeEOArrayList = new ArrayList<>(); + List dictionaryEOOne = dicEODao.selectbyInfo("lawsTextState"); + List dictionaryEOTwo = dicEODao.selectbyInfo("WBZTCLASS"); + List dictionaryEOThree = dicEODao.selectbyInfo("TEXTSTATUSBUSS"); + if(!dictionaryEOOne.isEmpty() && !dictionaryEOTwo.isEmpty() && !dictionaryEOThree.isEmpty()){ + DictionaryEO dictionaryEOInfoOne = dictionaryEOOne.get(0); + DictionaryEO dictionaryEOInfoTwo = dictionaryEOTwo.get(0); + DictionaryEO dictionaryEOInfoThree = dictionaryEOThree.get(0); - List dicTypeEOSi = dicTypeEODao.selectDic(dictionaryEO.getId()); - List dicTypeEOSt = dicTypeEODao.selectDic(dictionaryEOYInfo.getId()); - List dicTypeEOSy = dicTypeEODao.selectDic(dictionaryEOByInfo.getId()); + List dicTypeEOSOne = dicTypeEODao.selectDic(dictionaryEOInfoOne.getId()); + List dicTypeEOSTwo = dicTypeEODao.selectDic(dictionaryEOInfoTwo.getId()); + List dicTypeEOSThree = dicTypeEODao.selectDic(dictionaryEOInfoThree.getId()); - for (DicTypeEO data: dicTypeEOSi){ - arrayList.add(data); + for (DicTypeEO data: dicTypeEOSOne){ + dicTypeEOArrayList.add(data); } - for (DicTypeEO data: dicTypeEOSt){ - arrayList.add(data); + for (DicTypeEO data: dicTypeEOSTwo){ + dicTypeEOArrayList.add(data); } - for (DicTypeEO data: dicTypeEOSy){ - arrayList.add(data); + for (DicTypeEO data: dicTypeEOSThree){ + dicTypeEOArrayList.add(data); } } for (SarFileSplitInfoEO data : rows){ - for (DicTypeEO dic : arrayList){ + for (DicTypeEO dic : dicTypeEOArrayList){ if(StringUtils.isNotBlank(data.getFileType())){ if(data.getFileType().equals(dic.getDicTypeCode())){ data.setFileTypeShow(dic.getDicTypeName()); From 01635ca7c706a65ad66c9fdf5f94a892bee5754e Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Wed, 5 Apr 2023 22:14:41 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esRevisePlan/controller/EsRevisePlanController.java | 8 +++++++- .../slrs/esRevisePlan/service/IEsRevisePlanService.java | 3 +++ .../service/impl/EsRevisePlanServiceImpl.java | 9 +++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java index 0c4cb4f5..7435cb01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java @@ -54,6 +54,13 @@ public class EsRevisePlanController extends BaseController { return esRevisePlans; } + @ApiOperation(value = "获取所有企标计划给流程（还未填写企业技术标准）") + @GetMapping("getAllPlansByWkInfo") + public List getAllPlansByWkInfo(){ + List esRevisePlans = iEsRevisePlanService.getAllPlansByWkInfo(); + return esRevisePlans; + } + @ApiOperation(value = "多条件查询企标计划") @PostMapping("queryAllPlans") public ResponseMessage queryAllPlans(EsRevisePlan esRevisePlan){ @@ -96,7 +103,6 @@ public class EsRevisePlanController extends BaseController { case "标准法规部高级经理审核": score=Double.valueOf(evaluationScore) * 0.15; break; - default: score=Double.valueOf(evaluationScore); } last.add(score); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java index 562ac4b4..21febadf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java @@ -31,4 +31,7 @@ public interface IEsRevisePlanService extends IService { List getAllPlansByWk(String esName); Object oaUpdatePlans(String esId, Date date, String s);//Ao时间 发送次数 修改 + + List getAllPlansByWkInfo(); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java index b9c81b0b..e6590ca4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java @@ -239,4 +239,13 @@ public class EsRevisePlanServiceImpl extends ServiceImpl getAllPlansByWkInfo() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + List planStatus = new ArrayList<>(); + planStatus.add("6"); + queryWrapper.lambda().in(EsRevisePlan::getPlanStatus, planStatus); + return esRevisePlanDao.selectList(queryWrapper); + } } From d6713f578f7e10ae19ccd81b5820726cd5009bb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 5 Apr 2023 23:42:13 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarBussionessStandServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 4a59830c..cd091a2a 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 @@ -319,7 +319,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl Date: Wed, 5 Apr 2023 23:42:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarFileSplitItemsEOController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java index 0cd70218..4b2805de 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsEOController.java @@ -683,9 +683,9 @@ public class SarFileSplitItemsEOController extends BaseController