Finish Task #4531 Cost:4h 修复复制合同开票单位错误

src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java

@@ -34,6 +34,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import static com.blueland.common.core.domain.table.InternationalTableDef.INTERNATIONAL;
+import static com.mybatisflex.core.query.QueryMethods.notExists;
 
 /**
  * 国际化 服务层实现。
@@ -132,7 +133,7 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
      */
     @Override
     public boolean translate(String targetLang, String sourceLang, String tenantId) {
-        List<International> sourceLangList = listByLang(sourceLang, tenantId, "");
+        List<International> sourceLangList = selectNotExist(targetLang, sourceLang, tenantId);
 
         List<String> nameList = sourceLangList.stream()
                 .map(International::getName)
@@ -147,7 +148,6 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
             futures.add(future);
         }
         CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
-
         List<International> targetLangList = sourceLangList.stream()
                 .map(el -> {
                     International international = new International();
@@ -167,6 +167,21 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
         return flag;
     }
 
+    private List<International> selectNotExist(String targetLang, String sourceLang, String tenantId) {
+        QueryWrapper where = QueryWrapper.create()
+                .select(INTERNATIONAL.CODE)
+                .from(INTERNATIONAL)
+                .where(INTERNATIONAL.LANG.eq(targetLang));
+
+        QueryWrapper wrapper = QueryWrapper.create()
+                .from(INTERNATIONAL).as("t1")
+                .where(INTERNATIONAL.LANG.eq(sourceLang))
+                .and(INTERNATIONAL.CODE.notIn(where));
+
+
+        return   list(wrapper);
+    }
+
     @Override
     public boolean updateInternational(International international) {
         boolean flag = updateById(international);

src/main/resources/application-test.yml

@@ -6,9 +6,6 @@ spring:
       username: crm
       password: crm@123
       url: jdbc:mysql://192.168.1.13:3308/crm_usm?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-#  redis:
-#    host: localhost
-#    port: 6379
   redis:
     database: 9
     host: 192.168.1.169
@@ -19,7 +16,7 @@ tm:
 
 logging:
   level:
-    net.rzdata.internation: debug
+    com.blueland.common.core: debug
 mybatis-flex:
   type-aliases-package: com.blueland.common.core.domain
 

src/main/resources/application.yml

@@ -13,6 +13,8 @@ spring:
     database: 9
     host: 192.168.1.169
     password: ''
+  profiles:
+    active: test
 tm:
   secretId: AKID4IXccMhHdjcJm0wqPjndHhspkbDbGeJz
   secretKey: aw3v5B3h8OPQO7j8JPGsFNHwMXTAcprf
@@ -25,10 +27,9 @@ server:
         name: crm-internation
 logging:
   level:
-    net.rzdata.internation: debug
+    com.blueland.common.core: debug
 mybatis-flex:
   type-aliases-package: com.blueland.common.core.domain
-
 knife4j:
   enable: true
   openapi: