diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DictCodeEnum.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java similarity index 92% rename from jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DictCodeEnum.java rename to jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java index d05612a55..74d79ca0d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/DictCodeEnum.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/DictCodeEnum.java @@ -1,4 +1,4 @@ -package com.jero.modules.project.enums; +package com.jero.modules.enums; public enum DictCodeEnum { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java index 533dae697..651e13f6d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictService.java @@ -164,4 +164,7 @@ public interface ISysDictService extends IService { Integer queryExitDictName(SysDict sysDict); IPage queryPageList(Map params); + + /**根据字典code查询中英文名*/ + String queryDictItemByName(String code, String itemName, String cut); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java index 532a10b4f..17b5ca8e1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java @@ -422,4 +422,20 @@ public class SysDictServiceImpl extends ServiceImpl impl } return result; } + + /** + * 根据字典code查询中英文名 + * @return + */ + @Override + public String queryDictItemByName(String code,String itemName,String cut) { + + if (CutEnum.CN.getValue().equals(cut)) { + String dictItemsCnName = sysDictMapper.queryDictTextByKey(code,itemName); + return dictItemsCnName; + }else { + String dictItemsEnName = sysDictMapper.queryDictTextByKeyEn(code,itemName); + return dictItemsEnName; + } + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java index b6630cbeb..1d131cbf2 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectRelatedPersonnelService.java @@ -79,5 +79,5 @@ public interface IProjectRelatedPersonnelService extends IService importExcel(HttpServletRequest request, HttpServletResponse response, Class clazz, String projectId,String cut); - List oppositeDisposeData(List records); + List oppositeDisposeData(List records,String projectId,String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index c0a79ebdb..2b40b677a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.system.vo.LoginUser; import com.jero.modules.project.entity.ProjectLibraryBase; -import com.jero.modules.project.enums.DictCodeEnum; +import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.project.mapper.ProjectLibraryBaseMapper; import com.jero.modules.project.service.IProjectLibraryBaseService; import com.jero.modules.system.entity.SysUser; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java index 348b47958..29e4c2602 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRelatedPersonnelServiceImpl.java @@ -7,6 +7,7 @@ import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.enums.DictCodeEnum; import com.jero.modules.project.entity.ProjectRelatedPersonnel; import com.jero.modules.project.enums.ExportTemplateEnum; import com.jero.modules.project.mapper.ProjectRelatedPersonnelMapper; @@ -14,6 +15,7 @@ import com.jero.modules.project.service.IProjectRelatedPersonnelService; import com.jero.modules.project.util.ExcelLangUtils; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.mapper.SysUserMapper; +import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.util.StringUtils; import org.apache.commons.collections4.CollectionUtils; @@ -52,6 +54,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getId())) .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); } - lawName.append(lawEngineerName).append(" "); + lawName.append(lawEngineerName).append(" , "); } - projectRelatedPersonnel.setLawEngineerName(lawName.toString()); + projectRelatedPersonnel.setLawEngineerName(lawName.substring(0,lawName.toString().length()-3)); } } @@ -199,9 +204,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getId())) .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); } - engineeringName.append(engineeringInterfacePersonName).append(" "); + engineeringName.append(engineeringInterfacePersonName).append(" , "); } - projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.toString()); + projectRelatedPersonnel.setEngineeringInterfacePersonName(engineeringName.substring(0,engineeringName.toString().length()-3)); } } @@ -224,9 +229,9 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl data.equals(e.getId())) .map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(",")); } - certificationName.append(certificationEngineerName).append(" "); + certificationName.append(certificationEngineerName).append(" , "); } - projectRelatedPersonnel.setCertificationEngineerName(certificationName.toString()); + projectRelatedPersonnel.setCertificationEngineerName(certificationName.substring(0,certificationName.toString().length()-3)); } } @@ -451,7 +456,7 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl records = ExcelImportUtil.importExcel(file.getInputStream(), clazz, params); if(CollectionUtils.isNotEmpty(records)) { - oppositeDisposeData(records); + oppositeDisposeData(records,projectId,cut); saveBatch(records); //中英切换提示语 if(CutEnum.CN.getValue().equals(cut)) { @@ -490,9 +495,37 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl oppositeDisposeData(List records) { - + public List oppositeDisposeData(List records,String projectId,String cut) { + int row=1; for (ProjectRelatedPersonnel projectRelatedPersonnel:records) { + //责任领域 + if(!projectRelatedPersonnel.getDutyTerritory().isEmpty()) { + if (projectRelatedPersonnel.getDutyTerritory().contains(",")) { + //中英切换提示语 + if(CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("导入的责任领域只能填一个.请检查第" + row + "行"); + }else{ + throw new JeroBootException("Only one duty territory can be filled in for import. Please check line " + row); + } + } + String dictItemsName = sysDictService.queryDictItemByName(DictCodeEnum.DUTY_TERRITORY.getValue(), projectRelatedPersonnel.getDutyTerritory(), cut); + if (dictItemsName.isEmpty()) { + //中英切换提示语 + if(CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("导入的责任领域不存在.请检查第" + row + "行"); + }else{ + throw new JeroBootException("The imported duty territory does not exist. Please check line " + row ); + } + } + }else{ + //中英切换提示语 + if(CutEnum.CN.getValue().equals(cut)) { + throw new JeroBootException("导入的责任领域不能为空.请检查第" + row + "行"); + }else{ + throw new JeroBootException("The imported duty territory cannot be empty.Please check line " + row ); + } + } + //法规工程师 List lawEngineerUsers = new ArrayList<>(); if (StringUtils.isNotEmpty(projectRelatedPersonnel.getLawEngineerName())){ @@ -500,6 +533,14 @@ public class ProjectRelatedPersonnelServiceImpl extends ServiceImpl