diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index 2498df41f..53caf536b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -1722,9 +1722,6 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataListEn){ - //下拉选数据字典 - List sysCategoryList = sysCategoryService.list(); - //技术领域数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); for (DummyInventoryInfoEOEn dummyInventoryInfoEOEn : dataListEn) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java index 3079f494d..d21304787 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/NcrTrackServiceImpl.java @@ -12,8 +12,10 @@ import com.jero.modules.project.mapper.NcrTrackMapper; import com.jero.modules.project.service.INcrTrackService; import com.jero.modules.project.vo.NcrTrackInfoVO; import com.jero.modules.project.vo.NcrTrackVO; +import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.service.impl.SysDictItemServiceImpl; import com.jero.modules.wkflow.enums.FlowTypeEnum; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -50,6 +52,8 @@ public class NcrTrackServiceImpl extends ServiceImpl private ISysUserService sysUserService; @Autowired private ProjectTaskInventoryDetailEOServiceImpl projectTaskInventoryDetailEOService; + @Autowired + private SysDictItemServiceImpl sysDictItemServiceImpl; @Override public List getPageInfo(NcrTrackVO ncrTrackVO) { @@ -82,8 +86,13 @@ public class NcrTrackServiceImpl extends ServiceImpl prehomoName = "PreHomo confirmation"; verifyName = "Verify conformance validation"; } - + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); for (NcrTrackVO trackVO : infoList) { + //责任领域中英文切换 + if(StringUtils.isNotBlank(trackVO.getDutyTerritory())){ + String dutyTerritory = pull(dictItemList, trackVO.getDutyTerritory(), "duty_territory", ncrTrackVO.getCut()); + trackVO.setDutyTerritory(dutyTerritory); + } //设计符合性确认 String designPId = trackVO.getDesignPId();//流程实例id //PreHomo确认 @@ -227,6 +236,27 @@ public class NcrTrackServiceImpl extends ServiceImpl } } + private String pull(List sysDictItems, String field, String dictCode,String cut) { + if(StringUtils.isBlank(field)){ + return null; + } + StringBuilder sb = new StringBuilder(); + for (String s : field.split(",")) { + List collect = sysDictItems.stream().filter(e -> dictCode.equals(e.getDictCode()) && s.equals(e.getItemValue())).collect(Collectors.toList()); + if(collect.size() != 0){ + if(CutEnum.CN.getValue().equals(cut)){ + sb.append(collect.get(0).getItemText() + ","); + }else{ + sb.append(collect.get(0).getEnName() + ","); + } + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + return null; + } private String cut(NcrTrackVO trackVO,String designFlowTaskStatus,String flowTaskStatusName) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java index 6b463b8f0..7ccfe9809 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/vo/NcrTrackVO.java @@ -52,7 +52,7 @@ public class NcrTrackVO implements Serializable { private String flowType; //责任领域 duty_territory - @Dict(dicCode ="duty_territory") +// @Dict(dicCode ="duty_territory") @Excel(name = "责任领域", width = 20,dicCode ="duty_territory") private String dutyTerritory;