From 87ee0073c11557081d07a3a56de501796a298c84 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Tue, 4 Jul 2023 16:15:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ReplaceBatch.java=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/config/ReplaceBatch.java | 9 ++++++--- src/main/java/com/glxp/api/dao/BaseMapperPlus.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/config/ReplaceBatch.java b/src/main/java/com/glxp/api/config/ReplaceBatch.java index 20194c696..f009e3478 100644 --- a/src/main/java/com/glxp/api/config/ReplaceBatch.java +++ b/src/main/java/com/glxp/api/config/ReplaceBatch.java @@ -39,9 +39,12 @@ public class ReplaceBatch extends AbstractMethod { KeyGenerator keyGenerator = new NoKeyGenerator(); CustomerSqlMethod sqlMethod = CustomerSqlMethod.REPLACE_ONE; List fieldList = tableInfo.getFieldList(); - String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, true) + - this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY); - String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET; + + String columnScript = SqlScriptUtils.convertTrim(tableInfo.getAllInsertSqlColumnMaybeIf(null), + LEFT_BRACKET, RIGHT_BRACKET, null, COMMA); +// String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, true) + +// this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY); +// String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET; String insertSqlProperty = tableInfo.getKeyInsertSqlProperty(true, ENTITY_DOT, true) + this.filterTableFieldInfo(fieldList, predicate, i -> i.getInsertSqlProperty(ENTITY_DOT), EMPTY); insertSqlProperty = LEFT_BRACKET + insertSqlProperty.substring(0, insertSqlProperty.length() - 1) + RIGHT_BRACKET; diff --git a/src/main/java/com/glxp/api/dao/BaseMapperPlus.java b/src/main/java/com/glxp/api/dao/BaseMapperPlus.java index 3d3a64bce..b6cc24ed6 100644 --- a/src/main/java/com/glxp/api/dao/BaseMapperPlus.java +++ b/src/main/java/com/glxp/api/dao/BaseMapperPlus.java @@ -314,7 +314,7 @@ public interface BaseMapperPlus extends BaseMapper { } } } catch (Exception e) { - log.error("insertIgnoreBatch fail", e); + log.error("replaceBatch fail", e); return false; } return true; From 86bd9ebc9cf65bcd5993f9f032e164db21fcf5a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Tue, 4 Jul 2023 17:05:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=98=AF=E5=AE=A2=E6=88=B7=E7=9A=84=E5=AE=A2=E6=88=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BA=E6=82=A3=E8=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicCorpController.java | 8 ++++++-- .../api/req/basic/BasicUnitMaintainFilterRequest.java | 1 + src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml | 7 +++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 8277778d6..aada9dbca 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -81,7 +81,7 @@ public class BasicCorpController { //是供应商的时候拉客户和供应商 if (basicUnitMaintainFilterRequest.getCorpType() == null || basicUnitMaintainFilterRequest.getCorpType() == 2) { basicUnitMaintainFilterRequest.setCorpType(null); - basicUnitMaintainFilterRequest.setCorpTypeList(new ArrayList<>(Arrays.asList(1, 2))); + basicUnitMaintainFilterRequest.setCorpTypeLists(new ArrayList<>(Arrays.asList(1, 2))); } basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); PageInfo pageInfo = new PageInfo<>(basicUnitMaintainEntities); @@ -126,7 +126,11 @@ public class BasicCorpController { BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity(); BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity); basicUnitMaintainEntity.setErpId(CustomUtil.getId()); - basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); + if(basicUnitMaintainSaveRequest.getCorpType()==1){ + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_SICK); + }else{ + basicUnitMaintainEntity.setOutType(ConstantStatus.CORP_SICK_CUS); + } basicUnitMaintainEntity.setUpdateTime(new Date()); basicUnitMaintainEntity.setId(IdUtil.getSnowflakeNextId()); boolean b = basicUnitMaintainService.insert(basicUnitMaintainEntity); diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index 5988d335f..2b6ede471 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -27,5 +27,6 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest { private Boolean isDownThrSys; private String lastUpdateTime; private List corpTypeList; + private List corpTypeLists;//用来往来单位查询 ListthrCorpEntities; } diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index e7ce1c290..0d87032a9 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -37,6 +37,13 @@ ) and outType ]]> 1 + + AND (corpType in + + #{item} + + ) + AND (outType ]]> #{outType} or outType is NULL) From ecf449e0790081523ed1c9d3735105319eff040a Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Jul 2023 17:07:04 +0800 Subject: [PATCH 3/3] =?UTF-8?q?yml=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 4 ++-- src/main/resources/application-pro.yml | 4 ++-- src/main/resources/application.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index a87e0a10b..80b82dadf 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,9 +4,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_w?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: root hikari: connection-timeout: 60000 maximum-pool-size: 20 diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index d0e3e25a6..7d2de19c9 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -3,9 +3,9 @@ server: spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:mysql://192.168.0.61:3306/udi_wms_w?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: Glxp@6066 + password: 123456 hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 788a2796b..80e18f1ee 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,7 +8,7 @@ spring: enabled: true max-file-size: 200MB max-request-size: 200MB - location: /tmp + location: D:/tmp mybatis-plus: mapper-locations: classpath:mybatis/mapper/*/*.xml