fix(88386): 标准比对--文档比对添加成功提示语是中文的
This commit is contained in:
@@ -0,0 +1,20 @@
|
||||
package com.jero.modules.system.util;
|
||||
|
||||
import com.jero.common.constant.enums.LanguageEnum;
|
||||
import com.jero.common.util.MessageUtils;
|
||||
|
||||
/**
|
||||
* @ClassName: CutUtils
|
||||
* @Description:
|
||||
* @Author: yjz
|
||||
* @Date: 2024-08-12 10:35
|
||||
* @Version: 1.0
|
||||
**/
|
||||
public class CutUtils {
|
||||
public static String getCurrentCut() {
|
||||
if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
|
||||
return LanguageEnum.CN.getValue();
|
||||
}
|
||||
return LanguageEnum.EN.getValue();
|
||||
}
|
||||
}
|
||||
+2
@@ -26,6 +26,7 @@ import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
|
||||
import com.jero.modules.laws.standard.service.ILawsDomesticStandardService;
|
||||
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.modules.system.util.CutUtils;
|
||||
import com.jero.modules.system.util.MyStringUtils;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
@@ -89,6 +90,7 @@ public class SarFileCompareInfoController extends JeroController<SarFileCompareI
|
||||
@ApiParam("标题") @RequestParam(name = "title", defaultValue = "") String title,
|
||||
@ApiParam("发布状态") @RequestParam(name = "releaseState", defaultValue = "") String releaseState,
|
||||
HttpServletRequest req) {
|
||||
cut = CutUtils.getCurrentCut();
|
||||
LambdaQueryWrapper<SarFileCompareInfo> queryWrapper = new LambdaQueryWrapper<>();
|
||||
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
queryWrapper.and(LambdaQueryWrapper -> LambdaQueryWrapper.eq(SarFileCompareInfo::getCreateBy, sysUser.getUsername()).or().eq(SarFileCompareInfo::getReleaseState, ReleaseConditionEnum.PUBLISHED.getValue()));
|
||||
|
||||
+2
@@ -11,6 +11,7 @@ import com.jero.modules.compare.entity.SarFileCompareItemComment;
|
||||
import com.jero.modules.compare.entity.SarFileCompareResultVO;
|
||||
import com.jero.modules.compare.service.ISarFileCompareInfoService;
|
||||
import com.jero.modules.compare.service.ISarFileCompareItemCommentService;
|
||||
import com.jero.modules.system.util.CutUtils;
|
||||
import com.jero.modules.system.vo.IdMapBody;
|
||||
import com.jero.modules.system.vo.IdsMapBody;
|
||||
import io.swagger.annotations.Api;
|
||||
@@ -198,6 +199,7 @@ public class SarFileCompareItemCommentController extends JeroController<SarFileC
|
||||
@ApiParam("国际化") @RequestParam(name = "cut", required = true) String cut,
|
||||
HttpServletResponse response,HttpServletRequest request,
|
||||
@ApiParam("评论") @RequestParam(name = "comment", required = false) String comment) {
|
||||
cut = CutUtils.getCurrentCut();
|
||||
sarFileCompareItemCommentService.exportResXls(request,response, infoId, selectIds, includeComments, cut,comment);
|
||||
}
|
||||
|
||||
|
||||
+2
@@ -14,6 +14,7 @@ import com.jero.modules.split.entity.SarFileSplitItemsEO;
|
||||
import com.jero.modules.split.entity.SarFileSplitItemsValEO;
|
||||
import com.jero.modules.split.service.IFileSplitItemsEOService;
|
||||
import com.jero.modules.split.service.impl.FileSplitItemsEOServiceImpl;
|
||||
import com.jero.modules.system.util.CutUtils;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
@@ -93,6 +94,7 @@ public class FileSplitItemsEOController extends JeroController<SarFileSplitItems
|
||||
public Result<?> importSplitResult(@ApiParam("标准拆分条id") String splitFileId,
|
||||
@ApiParam("国际化") String cut,
|
||||
SarFileSplitInfoEO splitInfoEO) throws IOException {
|
||||
cut = CutUtils.getCurrentCut();
|
||||
return fileSplitItemsEOService.importSplitResult(splitFileId, cut,splitInfoEO);
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -61,6 +61,7 @@ import com.jero.modules.system.service.ISysDictService;
|
||||
import com.jero.modules.system.service.ISysUserService;
|
||||
import com.jero.modules.system.service.impl.SysCategoryServiceImpl;
|
||||
import com.jero.modules.system.service.impl.SysDictItemServiceImpl;
|
||||
import com.jero.modules.system.util.CutUtils;
|
||||
import com.jero.modules.system.util.MyStringUtils;
|
||||
import com.jero.modules.system.util.UserUtils;
|
||||
import com.jero.modules.tag.entity.LawsTag;
|
||||
@@ -725,7 +726,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
|
||||
|
||||
@Override
|
||||
public IPage getInfoPage(Map<String, Object> parameter) {
|
||||
String cut = (String) parameter.get("cut");// 中英文切换标识
|
||||
String cut = CutUtils.getCurrentCut();// 中英文切换标识
|
||||
// 查询条款表所有字段
|
||||
List<OnlCgformField> fieldList = onlCgformFieldService.getFieldList(ModuleEnum.FILE_SPLIT_ITEMS.getValue());
|
||||
// 日期类型字段
|
||||
|
||||
Reference in New Issue
Block a user