Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/main/resources/application-dev.yml

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<TableFieldInfo> 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;

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<BasicCorpEntity> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
@@ -126,7 +126,11 @@ public class BasicCorpController {
         BasicCorpEntity basicUnitMaintainEntity = new BasicCorpEntity();
         BeanUtils.copyProperties(basicUnitMaintainSaveRequest, basicUnitMaintainEntity);
         basicUnitMaintainEntity.setErpId(CustomUtil.getId());
+        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);

src/main/java/com/glxp/api/dao/BaseMapperPlus.java

@@ -314,7 +314,7 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
                 }
             }
         } catch (Exception e) {
-            log.error("insertIgnoreBatch fail", e);
+            log.error("replaceBatch fail", e);
             return false;
         }
         return true;

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<Integer> corpTypeList;
+    private List<Integer> corpTypeLists;//用来往来单位查询
     List<BasicErpUnitsResponse>thrCorpEntities;
 }

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

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

src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml

@@ -37,6 +37,13 @@
                 </foreach>
                 ) and outType <![CDATA[ <> ]]> 1
             </if>
+            <if test="corpTypeLists != null and corpTypeLists.size() > 0">
+                AND (corpType in
+                <foreach item="item" index="index" collection="corpTypeLists" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+                )
+            </if>
             <if test="outType != null">
                 AND (outType <![CDATA[ <> ]]> #{outType} or outType is NULL)
             </if>