diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml index 8a1b15956..147a6b2b0 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml @@ -34,7 +34,7 @@ - order by create_time desc + order by sort_order diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index aa7d80250..c30c1abb2 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -370,47 +370,49 @@ public class SysCategoryServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId()) + queryWrapper.eq("sys_dict_id", sysCategory.getSysDictId()) .eq("del_flag", CommonConstant.DEL_FLAG_0) .orderByAsc("sort_order"); - if(StringUtils.isNotBlank(sysCategory.getPid())){ - queryWrapper.eq("pid",sysCategory.getPid()); - }else{ - queryWrapper.eq("pid",0); + if (StringUtils.isNotBlank(sysCategory.getPid())) { + queryWrapper.eq("pid", sysCategory.getPid()); + } else { + queryWrapper.eq("pid", 0); } - Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysCategory.getId())) - .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); - queryWrapper.eq("sort_order", inputOrderNum); - Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper); - if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 - //设置排序 - QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("sort_order", inputOrderNum) - .eq("sys_dict_id",sysCategory.getSysDictId()) - .eq("del_flag", CommonConstant.DEL_FLAG_0) - .orderByAsc("sort_order"); - if(StringUtils.isNotBlank(sysCategory.getPid())){ - orderNumQueryWrapper.eq("pid",sysCategory.getPid()); - }else{ - orderNumQueryWrapper.eq("pid",0); - } - List geOrderNumList = list(orderNumQueryWrapper); + if (list(queryWrapper).size() > 0) { + Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysCategory.getId())) + .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); + queryWrapper.eq("sort_order", inputOrderNum); + Integer orderNumCount = sysCategoryMapper.selectCount(queryWrapper); + if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("sort_order", inputOrderNum) + .eq("sys_dict_id", sysCategory.getSysDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .orderByAsc("sort_order"); + if (StringUtils.isNotBlank(sysCategory.getPid())) { + orderNumQueryWrapper.eq("pid", sysCategory.getPid()); + } else { + orderNumQueryWrapper.eq("pid", 0); + } + List geOrderNumList = list(orderNumQueryWrapper); - //判断相邻的序号,去掉不邻的 - for (int i = 0; i < geOrderNumList.size(); i++) { - if (geOrderNumList.size() == 1 || (geOrderNumList.size()==2 && geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() == 1)) { - break; - } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { - int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); - geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); - if(geOrderNumList.size()!=(i+1)) { + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1 || (geOrderNumList.size() == 2 && geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() == 1)) { break; + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); + if (geOrderNumList.size() != (i + 1)) { + break; + } } } - } - geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); - saveOrUpdateBatch(geOrderNumList); + geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); + saveOrUpdateBatch(geOrderNumList); + } } } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index 85e6df8da..1f9d5269b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -65,7 +65,7 @@ public class SysDictItemServiceImpl extends ServiceImpl 0) {//有重复展示顺序的,后面的号全+1 @@ -102,36 +102,38 @@ public class SysDictItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) - .eq("dict_id",sysDictItem.getDictId()) - .eq("is_tag_dict",sysDictItem.getIsTagDict()) + .eq("dict_id", sysDictItem.getDictId()) + .eq("is_tag_dict", sysDictItem.getIsTagDict()) .orderByAsc("sort_order"); - Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId())) - .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); - queryWrapper.eq("sort_order", inputOrderNum); - Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); - if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 - //设置排序 - QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("sort_order", inputOrderNum) - .eq("dict_id",sysDictItem.getDictId()) - .eq("del_flag", CommonConstant.DEL_FLAG_0) - .eq("is_tag_dict",sysDictItem.getIsTagDict()) - .orderByAsc("sort_order"); - List geOrderNumList = list(orderNumQueryWrapper); + if (list(queryWrapper).size() > 0) { + Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId())) + .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); + queryWrapper.eq("sort_order", inputOrderNum); + Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); + if (orderNumCount > 0 && !orderNumData.equals(inputOrderNum)) {//有重复展示顺序的,后面的号全+1 + //设置排序 + QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); + orderNumQueryWrapper.ge("sort_order", inputOrderNum) + .eq("dict_id", sysDictItem.getDictId()) + .eq("del_flag", CommonConstant.DEL_FLAG_0) + .eq("is_tag_dict", sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); + List geOrderNumList = list(orderNumQueryWrapper); - //判断相邻的序号,去掉不邻的 - for (int i = 0; i < geOrderNumList.size(); i++) { - if (geOrderNumList.size() == 1) { - break; - } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { - int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); - geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); - break; + //判断相邻的序号,去掉不邻的 + for (int i = 0; i < geOrderNumList.size(); i++) { + if (geOrderNumList.size() == 1) { + break; + } else if (geOrderNumList.get(i + 1).getSortOrder() - geOrderNumList.get(i).getSortOrder() > 1) { + int deleteStart = geOrderNumList.get(i + 1).getSortOrder(); + geOrderNumList = geOrderNumList.stream().filter(e -> e.getSortOrder() < deleteStart).collect(Collectors.toList()); + break; + } } - } - geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); - saveOrUpdateBatch(geOrderNumList); + geOrderNumList.stream().forEach(e -> e.setSortOrder(e.getSortOrder() + 1)); + saveOrUpdateBatch(geOrderNumList); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 10ed3ce21..3fd76daeb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -762,8 +762,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl attestationType = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getValue()); - String attestationTypeEnName = attestationType.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getAttestationType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setAttestationType(attestationTypeEnName); + List attestationTypeList = Arrays.asList(dummyInventoryInfoEO.getAttestationType().split(",")); + StringBuilder attestationTypeBuilder = new StringBuilder(); + for (String midDutyTerritory : attestationTypeList) { + String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + attestationTypeBuilder.append(attestationTypeName).append(","); + } + dummyInventoryInfoEO.setAttestationType(attestationTypeBuilder.substring(0, attestationTypeBuilder.toString().length() - 1)); + }else { dummyInventoryInfoEO.setAttestationType("null"); } @@ -962,18 +968,17 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl infoDiff : infoDiffList) { if (infoDiff.size() > 1) { - - // contentInfo += row + ". The Number " + infoDiff.get("serialNumber") + " has been updated as follows : " + "\r\n"; //标题 if (StringUtils.isNotBlank(infoDiff.get("title"))) { List list = Arrays.asList(infoDiff.get("title").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { - contentInfo += DummyInventoryBaseFieldEnum.TITLE.getEnName() +" has been changed from " + infoDiffOld + " to " + infoDiffNew + ","; + contentInfo += "'"+DummyInventoryBaseFieldEnum.TITLE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ","; }else{ - contentLog += DummyInventoryBaseFieldEnum.TITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+DummyInventoryBaseFieldEnum.TITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + } } //子标题 @@ -982,10 +987,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"向清单中添加了标准“"+serialNumber+"”"; - String enContentLog = username+" added the standard “"+serialNumber+"” to the list."; + String contentLog = username+"向清单中添加了“"+serialNumber+"”"; + String enContentLog = username+" added “"+serialNumber+"” to the list."; dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); } @@ -176,9 +176,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); @@ -207,8 +206,6 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl> infoDiffListEn = new ArrayList<>(); infoDiffListEn.add(infoDiffEn); -// contentLog = dummyInventoryBaseEOService.setContentInfo(null,null,infoDiffList,null,null,contentLog); -// enContentLog=dummyInventoryBaseEOService.setContentInfo(enContentLog,null,infoDiffListEn,null,null,null); contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog); enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null); @@ -261,8 +258,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"删除了清单中的“"+serialNumber+"”标准"; - String enContentLog = username+" deleted the “"+serialNumber+"” standard from the list"; + String contentLog = username+"删除了清单中的“"+serialNumber+"”"; + String enContentLog = username+" deleted “"+serialNumber+"” from the list"; dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } @@ -381,134 +378,115 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoListCopy = DeepCopyListUtil.depCopy(infoList); - //根据id查询数据库中完整信息,翻译 - dummyInventoryBaseEOService.disposeData(infoList); + + //根据id查询数据库中完整信息,翻译 + dummyInventoryBaseEOService.disposeData(infoList); dummyInventoryBaseEOService.disposeDataToEn(infoListCopy); - //翻译传入的数据 - List inputList = new ArrayList<>(); - inputList.add(dummyInventoryInfoEO); - dummyInventoryBaseEOService.disposeData(inputList); - DummyInventoryInfoEO inputInfoEO = inputList.get(0); + //翻译传入的数据 + List inputList = new ArrayList<>(); + inputList.add(dummyInventoryInfoEO); + dummyInventoryBaseEOService.disposeData(inputList); + DummyInventoryInfoEO inputInfoEO = inputList.get(0); - for (String id : idList) { - DummyInventoryInfoEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); - DummyInventoryInfoEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); - contentLogBuilder.append(info.getSerialNumber() + ":"); - enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); - DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO(); - dummyInventoryInfoEOTemp.setId(id); - //实施类别 implementType - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { - /*if (StringUtils.isBlank(info.getImplementType())){ - info.setImplementType("空"); - }*/ - if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); - setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType()); + for (String id : idList) { + DummyInventoryInfoEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); + DummyInventoryInfoEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); + contentLogBuilder.append(info.getSerialNumber() + ":"); + enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); + DummyInventoryInfoEO dummyInventoryInfoEOTemp = new DummyInventoryInfoEO(); + dummyInventoryInfoEOTemp.setId(id); + + //实施类别 implementType + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getImplementType())) { + if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); + setUpdateEnContentLog(enContentLogBuilder,DummyInventoryBaseFieldEnum.IMPLEMENT_TYPE.getEnName(), infoCopy.getImplementType(), inputInfoEO.getImplementType()); + } } - } - //认证类型 attestationType - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { - /*if (StringUtils.isBlank(info.getAttestationType())){ - info.setAttestationType("空"); - }*/ - if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType()); + //认证类型 attestationType + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationType())) { + if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_TYPE.getEnName(), infoCopy.getAttestationType(), inputInfoEO.getAttestationType()); + } } - } - //认证级别 attestationRank - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { - /*if (StringUtils.isBlank(info.getAttestationRank())){ - info.setAttestationRank("空"); - }*/ - if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank()); + //认证级别 attestationRank + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getAttestationRank())) { + if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.ATTESTATION_RANK.getEnName(), infoCopy.getAttestationRank(), inputInfoEO.getAttestationRank()); + } } - } - //责任领域 dutyTerritory - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { - /*if (StringUtils.isBlank(info.getDutyTerritory())){ - info.setDutyTerritory("空"); - }*/ - if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory()) && !inputInfoEO.getDutyTerritory().equals("空")){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + //责任领域 dutyTerritory + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDutyTerritory())) { + if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory()) && !inputInfoEO.getDutyTerritory().equals("空")){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.DUTY_TERRITORY.getEnName(), infoCopy.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + } } - } - //适用范围 shi4Yong4Fan4Wei2 - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){ - /*if (StringUtils.isBlank(info.getShi4Yong4Fan4Wei2())){ - info.setShi4Yong4Fan4Wei2("空"); - }*/ - if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2()) && !inputInfoEO.getShi4Yong4Fan4Wei2().equals("空")){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),infoCopy.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); + //适用范围 shi4Yong4Fan4Wei2 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getShi4Yong4Fan4Wei2())){ + if (!info.getShi4Yong4Fan4Wei2().equals(inputInfoEO.getShi4Yong4Fan4Wei2()) && !inputInfoEO.getShi4Yong4Fan4Wei2().equals("空")){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getName(),info.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.SHI4_YONG4_FAN4_WEI2.getEnName(),infoCopy.getShi4Yong4Fan4Wei2(),inputInfoEO.getShi4Yong4Fan4Wei2()); + } } - } - //技术领域 technologyTerritory - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){ - /*if (StringUtils.isBlank(info.getTechnologyTerritoryName())){ - info.setTechnologyTerritoryName("空"); - }*/ - if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName()) && !inputInfoEO.getTechnologyTerritoryName().equals("空")){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),infoCopy.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); + //技术领域 technologyTerritory + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())){ + if (!info.getTechnologyTerritoryName().equals(inputInfoEO.getTechnologyTerritoryName()) && !inputInfoEO.getTechnologyTerritoryName().equals("空")){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getName(),info.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.TECHNOLOGY_TERRITORY.getEnName(),infoCopy.getTechnologyTerritoryName(),inputInfoEO.getTechnologyTerritoryName()); + } } - } - //适用地区 region - if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){ - /*if (StringUtils.isBlank(info.getRegion())){ - info.setRegion("空"); - }*/ - if (!info.getRegion().equals(inputInfoEO.getRegion()) && !inputInfoEO.getRegion().equals("空")){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),infoCopy.getRegion(),inputInfoEO.getRegion()); + //适用地区 region + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getRegion())){ + if (!info.getRegion().equals(inputInfoEO.getRegion()) && !inputInfoEO.getRegion().equals("空")){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.REGION.getEnName(),infoCopy.getRegion(),inputInfoEO.getRegion()); + } } - } - //新车实施日期 - if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ - if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - }else { - if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + //新车实施日期 + if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ + if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + }else { + if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + } + } + } + //在产车实施日期 + if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTime())){ + if (info.getImplementTime() == null){ + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString()); + }else { + if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) { + setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + } } } } - //在产车实施日期 - if(ObjectUtils.isNotEmpty(dummyInventoryInfoEO.getImplementTime())){ - if (info.getImplementTime() == null){ - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString()); - }else { - if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) { - setUpdateContentLog(contentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); - setUpdateEnContentLog(enContentLogBuilder, DummyInventoryBaseFieldEnum.IMPLEMENT_TIME.getEnName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); - } - } - } - } - contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1); - contentLog += "”"; - enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1); - enContentLog += "”"; - dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); - dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); + contentLog = contentLogBuilder.substring(0, contentLogBuilder.length() - 1); + contentLog += "”"; + enContentLog = enContentLogBuilder.substring(0, enContentLogBuilder.length() - 1); + enContentLog += "”"; + dummyLogEOService.updateLog(contentLog, projectId,CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, projectId,CutEnum.EN.getValue()); } } public StringBuilder setUpdateContentLog(StringBuilder contentLogBuilder,String fieldName,String oldValue,String newValue){ @@ -676,40 +654,10 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dummyInventoryInfoEOList) { -// Set technologyTerritorySet = new HashSet<>(); -// Set designDeliverableTypeSet = new HashSet<>(); -// Set PrehomoDeliverableTypeSet = new HashSet<>(); -// Set verifyDeliverableTypeSet = new HashSet<>(); + List deliverableList = new ArrayList<>(); if(dummyInventoryInfoEOList.size() != 0){ for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { -// //技术领域 -// if(StringUtils.isNotBlank(record.getTechnologyTerritory())){ -// List list = Arrays.asList(record.getTechnologyTerritory().split(",")); -// technologyTerritorySet.addAll(list); -// } -// //设计交付物类型 -// if(StringUtils.isNotBlank(record.getDesignDeliverableType())){ -// List list = Arrays.asList(record.getDesignDeliverableType().split(",")); -// designDeliverableTypeSet.addAll(list); -// } -// //pre交付物类型 -// if(StringUtils.isNotBlank(record.getPrehomoDeliverableType())){ -// List list = Arrays.asList(record.getPrehomoDeliverableType().split(",")); -// PrehomoDeliverableTypeSet.addAll(list); -// } -// -// //验证交付物类型 -// if(StringUtils.isNotBlank(record.getVerifyDeliverableType())){ -// List list = Arrays.asList(record.getVerifyDeliverableType().split(",")); -// verifyDeliverableTypeSet.addAll(list); -// } - - //对应标准 -// if(StringUtils.isNotBlank(record.getCorrespondingStandard())){ -// List list = Arrays.asList(record.getCorrespondingStandard().split(",")); -// correspondingStandardSet.addAll(list); -// } //设计符合性确认交付物模板 if(StringUtils.isNotBlank(record.getDesignDeliverableTemplate())){ deliverableList.addAll(Arrays.asList(record.getDesignDeliverableTemplate().split(","))); @@ -731,12 +679,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl categoryList = categoryList = sysCategoryService.list(); -// if(technologyTerritorySet.size() != 0){ -// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); -// wrapper.in(SysCategory::getId, technologyTerritorySet); -// categoryList = sysCategoryService.list(wrapper); -// } + List categoryList = sysCategoryService.list(); for (DummyInventoryInfoEO record : dummyInventoryInfoEOList) { //技术领域 @@ -745,21 +688,21 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl designDeliverableTypeList = Arrays.asList(record.getDesignDeliverableType().split(",")); String name = getTreeName(dummyInventoryInfoEO, categoryList, designDeliverableTypeList); record.setDesignDeliverableTypeName(name); } - //pre交付物模板 + //pre交付物类型 if(StringUtils.isNotBlank(record.getPrehomoDeliverableType())){ List prehomoDeliverableTypeList = Arrays.asList(record.getPrehomoDeliverableType().split(",")); String name = getTreeName(dummyInventoryInfoEO, categoryList, prehomoDeliverableTypeList); record.setPrehomoDeliverableTypeName(name); } - //验证交付物模板 + //验证交付物类型 if(StringUtils.isNotBlank(record.getVerifyDeliverableType())){ List verifyDeliverableTypeList = Arrays.asList(record.getVerifyDeliverableType().split(",")); String name = getTreeName(dummyInventoryInfoEO, categoryList, verifyDeliverableTypeList); @@ -1307,8 +1250,8 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl { && !f.getName().contains("update") && !f.getName().equals("id") && !f.getName().equals("technologyTerritory") &&!f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1") && !f.getName().equals("implementTime") && !f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1") - && !f.getName().equals("implementTime") + && !f.getName().equals("implementTime") && !f.getName().equals("inventoryAffirmStatusName") + && !f.getName().equals("taskAffirmStatusName") && !f.getName().equals("roleCode") + && !f.getName().equals("roleName") ){ StringBuilder v1String= new StringBuilder(String.valueOf(v1)); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryLogEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryLogEOController.java index 0915efcd9..28fc4cd20 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryLogEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/controller/ProjectLawsInventoryLogEOController.java @@ -49,12 +49,12 @@ public class ProjectLawsInventoryLogEOController extends JeroController queryPageList(ProjectLawsInventoryLogEO projectLawsInventoryLogEO, + public Result queryPageList(ProjectLawsInventoryLogEO projectLawsInventoryLogEO,String cut, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryLogEO, req.getParameterMap()); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("create_time").eq("is_en_log",cut); Page page = new Page(pageNo, pageSize); IPage pageList = projectLawsInventoryLogEOService.page(page, queryWrapper); return Result.OK(pageList); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java index 86f1e9751..bf73a7cf1 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectLawsInventoryEO.java @@ -200,6 +200,8 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "设计符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String designDeliverableType; + @TableField(exist = false) + private String designDeliverableTypeName; /**设计符合性确认-交付物模板*/ @ApiModelProperty(value = "设计符合性确认-交付物模板") @@ -257,6 +259,8 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "prehomo确认-1") @Dict(dicCode ="deliverable_template") private String prehomoDeliverableType; + @TableField(exist = false) + private String prehomoDeliverableTypeName; /**prehomo确认-交付物模板*/ @ApiModelProperty(value = "prehomo确认-交付物模板") @@ -314,6 +318,8 @@ public class ProjectLawsInventoryEO implements Serializable { @ApiModelProperty(value = "验证符合性确认-交付物类型") @Dict(dicCode ="deliverable_template") private String verifyDeliverableType; + @TableField(exist = false) + private String verifyDeliverableTypeName; /**验证符合性确认-交付物模板*/ @ApiModelProperty(value = "验证符合性确认-交付物模板") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java index 11c07375b..5dba798d8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/ProjectInventoryFieldEnum.java @@ -1,50 +1,53 @@ package com.jero.modules.project.enums; public enum ProjectInventoryFieldEnum { - SUBTITLE("子标题","subtitle"), - WVTA_ID("WVTA ID","wvta_id"), - TECHNOLOGY_TERRITORY("技术领域","technology_territory"), - DUTY_TERRITORY("责任领域","duty_territory"), - REGULATION_OWNER_NAME("法规工程师名称","regulation_owner_name"), - HOMOLOGATION_ENGINEER_NAME("认证工程师名称","homologation_engineer_name"), - ENGINEERING_INTERFACE_PERSON_NAME("工程接口人名称","engineering_interface_personName"), - IMPLEMENT_TYPE("实施类别","implement_type"), - ATTESTATION_TYPE("认证类型","attestation_type"), - ATTESTATION_RANK("认证级别","attestation_rank"), - XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期","xin1_che1_xing2_shi2_shi1_ri4_qi1"), - IMPLEMENT_TIME("在产车实施日期","implement_time"), - REGION("适用地区","region"), - REMARK("备注","remark"), - DESIGN_DUE_DATE("设计符合性确认-截止时间","designDueDate"), - PREHOMO_DUE_DATE("Pre-Homo确认-截止时间","prehomoDueDate"), - VERIFY_DUE_DATE("验证符合性确认-截止时间","verifyDueDate"), + SUBTITLE("子标题", "subtitle","Sub-Title"), + WVTA_ID("WVTA ID", "wvta_id","WVTA ID"), + TECHNOLOGY_TERRITORY("技术领域", "technology_territory","Technical Field"), + DUTY_TERRITORY("责任领域", "duty_territory","Responsible Field"), + REGULATION_OWNER_NAME("法规工程师名称","regulation_owner_name","Regulation Engineer"), + HOMOLOGATION_ENGINEER_NAME("认证工程师名称","homologation_engineer_name","Homologation Engineer"), + ENGINEERING_INTERFACE_PERSON_NAME("工程接口人名称","engineering_interface_personName","Engineering Interface"), + IMPLEMENT_TYPE("实施类别", "implement_type","Usage"), + ATTESTATION_TYPE("认证类型", "attestation_type","Certification Type"), + ATTESTATION_RANK("认证级别", "attestation_rank","Certification Level"), + XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1("新车型实施日期", "xin1_che1_xing2_shi2_shi1_ri4_qi1","New Type Execute Date"), + IMPLEMENT_TIME("在产车实施日期", "implement_time","New Vehicle Execute Date"), + REGION("适用地区", "region","Area"), + REMARK("备注", "remark","Comments"), + DESIGN_DUE_DATE("设计符合性确认-截止时间","designDueDate","Cut-Off Time"), + PREHOMO_DUE_DATE("Pre-Homo确认-截止时间","prehomoDueDate","Cut-Off Time"), + VERIFY_DUE_DATE("验证符合性确认-截止时间","verifyDueDate","Cut-Off Time"), - DELIVERABLE_TEMPLATE("交付物类型","deliverable_template"), - FA1_QI3_REN2("发起人","fa1_qi3_ren2"), - ZE2_REN2_REN2("责任人","ze2_ren4_ren2"), + DELIVERABLE_TEMPLATE("交付物类型", "deliverable_template","Type of deliverables"), + FA1_QI3_REN2("发起人", "fa1_qi3_ren2","Initiator"), + ZE2_REN2_REN2("责任人", "ze2_ren4_ren2","Assignee"), - DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型","deliverable_template"), - DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板","design_deliverable_template"), - DESIGN_INITIATOR("设计符合性确认-发起人","fa1_qi3_ren2"), - DESIGN_DUTY("设计符合性确认-责任人","ze2_ren4_ren2"), + DESIGN_DELIVERABLE_TYPE("设计符合性确认-交付物类型", "deliverable_template","Type of deliverables"), + DESIGN_DELIVERABLE_TEMPLATE("设计符合性确认-交付物模板", "design_deliverable_template","Deliverable template"), + DESIGN_INITIATOR("设计符合性确认-发起人", "fa1_qi3_ren2","Initiator"), + DESIGN_DUTY("设计符合性确认-责任人", "ze2_ren4_ren2","Assignee"), - PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型","deliverable_template"), - PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板","prehomo_deliverable_template"), - PREHOMO_INITIATOR("prehomo确认-发起人","fa1_qi3_ren2"), - PREHOMO_DUTY("prehomo确认-责任人","ze2_ren4_ren2"), + PREHOMO_DELIVERABLE_TYPE("prehomo确认-交付物类型", "deliverable_template","Type of deliverables"), + PREHOMO_DELIVERABLE_TEMPLATE("prehomo确认-交付物模板", "prehomo_deliverable_template","Deliverable template"), + PREHOMO_INITIATOR("prehomo确认-发起人", "fa1_qi3_ren2","Initiator"), + PREHOMO_DUTY("prehomo确认-责任人", "ze2_ren4_ren2","Assignee"), + + VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型", "deliverable_template","Type of deliverables"), + VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板", "verify_deliverable_template","Deliverable template"), + VERIFY_INITIATOR("验证符合性确认-发起人", "fa1_qi3_ren2","Initiator"), + VERIFY_DUTY("验证符合性确认-责任人", "ze2_ren4_ren2","Assignee"), - VERIFY_DELIVERABLE_TYPE("验证符合性确认-交付物类型","deliverable_template"), - VERIFY_DELIVERABLE_TEMPLATE("验证符合性确认-交付物模板","verify_deliverable_template"), - VERIFY_INITIATOR("验证符合性确认-发起人","fa1_qi3_ren2"), - VERIFY_DUTY("验证符合性确认-责任人","ze2_ren4_ren2"), ; String name; String value; + String enName; - ProjectInventoryFieldEnum(String name, String value) { + ProjectInventoryFieldEnum(String name, String value, String enName) { this.name = name; this.value = value; + this.enName = enName; } public String getName() { @@ -62,4 +65,12 @@ public enum ProjectInventoryFieldEnum { public void setValue(String value) { this.value = value; } -} + + public String getEnName() { + return enName; + } + + public void setEnName(String enName) { + this.enName = enName; + } +} \ No newline at end of file diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index a6041e592..723b0cc7e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -1,14 +1,6 @@ package com.jero.modules.project.service.impl; import cn.hutool.core.util.ZipUtil; -//import com.jero.modules.project.util.WordUtil; -import cn.hutool.poi.word.DocUtil; -import com.itextpdf.text.*; -import com.itextpdf.text.Font; -import com.itextpdf.text.pdf.*; -import com.jero.modules.dummy.entity.DummyInventoryBaseEO; -import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; -import com.jero.modules.dummy.service.impl.DummyInventoryBaseEOServiceImpl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.aliyuncs.utils.IOUtils; @@ -16,6 +8,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.itextpdf.text.Font; +import com.itextpdf.text.*; +import com.itextpdf.text.pdf.BaseFont; +import com.itextpdf.text.pdf.PdfPCell; +import com.itextpdf.text.pdf.PdfPTable; +import com.itextpdf.text.pdf.PdfWriter; import com.jero.common.api.vo.Result; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; @@ -27,8 +25,12 @@ import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.modules.document.entity.BussDocumentLibraryEO; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.dummy.entity.DummyInventoryBaseEO; import com.jero.modules.dummy.entity.DummyInventoryInfoEO; +import com.jero.modules.dummy.enums.DummyInventoryBaseFieldEnum; import com.jero.modules.dummy.service.IDummyInventoryInfoEOService; +import com.jero.modules.dummy.service.impl.DummyInventoryBaseEOServiceImpl; +import com.jero.modules.dummy.util.DeepCopyListUtil; import com.jero.modules.dummy.util.ListDiff; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.message.websocket.WebSocket; @@ -47,6 +49,7 @@ import com.jero.modules.system.entity.SysAnnouncement; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.entity.SysUser; +import com.jero.modules.system.mapper.SysCategoryMapper; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.mapper.SysUserMapper; import com.jero.modules.system.service.ISysAnnouncementService; @@ -58,12 +61,12 @@ import com.jero.modules.wkflow.enums.DesignComplianceNodeEnum; import com.jero.modules.wkflow.enums.FlowTypeEnum; import com.jero.modules.wkflow.feginClient.impl.WorkFlowFeignClientImpl; import com.jero.modules.wkflow.service.IProcessHistoryEOService; -import com.jero.modules.wkflow.service.impl.ProcessHistoryEOServiceImpl; import lombok.SneakyThrows; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.SerializationUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; @@ -75,12 +78,8 @@ import org.docx4j.Docx4J; import org.docx4j.TraversalUtil; import org.docx4j.XmlUtils; import org.docx4j.finders.ClassFinder; -import org.docx4j.finders.RangeFinder; import org.docx4j.openpackaging.exceptions.Docx4JException; import org.docx4j.openpackaging.packages.WordprocessingMLPackage; -import org.docx4j.openpackaging.parts.WordprocessingML.MainDocumentPart; -import org.docx4j.wml.Body; -import org.docx4j.wml.CTBookmark; import org.docx4j.wml.Tbl; import org.docx4j.wml.Tr; import org.jeecgframework.poi.excel.ExcelExportUtil; @@ -102,12 +101,14 @@ import java.io.*; import java.net.URLEncoder; import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.util.*; import java.util.List; +import java.util.*; import java.util.stream.Collectors; import static com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl.copyFile; +//import com.jero.modules.project.util.WordUtil; + /** * @Description: 项目库-法规清单表 * @Author: jero-boot @@ -194,6 +195,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectTaskInventoryEOList = new ArrayList<>(); //法规清单所有的数据 LambdaQueryWrapper wrapperTemp = new LambdaQueryWrapper<>(); @@ -270,8 +273,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); String dummyInventoryBaseName = dummyInventoryBaseEOService.list(queryWrapper.eq("id", dummyInventoryBaseId)).get(0).getName();//name - String contentLog = username+"调取了\""+ dummyInventoryBaseName +"\"虚拟清单的标准内容"; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId); + String contentLog = username+"调取了"+ dummyInventoryBaseName +"虚拟清单的标准内容"; + String enContentLog = username+" called the standard content of"+ dummyInventoryBaseName +"virtual inventory."; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); } }else if(dummyInventoryInfoEOList.size() == 0 && StringUtils.isBlank(projectLawsInventoryEO.getFlag())){ //flag为二次确认标识,flag为空时进行验证 @@ -336,12 +341,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"向清单中添加了标准\""+serialNumber+"\""; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId()); + String contentLog = username+"向清单中添加了“"+serialNumber+"”"; + String enContentLog = username+" added “"+serialNumber+"” to the list."; + + projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLawsInventoryEO.getProjectLibraryId(),CutEnum.EN.getValue()); } //项目任务清单数据初始化。 this.projectTaskInventoryEOService.saveBatch(projectTaskInventoryEOList); - } + } /** * 更新 @@ -350,35 +358,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(projectLawsInventoryEO); + List infoEOListCopy = new ArrayList<>(); + infoEOListCopy.add(projectLawsInventoryEOCopy); + //查询数据库里原来的数据 QueryWrapper queryWrapper = new QueryWrapper<>(); List dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId())); + List dataListCopy = DeepCopyListUtil.depCopy(dataList); //保存 saveOrUpdate(projectLawsInventoryEO); - //翻译 + //翻译-中文 translateData(infoEOList); translateData(dataList); + //翻译-英文 + translateDataToEn(infoEOListCopy); + translateDataToEn(dataListCopy); + //比对不同字段 Map infoDiff = ListDiff.compareObject(dataList.get(0),projectLawsInventoryEO); + Map infoDiffEn = ListDiff.compareObject(dataListCopy.get(0),projectLawsInventoryEOCopy); //设置更新log - contentLog = setContentLog(infoDiff,contentLog); - projectLawsInventoryLogEOService.updateLog(contentLog, projectLawsInventoryEO.getProjectLibraryId()); + setContentLog(infoDiff,contentLog,infoDiffEn,enContentLog,projectLawsInventoryEO.getProjectLibraryId()); + //验证用户是否是该法规上级 项目库的studio， 如果是，则同步更新流程 int roleCode = checkUserRole(projectLawsInventoryEO.getProjectLibraryId(), currentUser.getId(), ""); @@ -389,14 +410,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl taskInventoryQueryWrapper = new QueryWrapper<>(); taskInventoryQueryWrapper.lambda().eq(ProjectTaskInventoryEO::getProjectLawsInventoryId,projectLawsInventoryEO.getId()); @@ -482,7 +503,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); String serialNumber = list(queryWrapper.eq("id",id)).get(0).getSerialNumber(); - String contentLog = username+"删除了清单中的\""+serialNumber+"\"标准"; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId); + String contentLog = username+"删除了清单中的“"+serialNumber+"”"; + String enContentLog = username+" deleted “"+serialNumber+"” from the list"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.EN.getValue()); - removeById(id); + removeById(id); this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(Arrays.asList(id.split(","))); - } + } /** * 批量删除 @@ -512,7 +535,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl ids,String projectLibraryId,String cut) { + public void deleteByIds(List ids,String projectLibraryId,String cut) { LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); int isProjectRole = checkUserRole(projectLibraryId, currentUser.getId(),""); if(!ProjectRoleEnum.STUDIO_ENGINEER.getValue().equals(String.valueOf(isProjectRole))){ @@ -529,12 +552,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); List lawsList = list(queryWrapper.in("id", ids)); String serialNumber = lawsList.stream().map(e->e.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"删除了清单中的\""+serialNumber+"\"标准"; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId); - removeByIds(ids); + String contentLog = username+"删除了清单中的“"+serialNumber+"”"; + String enContentLog = username+" deleted “"+serialNumber+"” from the list"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.EN.getValue()); + + removeByIds(ids); this.projectTaskInventoryEOService.deleteByProjectLawsInventoryIds(ids); - } + } /** * 通过id查询 @@ -547,13 +573,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) { + public List queryList(ProjectLawsInventoryEO projectLawsInventoryEO, HttpServletRequest req) { QueryWrapper projectLawsInventoryEOQueryWrapper = QueryGenerator.initQueryWrapper(projectLawsInventoryEO,req.getParameterMap()); projectLawsInventoryEOQueryWrapper.orderByDesc("create_time","serial_number"); String projectLibraryId = projectLawsInventoryEO.getProjectLibraryId(); @@ -577,7 +603,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl result = super.baseMapper.selectList(projectLawsInventoryEOQueryWrapper); dataDispose(result,currentUser,isProjectRole,projectLawsInventoryEO.getCut()); return result; - } + } /** * 数据处理 @@ -586,6 +612,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list,LoginUser currentUser,int isProjectRole,String cut){ if(CollectionUtils.isNotEmpty(list)){ + //树形结构数据字典(技术领域) + List categoryList = sysCategoryService.list(); List userIdList = new ArrayList<>(); List deliverableList = new ArrayList<>(); List correspondingStandardList = new ArrayList<>(); @@ -602,6 +630,28 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl designDeliverableTypeList = Arrays.asList(designDeliverableType.split(",")); + String name = getTreeName(cut, categoryList, designDeliverableTypeList); + projectLawsInventoryEO.setDesignDeliverableTypeName(name); + } + //pre交付物类型 + if(StringUtils.isNotBlank(prehomoDeliverableType)){ + List prehomoDeliverableTypeList = Arrays.asList(prehomoDeliverableType.split(",")); + String name = getTreeName(cut, categoryList, prehomoDeliverableTypeList); + projectLawsInventoryEO.setPrehomoDeliverableTypeName(name); + } + //验证交付物类型 + if(StringUtils.isNotBlank(verifyDeliverableType)){ + List verifyDeliverableTypeList = Arrays.asList(verifyDeliverableType.split(",")); + String name = getTreeName(cut, categoryList, verifyDeliverableTypeList); + projectLawsInventoryEO.setVerifyDeliverableTypeName(name); + } StringBuilder sb = new StringBuilder(); if(StringUtils.isNotBlank(projectLawsInventoryEO.getCorrespondingStandard()) && bussDocumentLibraryEOS.size() != 0){ for (String correspondingStandard : projectLawsInventoryEO.getCorrespondingStandard().split(",")) { @@ -827,6 +877,25 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl categoryList, List technologyTerritoryList) { + StringBuilder sb = new StringBuilder(); + for (String technologyTerritory : technologyTerritoryList) { + List collect = categoryList.stream().filter(e -> technologyTerritory.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + if (CutEnum.CN.getValue().equals(cut)) { + sb.append(collect.get(0).getName() + ","); + } else { + sb.append(collect.get(0).getEnName()+ ","); + } + } + } + String technologyTerritoryName = ""; + if (StringUtils.isNotBlank(sb)) { + technologyTerritoryName = sb.substring(0, sb.length() - 1); + } + return technologyTerritoryName; + } + private String getFileName(ProjectLawsInventoryEO projectLawsInventoryEO, List fileInfos, String deliverableTemplate){ StringBuilder sb = new StringBuilder(); for (String s : deliverableTemplate.split(",")) { @@ -847,7 +916,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); @@ -877,7 +946,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLibraryBaseQueryWrapper = new QueryWrapper<>(); projectLibraryBaseQueryWrapper.lambda().eq(ProjectLibraryBase::getId,projectLibraryId); @@ -1054,7 +1123,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().success(result + "成功！"); + return new Result<>().success(result + "成功！"); } /** @@ -1247,7 +1316,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl().success("带入成功！"); } @@ -1475,27 +1547,71 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"复制了\""+serialNumber+"\""; - projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId); + String contentLog = username+"复制了“"+serialNumber+"”"; + String enContentLog = username+" copied “"+serialNumber+"”"; + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); } } @Override - public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) { + public void setBatch(ProjectLawsInventoryEO projectLawsInventoryEO) {///// if(org.apache.commons.lang3.StringUtils.isNotBlank(projectLawsInventoryEO.getIds())){ - //更新log - LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - String username = sysUser.getUsername(); - String contentLog = username+"批量设置了"; - StringBuilder contentLogBuilder = new StringBuilder(contentLog); - //根据id查询数据库中完整信息,翻译 List idList = Arrays.asList(projectLawsInventoryEO.getIds().split(",")); QueryWrapper queryWrapper = new QueryWrapper<>(); List infoList = list(queryWrapper.in("id", idList)); String projectLibraryId = infoList.get(0).getProjectLibraryId(); + + List projectLawsInventoryEOList = new ArrayList<>(); + for (String id : projectLawsInventoryEO.getIds().split(",")) { + ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); + projectLawsInventoryEOTemp.setId(id); + //实施类别 implementType + if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){ + projectLawsInventoryEOTemp.setImplementType(projectLawsInventoryEO.getImplementType()); + } + //认证类型 attestationType + if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){ + projectLawsInventoryEOTemp.setAttestationType(projectLawsInventoryEO.getAttestationType()); + } + //认证级别 attestationRank + if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){ + projectLawsInventoryEOTemp.setAttestationRank(projectLawsInventoryEO.getAttestationRank()); + } + //责任领域 dutyTerritory + if(org.apache.commons.lang.StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){ + projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory()); + } + //设计符合性确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){ + projectLawsInventoryEOTemp.setDesignDueDate(projectLawsInventoryEO.getDesignDueDate()); + } + //preHomo确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDueDate())){ + projectLawsInventoryEOTemp.setPrehomoDueDate(projectLawsInventoryEO.getPrehomoDueDate()); + } + //验证符合性确认截止时间 + if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){ + projectLawsInventoryEOTemp.setVerifyDueDate(projectLawsInventoryEO.getVerifyDueDate()); + } + projectLawsInventoryEOList.add(projectLawsInventoryEOTemp); + } + this.updateBatchById(projectLawsInventoryEOList); + + //更新log + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String username = sysUser.getUsername(); + String contentLog = username+"批量设置了"; + StringBuilder contentLogBuilder = new StringBuilder(contentLog); + String enContentLog = username+" batch set “"; + StringBuilder enContentLogBuilder = new StringBuilder(enContentLog); + + List infoListCopy = DeepCopyListUtil.depCopy(infoList); + translateData(infoList); + translateDataToEn(infoListCopy); //翻译传入的数据 List inputList = new ArrayList<>(); @@ -1505,114 +1621,107 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLawsInventoryEOList = new ArrayList<>(); + for (String id : projectLawsInventoryEO.getIds().split(",")) { ProjectLawsInventoryEO info = infoList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); + ProjectLawsInventoryEO infoCopy = infoListCopy.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()).get(0); contentLogBuilder.append(info.getSerialNumber() + ":"); + enContentLogBuilder.append(infoCopy.getSerialNumber() + ":"); ProjectLawsInventoryEO projectLawsInventoryEOTemp = new ProjectLawsInventoryEO(); projectLawsInventoryEOTemp.setId(id); //实施类别 implementType if(StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())){ - projectLawsInventoryEOTemp.setImplementType(projectLawsInventoryEO.getImplementType()); - if (StringUtils.isBlank(info.getImplementType())){ - info.setImplementType("空"); - } - if (!info.getImplementType().equals(inputInfoEO.getImplementType())) { + if (!info.getImplementType().equals(inputInfoEO.getImplementType()) && !inputInfoEO.getImplementType().equals("空")){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName(), info.getImplementType(), inputInfoEO.getImplementType()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName(), info.getImplementType(), inputInfoEO.getImplementType()); } } //认证类型 attestationType if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())){ - projectLawsInventoryEOTemp.setAttestationType(projectLawsInventoryEO.getAttestationType()); - if (StringUtils.isBlank(info.getAttestationType())){ - info.setAttestationType("空"); - } - if (!info.getAttestationType().equals(inputInfoEO.getAttestationType())) { + if (!info.getAttestationType().equals(inputInfoEO.getAttestationType()) && !inputInfoEO.getAttestationType().equals("空")){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName(), info.getAttestationType(), inputInfoEO.getAttestationType()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName(), info.getAttestationType(), inputInfoEO.getAttestationType()); } } //认证级别 attestationRank if(StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())){ - projectLawsInventoryEOTemp.setAttestationRank(projectLawsInventoryEO.getAttestationRank()); - if (StringUtils.isBlank(info.getAttestationRank())){ - info.setAttestationRank("空"); - } - if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank())){ + if (!info.getAttestationRank().equals(inputInfoEO.getAttestationRank()) && !inputInfoEO.getAttestationRank().equals("空")){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName(), info.getAttestationRank(), inputInfoEO.getAttestationRank()); } } //责任领域 dutyTerritory if(StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())){ - projectLawsInventoryEOTemp.setDutyTerritory(projectLawsInventoryEO.getDutyTerritory()); - if (StringUtils.isBlank(info.getDutyTerritory())){ - info.setDutyTerritory("空"); - } if (!info.getDutyTerritory().equals(inputInfoEO.getDutyTerritory())){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName(), info.getDutyTerritory(), inputInfoEO.getDutyTerritory()); } } //在产车实施日期implementTime if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getImplementTime())){ - projectLawsInventoryEOTemp.setImplementTime(projectLawsInventoryEO.getImplementTime()); if (info.getImplementTime() == null){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(),"空",inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(),"null",inputInfoEO.getImplementTimeString()); }else { if (!info.getImplementTimeString().equals(inputInfoEO.getImplementTimeString())) { setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName(), info.getImplementTimeString(), inputInfoEO.getImplementTimeString()); } } } //新车型实施日期xin1Che1Xing2Shi2Shi1Ri4Qi1 if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ - projectLawsInventoryEOTemp.setXin1Che1Xing2Shi2Shi1Ri4Qi1(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); if (info.getXin1Che1Xing2Shi2Shi1Ri4Qi1() == null){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(),"空",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(),"null",inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); }else { if (!info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String().equals(inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String())) { setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName(), info.getXin1Che1Xing2Shi2Shi1Ri4Qi1String(), inputInfoEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1String()); } } } //适用地区region if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getRegion())){ - projectLawsInventoryEOTemp.setRegion(projectLawsInventoryEO.getRegion()); - if (StringUtils.isBlank(info.getRegion())){ - info.setRegion("空"); - } if (!info.getRegion().equals(inputInfoEO.getRegion())) { setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.REGION.getName(),info.getRegion(),inputInfoEO.getRegion()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.REGION.getEnName(),info.getRegion(),inputInfoEO.getRegion()); + } } //设计符合性确认截止时间 if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getDesignDueDate())){ - projectLawsInventoryEOTemp.setDesignDueDate(projectLawsInventoryEO.getDesignDueDate()); if (info.getDesignDueDate() == null){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(),"空",inputInfoEO.getDesignDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(),"null",inputInfoEO.getDesignDueDateString()); }else { if (!info.getDesignDueDateString().equals(inputInfoEO.getDesignDueDateString())) { setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName(), info.getDesignDueDateString(), inputInfoEO.getDesignDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName(), info.getDesignDueDateString(), inputInfoEO.getDesignDueDateString()); } } } //preHomo确认截止时间 if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDueDate())){ - projectLawsInventoryEOTemp.setPrehomoDueDate(projectLawsInventoryEO.getPrehomoDueDate()); if (info.getVerifyDueDate() == null){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(),"空",inputInfoEO.getPrehomoDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(),"空",inputInfoEO.getPrehomoDueDateString()); }else { if (!info.getPrehomoDueDateString().equals(inputInfoEO.getPrehomoDueDateString())) { setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getName(), info.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.PREHOMO_DUE_DATE.getEnName(), info.getPrehomoDueDateString(), inputInfoEO.getPrehomoDueDateString()); } } } //验证符合性确认截止时间 if(ObjectUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDueDate())){ - projectLawsInventoryEOTemp.setVerifyDueDate(projectLawsInventoryEO.getVerifyDueDate()); if (info.getVerifyDueDate() == null){ setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(),"空",inputInfoEO.getVerifyDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(),"null",inputInfoEO.getVerifyDueDateString()); }else { if (!info.getVerifyDueDateString().equals(inputInfoEO.getVerifyDueDateString())) { setUpdateContentLog(contentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getName(), info.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString()); + setUpdateEnContentLog(enContentLogBuilder, ProjectInventoryFieldEnum.VERIFY_DUE_DATE.getEnName(), info.getVerifyDueDateString(), inputInfoEO.getVerifyDueDateString()); } } } @@ -1621,14 +1730,17 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoList) { for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) { //子标题 @@ -1879,6 +1991,265 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoList) { + for (ProjectLawsInventoryEO projectLawsInventoryEO : infoList) { + //子标题 + if (StringUtils.isBlank(projectLawsInventoryEO.getSubtitle())) { + projectLawsInventoryEO.setSubtitle("null"); + } + //WVTA ID + if (StringUtils.isBlank(projectLawsInventoryEO.getWvtaId())) { + projectLawsInventoryEO.setWvtaId("null"); + } + //备注 + if (StringUtils.isBlank(projectLawsInventoryEO.getRemark())) { + projectLawsInventoryEO.setRemark("null"); + } + //实施类别 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getImplementType())) { + List implementType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getValue()); + String implementTypeName = implementType.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getImplementType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setImplementType(implementTypeName); + } else { + projectLawsInventoryEO.setImplementType("null"); + } + + //在产车实施日期 + if (projectLawsInventoryEO.getImplementTime() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(projectLawsInventoryEO.getImplementTime()); + projectLawsInventoryEO.setImplementTimeString(dateString); + }else { + projectLawsInventoryEO.setImplementTimeString("null"); + } + + //新车型实施日期 + if (projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1()); + projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String(dateString); + }else { + projectLawsInventoryEO.setXin1Che1Xing2Shi2Shi1Ri4Qi1String("null"); + } + + //认证类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationType())) { + List attestationType = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_TYPE.getValue()); + List attestationTypeList = Arrays.asList(projectLawsInventoryEO.getAttestationType().split(",")); + StringBuilder attestationTypeBuilder = new StringBuilder(); + for (String midDutyTerritory : attestationTypeList) { + String attestationTypeName = attestationType.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + attestationTypeBuilder.append(attestationTypeName).append(","); + } + projectLawsInventoryEO.setAttestationType(attestationTypeBuilder.substring(0, attestationTypeBuilder.toString().length() - 1)); + + + } else { + projectLawsInventoryEO.setAttestationType("null"); + } + + //认证级别 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getAttestationRank())) { + List attestationRank = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.ATTESTATION_RANK.getValue()); + String attestationRankName = attestationRank.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getAttestationRank())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setAttestationRank(attestationRankName); + } else { + projectLawsInventoryEO.setAttestationRank("null"); + } + + + //责任领域 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDutyTerritory())) { + List dutyTerritory = sysDictItemMapper.selectItemsByDictCode(ProjectInventoryFieldEnum.DUTY_TERRITORY.getValue()); + List dutyTerritoryList = Arrays.asList(projectLawsInventoryEO.getDutyTerritory().split(",")); + StringBuilder dutyTerritoryBuilder = new StringBuilder(); + for (String midDutyTerritory : dutyTerritoryList) { + String dutyTerritoryName = dutyTerritory.stream().filter(e -> e.getItemValue().equals(midDutyTerritory)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + dutyTerritoryBuilder.append(dutyTerritoryName).append(","); + } + projectLawsInventoryEO.setDutyTerritory(dutyTerritoryBuilder.substring(0, dutyTerritoryBuilder.toString().length() - 1)); + } else { + projectLawsInventoryEO.setDutyTerritory("null"); + } + + //适用地区 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegion())) { + List region = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.REGION.getValue()); + List regionList = Arrays.asList(projectLawsInventoryEO.getRegion().split(",")); + StringBuilder regionBuilder = new StringBuilder(); + for (String midRegion : regionList) { + String regionName = region.stream().filter(e -> e.getItemValue().equals(midRegion)).map(f -> f.getEnName()).collect(Collectors.joining(",")); + regionBuilder.append(regionName).append(","); + } + projectLawsInventoryEO.setRegion(regionBuilder.substring(0, regionBuilder.toString().length() - 1)); + }else { + projectLawsInventoryEO.setRegion("null"); + } + + //交付物类型 + List deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); + //设计符合性确认-交付物类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { + String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setDesignDeliverableType(designDeliverableTypeName); + }else { + projectLawsInventoryEO.setDesignDeliverableType("null"); + } + //prehomo确认-交付物类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); + }else { + projectLawsInventoryEO.setPrehomoDeliverableType("null"); + } + //验证符合性确认-交付物类型 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(projectLawsInventoryEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); + projectLawsInventoryEO.setVerifyDeliverableType(verifyDeliverableTypeName); + }else { + projectLawsInventoryEO.setVerifyDeliverableType("null"); + } + + + List userIdList= new ArrayList<>(); + //法规工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { + userIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); + } else { + projectLawsInventoryEO.setRegulationOwnerName("null"); + } + + //认证工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { + userIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); + }else { + projectLawsInventoryEO.setHomologationEngineerName("null"); + } + + //工程接口人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { + userIdList.add(projectLawsInventoryEO.getEngineeringInterfacePerson()); + }else { + projectLawsInventoryEO.setEngineeringInterfacePersonName("null"); + } + + //发起人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { + userIdList.add(projectLawsInventoryEO.getDesignInitiatorId()); + }else { + projectLawsInventoryEO.setDesignInitiatorName("null"); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { + userIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId()); + }else { + projectLawsInventoryEO.setPrehomoInitiatorName("null"); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { + userIdList.add(projectLawsInventoryEO.getVerifyInitiatorId()); + }else { + projectLawsInventoryEO.setVerifyInitiatorName("null"); + } + + //责任人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { + userIdList.add(projectLawsInventoryEO.getDesignDutyId()); + }else { + projectLawsInventoryEO.setDesignDutyName("null"); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { + userIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); + }else { + projectLawsInventoryEO.setPrehomoDutyName("null"); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { + userIdList.add(projectLawsInventoryEO.getVerifyDutyId()); + }else { + projectLawsInventoryEO.setVerifyDutyName("null"); + } + + userIdList = userIdList.stream().distinct().collect(Collectors.toList()); + if(CollectionUtils.isNotEmpty(userIdList)){ + QueryWrapper userqueryWrapper = new QueryWrapper<>(); + List userList = sysUserService.list(userqueryWrapper.in("id ", userIdList)); + + //法规工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getRegulationOwnerId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getRegulationOwnerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setRegulationOwnerName(userName); + } + + //认证工程师 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getHomologationEngineerId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getHomologationEngineerId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setHomologationEngineerName(userName); + } + + //工程接口人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getEngineeringInterfacePerson())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getEngineeringInterfacePerson())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setEngineeringInterfacePersonName(userName); + } + + + //发起人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignInitiatorId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setDesignInitiatorName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoInitiatorId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setPrehomoInitiatorName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyInitiatorId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyInitiatorId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setVerifyInitiatorName(userName); + } + + //责任人 + if (StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDutyId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getDesignDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setDesignDutyName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDutyId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getPrehomoDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setPrehomoDutyName(userName); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDutyId())) { + String userName = userList.stream().filter(e -> e.getId().equals(projectLawsInventoryEO.getVerifyDutyId())).map(f -> f.getUsername()).collect(Collectors.toList()).get(0); + projectLawsInventoryEO.setVerifyDutyName(userName); + } + } + + + //截止时间 + //设计符合性确认-截止时间 designDueDate + if (projectLawsInventoryEO.getDesignDueDate() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(projectLawsInventoryEO.getDesignDueDate()); + projectLawsInventoryEO.setDesignDueDateString(dateString); + }else { + projectLawsInventoryEO.setDesignDueDateString("null"); + } + //prehomo确认-截止时间 prehomoDueDate + if (projectLawsInventoryEO.getPrehomoDueDate() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(projectLawsInventoryEO.getPrehomoDueDate()); + projectLawsInventoryEO.setPrehomoDueDateString(dateString); + }else { + projectLawsInventoryEO.setPrehomoDueDateString("null"); + } + //验证符合性确认-截止时间 verifyDueDate + if (projectLawsInventoryEO.getVerifyDueDate() != null) { + SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); + String dateString = sdf.format(projectLawsInventoryEO.getVerifyDueDate()); + projectLawsInventoryEO.setVerifyDueDateString(dateString); + }else { + projectLawsInventoryEO.setVerifyDueDateString("null"); + } + } + } + private ProjectLawsInventoryEO dataCompare(ProjectLawsInventoryEO projectLawsInventoryEO,DummyInventoryInfoEO dummyInventoryInfoEO){ //编号 if(StringUtils.isBlank(projectLawsInventoryEO.getSerialNumber())){ @@ -2150,7 +2521,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysUserList = sysUserService.list(); //数据转换(文件名称,对应标准) - dataTransition(dataList, fileInfos,sysUserList); + dataTransition(dataList, fileInfos,sysUserList,projectLawsInventoryEO); OutputStream os = null; try { @@ -2178,7 +2549,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataListEn){ + private void transition(List dataListEn,ProjectLawsInventoryEO projectLawsInventoryEOTemp){ //下拉选数据字典 List sysCategoryList = sysCategoryService.list(); //技术领域数据字典 List sysDictItems = sysDictItemServiceImpl.selectItemsAll(); for (ProjectLawsInventoryEOEn projectLawsInventoryEOEn : dataListEn) { + + //设计交付物类型 inventoryInfoEO + if(StringUtils.isNotBlank(projectLawsInventoryEOEn.getDesignDeliverableType())){ + StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEOEn.getDesignDeliverableType()); + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + projectLawsInventoryEOEn.setDesignDeliverableType(substring); + } + } + //pre交付物类型 + if(StringUtils.isNotBlank(projectLawsInventoryEOEn.getPrehomoDeliverableType())){ + StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEOEn.getPrehomoDeliverableType()); + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + projectLawsInventoryEOEn.setPrehomoDeliverableType(substring); + } + } + //验证交付物类型 + if(StringUtils.isNotBlank(projectLawsInventoryEOEn.getVerifyDeliverableType())){ + StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEOEn.getVerifyDeliverableType()); + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + projectLawsInventoryEOEn.setVerifyDeliverableType(substring); + } + } + + //适用地区 String region = projectLawsInventoryEOEn.getRegion(); String pullRegion = pull(sysDictItems, region,"region"); @@ -2533,9 +2931,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl categoryList = sysCategoryService.list(); //普通数据字典 List dictItemList = sysDictItemServiceImpl.selectItemsAll(); - importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO); + importDatas(datas, dictItemList, zipEntryName,saveDirectory,projectLawsInventoryEO,categoryList); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -2633,7 +3032,16 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dictItemList, String zipEntryName, File saveDirectory, - ProjectLawsInventoryEO projectLawsInventoryEOTemp) { + ProjectLawsInventoryEO projectLawsInventoryEOTemp, + List categoryList) { + String dictId = sysCategoryMapper.getDictId("deliverable_template"); + List collect = categoryList.stream().filter(e -> e.getSysDictId().equals(dictId)).collect(Collectors.toList()); + List treeNameList = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())){ + treeNameList = collect.stream().map(SysCategory::getName).collect(Collectors.toList()); + }else{ + treeNameList = collect.stream().map(SysCategory::getEnName).collect(Collectors.toList()); + } int i = 3; List msgList = new ArrayList<>(); String value = ""; @@ -2815,9 +3223,10 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String username = sysUser.getUsername(); - String contentLog = username+"向清单中导入了\""+serialNumber+"\"标准"; - projectLawsInventoryLogEOService.updateLog(contentLog, dataList.get(0).getProjectLibraryId()); + String contentLog = username+"向清单中导入了“"+serialNumber+"”"; + String enContentLog = username+" imported “"+serialNumber+"” into the list."; + projectLawsInventoryLogEOService.updateLog(contentLog, dataList.get(0).getDummyInventoryBaseId(),CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, dataList.get(0).getDummyInventoryBaseId(),CutEnum.EN.getValue()); } } } + private String tree(List categoryList,List nameList,ProjectLawsInventoryEO projectLawsInventoryEO, + String errorMsg, String value,List msgList, + String nameCn,String nameEn,String dictCode) { + if (StringUtils.isNotBlank(value)) { + StringBuilder sb = new StringBuilder(); + for (String s : value.split(",")) { + if(!nameList.contains(s)){ + sb.append(s+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + if (CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())) { + errorMsg += nameCn + "中的" + substring + "与数据字典不匹配, "; + } else { + errorMsg += nameEn + " " + substring + " does not match the data dictionary, "; + } + msgList.add(errorMsg); + }else{ + StringBuilder sbTemp = new StringBuilder(); + for (String s : value.split(",")) { + List collect = new ArrayList<>(); + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + collect = categoryList.stream().filter(e -> s.equals(e.getName())).collect(Collectors.toList()); + if(collect.size() != 0){ + sbTemp.append(collect.get(0).getName()+","); + } + }else{ + collect = categoryList.stream().filter(e -> s.equals(e.getEnName())).collect(Collectors.toList()); + if(collect.size() != 0){ + sbTemp.append(collect.get(0).getEnName()+","); + } + } + } + if(StringUtils.isNotBlank(sbTemp)){ + String substring = sbTemp.substring(0, sbTemp.length() - 1); + return substring; + } + } + } + return null; + } + + private String getTreeId(List categoryList, + ProjectLawsInventoryEO projectLawsInventoryEOTemp, List treeNameList, String value) { + StringBuilder sb = new StringBuilder(); + for (String valueTemp : value.split(",")) { + if (treeNameList.contains(valueTemp)) { + List sysCategoryList = new ArrayList<>(); + if (CutEnum.CN.getValue().equals(projectLawsInventoryEOTemp.getCut())) { + sysCategoryList = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList()); + } else { + sysCategoryList = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList()); + } + if (sysCategoryList.size() != 0) { + sb.append(sysCategoryList.get(0).getId() + ","); + } + } + } + if (StringUtils.isNotBlank(sb)) { + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + return null; + } + private void verifySerialNumber(List dataList,ProjectLawsInventoryEO projectLawsInventoryEOTemp){ //1. 验证标准号在文档库中是否存在 List serialNumberList = dataList.stream().map(ProjectLawsInventoryEO::getSerialNumber).collect(Collectors.toList()); @@ -3152,8 +3631,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl msgList, - String nameCn,String nameEn) { + String errorMsg, String designDeliverableTemplate,List msgList, + String nameCn,String nameEn) { String value = ""; if (StringUtils.isNotBlank(designDeliverableTemplate)) { StringBuilder sb = new StringBuilder(); @@ -3350,6 +3829,22 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl sysCategoryList, String technologyTerritory) { + StringBuilder sb = new StringBuilder(); + for (String s : technologyTerritory.split(",")) { + List collect = sysCategoryList.stream() + .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); + if(collect.size() != 0){ + if(CutEnum.CN.getValue().equals(projectLawsInventoryEO.getCut())){ + sb.append(collect.get(0).getName()+","); + }else{ + sb.append(collect.get(0).getEnName()+","); + } + } + } + return sb; + } /** * 数据转换(文件名称,技术领域,对应标准) @@ -3358,9 +3853,37 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl dataList, List fileInfos, - List sysUserList) { + List sysUserList, + ProjectLawsInventoryEO projectLawsInventoryEOTemp) { + List sysCategoryList = sysCategoryService.list(); for (ProjectLawsInventoryEO projectLawsInventoryEO : dataList) { + //设计交付物类型 inventoryInfoEO + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())){ + StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEO.getDesignDeliverableType()); + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + projectLawsInventoryEO.setDesignDeliverableType(substring); + } + } + //pre交付物类型 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())){ + StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEO.getPrehomoDeliverableType()); + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + projectLawsInventoryEO.setPrehomoDeliverableType(substring); + } + } + //验证交付物类型 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())){ + StringBuilder sb = getStringBuilder(projectLawsInventoryEOTemp, sysCategoryList, projectLawsInventoryEO.getVerifyDeliverableType()); + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + projectLawsInventoryEO.setVerifyDeliverableType(substring); + } + } + + //清单确认状态 inventoryAffirmStatus if(StringUtils.isNotBlank(projectLawsInventoryEO.getInventoryAffirmStatus())){ String stateName = stateTransition(projectLawsInventoryEO.getInventoryAffirmStatus()); @@ -3576,7 +4099,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl infoDiff,String contentLog) { + public void setContentLog(Map infoDiff, String contentLog,Map infoDiffEn, String enContentLog, String projectLibraryId) { //设置维护清单的修改消息 if(MapUtils.isNotEmpty(infoDiff)) { @@ -3586,14 +4109,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("subtitle").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.SUBTITLE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("subtitle").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.SUBTITLE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //WVTA ID if (StringUtils.isNotBlank(infoDiff.get("wvtaId"))) { List list = Arrays.asList(infoDiff.get("wvtaId").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.WVTA_ID.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("wvtaId").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.WVTA_ID.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //实施类别 @@ -3601,7 +4134,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("implementType").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("implementType").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //在产车实施日期 @@ -3609,7 +4147,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("implementTimeString").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("implementTimeString").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + contentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + enContentLog += "'"+ProjectInventoryFieldEnum.IMPLEMENT_TIME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //新车型实施日期 @@ -3617,7 +4160,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("xin1Che1Xing2Shi2Shi1Ri4Qi1String").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.XIN1_CHE1_XING2_SHI2_SHI1_RI4_QI1.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //认证类型 @@ -3625,7 +4173,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationType").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("attestationType").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //认证级别 @@ -3633,7 +4186,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("attestationRank").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("attestationRank").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.ATTESTATION_RANK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //责任领域 @@ -3641,7 +4199,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("dutyTerritory").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("dutyTerritory").split("\\|")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DUTY_TERRITORY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //regulationOwnerName;//法规工程师名称 @@ -3649,21 +4212,36 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("regulationOwnerName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("regulationOwnerName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.REGULATION_OWNER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //homologationEngineerName;//认证工程师名称 if (StringUtils.isNotBlank(infoDiff.get("homologationEngineerName"))) { List list = Arrays.asList(infoDiff.get("homologationEngineerName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("homologationEngineerName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.HOMOLOGATION_ENGINEER_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //engineeringInterfacePersonName;//工程接口人名称 if (StringUtils.isNotBlank(infoDiff.get("engineeringInterfacePersonName"))) { List list = Arrays.asList(infoDiff.get("engineeringInterfacePersonName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("engineeringInterfacePersonName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.ENGINEERING_INTERFACE_PERSON_NAME.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //适用地区region 多选 @@ -3671,7 +4249,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("region").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.REGION.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.REGION.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("region").split("\\|")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.REGION.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //备注 @@ -3679,7 +4262,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("remark").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.REMARK.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.REMARK.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("remark").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.REMARK.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //设计符合性确认-交付物类型 @@ -3687,112 +4275,189 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("designDeliverableType").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //设计符合性确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplate"))) { List list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("designDeliverableTemplate").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //设计符合性确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("designInitiatorName"))) { List list = Arrays.asList(infoDiff.get("designInitiatorName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("designInitiatorName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //设计符合性确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("designDutyName"))) { List list = Arrays.asList(infoDiff.get("designDutyName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("designDutyName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //设计符合性确认-截止时间designDueDateString; if (StringUtils.isNotBlank(infoDiff.get("designDueDateString"))) { List list = Arrays.asList(infoDiff.get("designDueDateString").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("designDueDateString").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //prehomo确认-交付物类型 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableType"))) { List list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableType").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //prehomo确认-交付物模板 if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplate"))) { List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTemplate").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //prehomo确认-发起人 if (StringUtils.isNotBlank(infoDiff.get("prehomoInitiatorName"))) { List list = Arrays.asList(infoDiff.get("prehomoInitiatorName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("prehomoInitiatorName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //prehomo确认-责任人 if (StringUtils.isNotBlank(infoDiff.get("prehomoDutyName"))) { List list = Arrays.asList(infoDiff.get("prehomoDutyName").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("prehomoDutyName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //prehomo确认-截止时间prehomoDueDateString; if (StringUtils.isNotBlank(infoDiff.get("prehomoDueDateString"))) { List list = Arrays.asList(infoDiff.get("prehomoDueDateString").split(",")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("prehomoDueDateString").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) { - List list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; - } - //验证符合性确认-交付物模板 - if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) { - List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; - } - //验证符合性确认-发起人 - if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) { - List list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; - } - //验证符合性确认-责任人 - if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) { - List list = Arrays.asList(infoDiff.get("verifyDutyName").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; - } - //验证符合性确认-截止时间verifyDueDateString - if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) { - List list = Arrays.asList(infoDiff.get("verifyDueDateString").split(",")); - String infoDiffOld = list.get(0); - String infoDiffNew = list.get(1); - contentLog += ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "由" + infoDiffOld + "改为" + infoDiffNew + ","; - } + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableType"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableType").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; } + //验证符合性确认-交付物模板 + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplate"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTemplate").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TEMPLATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; + } + //验证符合性确认-发起人 + if (StringUtils.isNotBlank(infoDiff.get("verifyInitiatorName"))) { + List list = Arrays.asList(infoDiff.get("verifyInitiatorName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("verifyInitiatorName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_INITIATOR.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; + } + //验证符合性确认-责任人 + if (StringUtils.isNotBlank(infoDiff.get("verifyDutyName"))) { + List list = Arrays.asList(infoDiff.get("verifyDutyName").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("verifyDutyName").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DUTY.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; + } + //验证符合性确认-截止时间verifyDueDateString + if (StringUtils.isNotBlank(infoDiff.get("verifyDueDateString"))) { + List list = Arrays.asList(infoDiff.get("verifyDueDateString").split(",")); + String infoDiffOld = list.get(0); + String infoDiffNew = list.get(1); + contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; + + List listEn = Arrays.asList(infoDiffEn.get("verifyDueDateString").split(",")); + String infoDiffOldEn = listEn.get(0); + String infoDiffNewEn = listEn.get(1); + enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DUE_DATE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; + } + } } contentLog = contentLog.substring(0, contentLog.length()-1); - return contentLog; + enContentLog =enContentLog.substring(0, contentLog.length()-1); + projectLawsInventoryLogEOService.updateLog(contentLog, projectLibraryId,CutEnum.CN.getValue()); + projectLawsInventoryLogEOService.updateLog(enContentLog, projectLibraryId,CutEnum.EN.getValue()); } //表格高度 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryLogEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryLogEOServiceImpl.java index 4d248ef6e..014d19cd8 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryLogEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryLogEOServiceImpl.java @@ -24,13 +24,14 @@ public class ProjectLawsInventoryLogEOServiceImpl extends ServiceImpl { "a.is_model,i.item_text as is_model_name,i.en_name as is_model_en_name,a.show_area,a.sort,a.en_name\n" + "from onl_cgform_area as a left join sys_dict_item as i \n" + "on a.is_model=i.item_value \n" + - "where i.dict_id=1493096744092102657 order by a.sort desc") + "where i.dict_id=1493096744092102657 order by a.sort ") IPage queryPageList(IPage page, @Param("params") Map params); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml index 83e7e67e5..db6fac3dd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/xml/OnlCgformTagMapper.xml @@ -70,6 +70,6 @@ and f.show_area like concat('%',#{params.showArea},'%') - order by f.order_num desc + order by f.order_num \ No newline at end of file diff --git a/jero-web/src/assets/less/common.less b/jero-web/src/assets/less/common.less index 242b53c10..801cf50a5 100644 --- a/jero-web/src/assets/less/common.less +++ b/jero-web/src/assets/less/common.less @@ -90,10 +90,15 @@ .jee-hidden { display: none } + .box-input .ant-select-selection { height: 38px !important; } .box-input .ant-select-selection__rendered { line-height: 38px; +} + +.ant-table-fixed-left table, .ant-table-fixed-right table .ant-table-fixed{ + width: min-content; } \ No newline at end of file diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index e7ff17155..0b3cf876b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -895,4 +895,6 @@ module.exports = { replyFromProjectContact:'Reply from project contact person', pleaseUpload:'Please Upload', fullScreenView:'Full Screen View', + systemPrompt:'System Prompt', + loginExpired:'Login Expired', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5f9b01910..420dcdeae 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -900,4 +900,6 @@ module.exports = { replyFromProjectContact:'工程接口人回复', pleaseUpload:'请上传', fullScreenView:'全屏查看', + systemPrompt:'系统提示', + loginExpired:'登录已过期', } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 1b71d1a39..765e61e09 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -76,7 +76,7 @@ - @@ -253,19 +253,9 @@ }, edit(edit) { this.areaVisible = true - let _this = this - let query = { - id: edit.id - } - getAction(_this.url.queryById, query).then((res) => { - if (res.success) { - this.templatetitle = res.result.title - this.selectedRowKeys = res.result.paramsTemplateId.split(',') - this.rowId = res.result.id - this.version = res.result.paramsTemplatePublishVersion - } else { - } - }) + setTimeout(() => { + this.$refs.templateRef.editData(edit) + },50) }, handleAdd() { this.areaVisible = true diff --git a/jero-web/src/views/projectManagement/components/nonConformance.vue b/jero-web/src/views/projectManagement/components/nonConformance.vue index c119a66e5..6df7ce08a 100644 --- a/jero-web/src/views/projectManagement/components/nonConformance.vue +++ b/jero-web/src/views/projectManagement/components/nonConformance.vue @@ -2,43 +2,43 @@
- - -
-
- {{$t('standard')}} + + +
+
+ {{$t('standard')}} +
+
- -
- - -
-
- {{$t('title')}} + + +
+
+ {{$t('title')}} +
+
- -
- - -
-
- {{$t('areaOfResponsibility')}} + + +
+
+ {{$t('areaOfResponsibility')}} +
+
- -
- - + + {{$t('query')}} {{$t('reset')}} - +
@@ -54,7 +54,7 @@ :loading="loading" rowKey="uuid" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :data-source="dataSource" :columns="columns" @@ -94,38 +94,52 @@ title: this.$t('standard'), align: 'center', dataIndex: 'serialNumber', - scopedSlots: { customRender: 'standard' } + scopedSlots: { customRender: 'standard' }, + ellipsis: true, + width: 180 }, { title: this.$t('title'), align: 'center', dataIndex: 'title', + ellipsis: true, + width: 180, scopedSlots: { customRender: 'standard' } }, { title: this.$t('ProcessType'), align: 'center', - dataIndex: 'flowType' + dataIndex: 'flowType', + ellipsis: true, + width: 180 }, { title: this.$t('areaOfResponsibility'), align: 'center', - dataIndex: 'dutyTerritory_dictText' + dataIndex: 'dutyTerritory_dictText', + ellipsis: true, + width: 180 }, { title: this.$t('problemType'), align: 'center', - dataIndex: 'problemType' + dataIndex: 'problemType', + ellipsis: true, + width: 180 }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'initiator' + dataIndex: 'initiator', + ellipsis: true, + width: 140 }, { title: this.$t('personLiable'), align: 'center', - dataIndex: 'duty' + dataIndex: 'duty', + ellipsis: true, + width: 140 } ], total: 0, @@ -213,7 +227,7 @@ serialNumber: val.serialNumber, actiProcInstId: val.prcId, primaryKeyId: val.projectTaskInventoryDetailId, - TaskKey: val.taskDefinitionKey, + TaskKey: val.taskDefinitionKey, isDisplay: val.status == 'NotDone' ? true : false } switch (num) { diff --git a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue index 5a3426ace..55014ce84 100644 --- a/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue +++ b/jero-web/src/views/projectManagement/dialog/ParameterTemplateAdd.vue @@ -57,12 +57,6 @@ :scroll='{x: 600}' :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}' @change='handleTableChange'> - {{ text }} - - {{ $t('edit') }} - {{ $t('delete') }} -
{ + if (res.success) { + this.formData.templatetitle = res.result.title + this.selectedRowKeys = res.result.paramsTemplateId.split(',') + // this.rowId = res.result.id + // this.version = res.result.paramsTemplatePublishVersion + } else { + } + }) + }, //新增 handleSubmit() { if (this.selectedRowKeys.length == 0) { @@ -236,6 +249,7 @@ export default { projectId: this.projectId } if (this.rowId) { + console.log('编辑') //编辑 postAction(`params/manifest/edit`, postDate).then(res => { if (res.success) { @@ -252,6 +266,7 @@ export default { this.newVisible = false }) } else { + console.log('新增') //新增 postAction(`params/manifest/add`, postDate).then(res => { if (res.success) { @@ -310,25 +325,11 @@ export default { } }) }, - //编辑按钮 - editArea(val) { - this.title = this.$t('edit') - this.newVisible = true - let params = { - id: val - } - getAction(`tag/onlCgformArea/queryById`, params).then((res) => { - if (res.success) { - this.form = { ...res.result } - // this.$emit('updateOk',res.result) - - } - }) - } + // 编辑 }, watch: { templateTitle(val) { - this.templatetitle = val + this.formData.templatetitle = val }, selectedRowKeyS(val) { this.selectedRowKeys = val diff --git a/jero-web/src/views/projectManagement/projectNonConformance/index.vue b/jero-web/src/views/projectManagement/projectNonConformance/index.vue index a16435549..4195c6126 100644 --- a/jero-web/src/views/projectManagement/projectNonConformance/index.vue +++ b/jero-web/src/views/projectManagement/projectNonConformance/index.vue @@ -154,13 +154,13 @@ rowKey="uuid" :loading="loading" :pagination="false" - :scroll="{x: true}" + :scroll="{x: '100%'}" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :data-source="dataSource" :columns="columns" > - {{text}} + {{text}}
@@ -201,48 +201,56 @@ align: 'center', dataIndex: 'serialNumber', ellipsis: true, - scopedSlots: { customRender: 'standard' } + width:180, + scopedSlots: { customRender: 'standard' }, }, { title: this.$t('title'), align: 'center', dataIndex: 'title', ellipsis: true, + width:180, scopedSlots: { customRender: 'standard' } }, { title: this.$t('ProcessType'), align: 'center', dataIndex: 'flowType', + width:180, ellipsis: true }, { title: this.$t('areaOfResponsibility'), align: 'center', dataIndex: 'dutyTerritory_dictText', + width:180, ellipsis: true }, { title: this.$t('RelatedItems'), align: 'center', dataIndex: 'projectName', + width:180, ellipsis: true }, { title: this.$t('problemType'), align: 'center', dataIndex: 'problemType', - ellipsis: true + width:140, + ellipsis: true, }, { title: this.$t('Sponsor'), align: 'center', - dataIndex: 'initiator' + dataIndex: 'initiator', + width:140, }, { title: this.$t('personLiable'), align: 'center', - dataIndex: 'duty' + dataIndex: 'duty', + width:140, } ], total: 0,