From 5263b6fd6bb50569eb4e3fb54e115a4c08845d53 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 6 Apr 2023 09:38:10 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adc-da-main/src/main/resources/application-dev.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 7e91731a..0700ae30 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -1,4 +1,3 @@ - #============================================= # 数据库配置 #============================================= From 2fb1dd8c4328fb3a881a5baa17618ca4b97cd5cf Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 6 Apr 2023 09:49:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 471cd64b..19468ae1 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -160,6 +160,7 @@ public class WebMvcConfig implements WebMvcConfigurer { //企标标准导入模板下载 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportTemplateFile"); + //doc文檔重新轉換 addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_GNW"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_QB"); From 1dc522a461ddaa6f69e987118161bc3cf96998b2 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 6 Apr 2023 09:49:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0=E6=8B=86?= =?UTF-8?q?=E5=88=86=E5=AF=BC=E5=85=A5=E7=99=BD=E5=90=8D=E5=8D=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 5263b6fd6bb50569eb4e3fb54e115a4c08845d53. --- adc-da-main/src/main/resources/application-dev.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 0700ae30..7e91731a 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -1,3 +1,4 @@ + #============================================= # 数据库配置 #============================================= From 7e9095ee0348e2541d3ef0326b76783216b2097c Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 6 Apr 2023 09:50:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/adc/da/login/security/WebMvcConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 19468ae1..806c59e7 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java @@ -160,7 +160,7 @@ public class WebMvcConfig implements WebMvcConfigurer { //企标标准导入模板下载 addInterceptor.excludePathPatterns("/api/lawss/sarBussionessStand/exportTemplateFile"); - + //doc文檔重新轉換 addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_GNW"); addInterceptor.excludePathPatterns("/api/sarStandardsInfo/sar-standards-info/convertDocAll_QB"); From bf39ea028d5482ffca5a9ef9829fd80ca7802698 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 6 Apr 2023 11:46:43 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E9=87=8D=E5=A4=8D=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EsRevisePlanServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 e6590ca4..c5d1cfad 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 @@ -86,12 +86,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl esRevisePlans=esRevisePlanDao.selectPageByName(esRevisePlan); - if (esRevisePlans.size()>0){ - return "企标名称不能重复,请更换新的企标名称。"; - }else { +// if (esRevisePlans.size()>0){ +// return "企标名称不能重复,请更换新的企标名称。"; +// }else { esRevisePlanDao.updateById(esRevisePlan); return "操作成功"; - } + // } } @Override From 8f83b8d5d3abfe5cc1d3fcae6ddbe45a8a55d74c Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Thu, 6 Apr 2023 12:00:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SarBussionessStandController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 2b0e8436..938a9036 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -169,7 +169,7 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { //校验编号和名称是否存在 QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(null!=sarBussionessStandEO.getStandNumber(),"STAND_NUMBER",sarBussionessStandEO.getStandNumber()) + queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) .eq(null!=sarBussionessStandEO.getStandName(),"STAND_NAME",sarBussionessStandEO.getStandName()); List list = sarBussionessStandEOService.list(queryWrapper); Integer valIdFlag = 0; @@ -177,7 +177,7 @@ public class SarBussionessStandController extends BaseController1){ valIdFlag = stand.getValidFlag(); if (valIdFlag == 0){ - throw new com.adc.da.exception.AdcDaBaseException("企标标准号"+ sarBussionessStandEO.getStandCode() +"或企标名称"+ sarBussionessStandEO.getStandName() +"已存在"); + return Result.error("企标编号("+ sarBussionessStandEO.getStandCode() +")或企标名称("+ sarBussionessStandEO.getStandName() +")已存在"); } } }