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

This commit is contained in:
时间淡忘一切 2023-11-17 16:51:36 +08:00
parent 0f37f4a96b
commit 83a0c00349
3 changed files with 31 additions and 3 deletions

View File

@ -128,7 +128,7 @@ public class InternationalController {
} }
) )
public AjaxResult<Boolean> translate(@RequestParam("targetLang") String targetLang, public AjaxResult<Boolean> translate(@RequestParam("targetLang") String targetLang,
@RequestParam("sourceLang") String sourceLang) { @RequestParam("sourceLang") String sourceLang) {
return AjaxResult.operates(internationalService.translate(targetLang, sourceLang, UserUtils.getTenantId())); return AjaxResult.operates(internationalService.translate(targetLang, sourceLang, UserUtils.getTenantId()));
} }
@ -162,8 +162,15 @@ public class InternationalController {
} }
) )
public AjaxResult<Boolean> tenantIdTranslate(@RequestParam("sourceLang") String sourceLang, public AjaxResult<Boolean> tenantIdTranslate(@RequestParam("sourceLang") String sourceLang,
String tenantId) { String tenantId) {
return AjaxResult.operates(internationalService.tenantIdTranslate(sourceLang, tenantId)); return AjaxResult.operates(internationalService.tenantIdTranslate(sourceLang, tenantId));
} }
@GetMapping("/init")
@ApiOperation("初始化本租户的国际化数据")
public AjaxResult init() {
internationalService.init();
return AjaxResult.success();
}
} }

View File

@ -111,4 +111,5 @@ public interface InternationalService extends IService<International> {
*/ */
Boolean tenantIdTranslate(String sourceLang, String tenantId); Boolean tenantIdTranslate(String sourceLang, String tenantId);
void init();
} }

View File

@ -219,7 +219,7 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
.stream() .stream()
.filter(el -> el.size() > 1) .filter(el -> el.size() > 1)
.forEach(el -> { .forEach(el -> {
Assert.isTrue(false,StrUtil.format("编码【{}】语言【{}】重复", el.get(0).getCode(), el.get(0).getLang())); Assert.isTrue(false, StrUtil.format("编码【{}】语言【{}】重复", el.get(0).getCode(), el.get(0).getLang()));
}); });
// 校验数据完整性 // 校验数据完整性
@ -286,6 +286,26 @@ public class InternationalServiceImpl extends ServiceImpl<InternationalMapper, I
return flag; return flag;
} }
/**
* 根据租户初始化
*
* @return
*/
@Override
public void init() {
QueryWrapper wrapper = QueryWrapper.create()
.where(INTERNATIONAL.TENANT_ID.eq(UserUtils.getTenantId()));
List<International> list = list(wrapper);
if (CollUtil.isNotEmpty(list)) {
list.stream()
.collect(Collectors.groupingBy(International::getLang))
.forEach((k, v) -> {
RedisUtil.hashMultiSet(k, v);
});
}
}
public Map<String, International> list(List<InternationalExport> list) { public Map<String, International> list(List<InternationalExport> list) {
QueryWrapper wrapper = QueryWrapper.create(); QueryWrapper wrapper = QueryWrapper.create();