diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java index 801200bed..c0b52a993 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/controller/ParamsManifestEOController.java @@ -76,7 +76,7 @@ public class ParamsManifestEOController extends JeroController getParamsTemplateList(ParamsTemplateEO paramsTemplateEO, + public Result getParamsTemplatePage(ParamsTemplateEO paramsTemplateEO, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="cut") String cut) { @@ -233,6 +233,24 @@ public class ParamsManifestEOController extends JeroController getParamsTemplatePageOfCopy(ParamsTemplateEO paramsTemplateEO, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + @RequestParam(name="cut") String cut) { + Page page = new Page(pageNo, pageSize); + IPage pageList = paramsManifestEOService.getNewestPublishPage(page, paramsTemplateEO); + return Result.OK(cut, pageList); + } + /** * 复制清单 * 分页 diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 659e28fe9..177cc374b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -28,7 +28,6 @@ import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; @@ -100,8 +99,8 @@ public class SysCategoryController { @AutoLog(value = "标签内容-查询字典配置的父级名称") @ApiOperation(value = "标签内容-查询字典配置的父级名称", notes = "标签内容-查询字典配置的父级名称") @GetMapping(value = "/queryPid") - public Result> queryPid() { - List list = sysCategoryService.queryPid(); + public Result> queryPid(SysCategory sysCategory) { + List list = sysCategoryService.queryPid(sysCategory); return Result.OK(list); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 0a360f37e..4f2230b87 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -84,7 +84,7 @@ public class SysDictItemController { @CacheEvict(value= CacheConstant.SYS_DICT_CACHE, allEntries=true) public Result add(@RequestBody SysDictItem sysDictItem) { Result result = new Result(); - sysDictItemService.setAddOrdderNum(sysDictItem); + sysDictItemService.setAddOrderNum(sysDictItem); //查询同名数据 List exitDictItemList = sysDictItemMapper.selctItemByName(sysDictItem.getItemText(),sysDictItem.getDictId()); if(CollectionUtils.isNotEmpty(exitDictItemList)){ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java index 793ced8fe..1cb646f44 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java @@ -90,5 +90,5 @@ public interface ISysCategoryService extends IService { void setEditOrderNum(SysCategory sysCategory); - List queryPid(); + List queryPid(SysCategory sysCategory); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java index 0d59ef710..f0a161cce 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java @@ -31,7 +31,7 @@ public interface ISysDictItemService extends IService { */ public void updateDictDelFlag(int delFlag,String id); - void setAddOrdderNum(SysDictItem sysDictItem); + void setAddOrderNum(SysDictItem sysDictItem); void setEditOrderNum(SysDictItem sysDictItem); } 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 d060ca6d6..f66abd579 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 @@ -387,9 +387,11 @@ public class SysCategoryServiceImpl extends ServiceImpl queryPid() { + public List queryPid(SysCategory sysCategory) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("pid",0); + queryWrapper.eq("sys_dict_id",sysCategory.getSysDictId()) + .eq("pid",0) + .orderByDesc("sort_order"); List list = list(queryWrapper); return list; } 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 394f168f3..1a8878f04 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 @@ -57,23 +57,25 @@ public class SysDictItemServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0) .eq("dict_id",sysDictItem.getDictId()) - .orderByAsc("order_num"); - queryWrapper.eq("order_num", inputOrderNum); + .eq("is_tag_dict",sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); + queryWrapper.eq("sort_order", inputOrderNum); Integer orderNumCount = sysDictItemMapper.selectCount(queryWrapper); if (orderNumCount > 0) {//有重复展示顺序的,后面的号全+1 //设置排序 QueryWrapper orderNumQueryWrapper = new QueryWrapper<>(); - orderNumQueryWrapper.ge("order_num", inputOrderNum) + orderNumQueryWrapper.ge("sort_order", inputOrderNum) .eq("dict_id",sysDictItem.getDictId()) .eq("del_flag", CommonConstant.DEL_FLAG_0) - .orderByAsc("order_num"); + .eq("is_tag_dict",sysDictItem.getIsTagDict()) + .orderByAsc("sort_order"); List geOrderNumList = list(orderNumQueryWrapper); //判断相邻的序号,去掉不邻的 @@ -101,6 +103,7 @@ 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()) .orderByAsc("sort_order"); Integer orderNumData = list(queryWrapper).stream().filter(e -> e.getId().equals(sysDictItem.getId())) .map(e -> e.getSortOrder()).collect(Collectors.toList()).get(0); @@ -112,6 +115,7 @@ public class SysDictItemServiceImpl extends ServiceImpl geOrderNumList = list(orderNumQueryWrapper); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 0fc2f46ea..c5ab2107c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -725,17 +725,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl treeOnlCgformFieldList = fieldList.stream().filter(e -> FieldTypeEnum.TREE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List treeList = treeOnlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List onlCgformFieldDateMoreList = fieldList.stream().filter(e -> FieldTypeEnum.DATE_MORE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + List onlCgformFieldPersonList = fieldList.stream().filter(e -> FieldTypeEnum.PERSON.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); + List personList = onlCgformFieldPersonList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); List dateMoreList = onlCgformFieldDateMoreList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); //通过id查询数据 List> dataList = bussDocumentLibraryEOMapper.selectMapsAll(id); //多选日期 + List userNameList = new ArrayList<>(); for (Map.Entry entry : dataList.get(0).entrySet()) { String key = entry.getKey(); + if(personList.contains(key)){ + String value = (String) entry.getValue(); + userNameList.addAll(Arrays.asList(value.split(","))); + } if(dateMoreList.contains(key) && ObjectUtils.isNotEmpty(entry.getValue())){ String value = (String) entry.getValue(); entry.setValue(Arrays.asList(value.split(","))); } } + List userList = new ArrayList<>(); + if(userNameList.size() != 0){ + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysUser::getUsername,userNameList); + userList = sysUserService.list(wrapper); + } + //查询所有 List> mapList = bussDocumentLibraryEOMapper.selectMapsAll(null); @@ -750,6 +764,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl personKeyList = new ArrayList<>(); for (Map.Entry entry : dataList.get(0).entrySet()) { if(treeList.contains(entry.getKey())){ String value = (String) entry.getValue(); @@ -759,6 +774,28 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl users = new ArrayList<>(); + if(userList.size() != 0 && StringUtils.isNotBlank(value)){ + for (String s : value.split(",")) { + List sysUserList = userList.stream().filter(e -> e.getUsername().equals(s)).collect(Collectors.toList()); + users.addAll(sysUserList); + } + if(users.size() != 0){ + List userIdList = users.stream().map(SysUser::getId).collect(Collectors.toList()); + dataList.get(0).put(personKey + "_id",StringUtils.join(userIdList,",")); + } + } + } } return dataList; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java index 7b4fb596f..d8ddb7dd4 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryInfoEOEn.java @@ -186,13 +186,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String designDeliverableTemplateName; /**设计符合性确认-发起人*/ - @Excel(name = "design-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "design-Initiator", width = 15) @ApiModelProperty(value = "设计符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String designInitiator; /**设计符合性确认-责任人*/ - @Excel(name = "design-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "design-Assignee", width = 15) @ApiModelProperty(value = "设计符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String designDuty; @@ -213,13 +213,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String prehomoDeliverableTemplateName; /**prehomo确认-发起人*/ - @Excel(name = "Prehomo-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "Prehomo-Initiator", width = 15) @ApiModelProperty(value = "prehomo确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String prehomoInitiator; /**prehomo确认-责任人*/ - @Excel(name = "Prehomo-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "Prehomo-Assignee", width = 15) @ApiModelProperty(value = "prehomo确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String prehomoDuty; @@ -240,13 +240,13 @@ public class DummyInventoryInfoEOEn implements Serializable { private String verifyDeliverableTemplateName; /**验证符合性确认-发起人*/ - @Excel(name = "verify-Initiator", width = 15,dicCode ="fa1_qi3_ren2") + @Excel(name = "verify-Initiator", width = 15) @ApiModelProperty(value = "验证符合性确认-发起人") @Dict(dicCode ="fa1_qi3_ren2") private String verifyInitiator; /**验证符合性确认-责任人*/ - @Excel(name = "verify-Assignee", width = 15,dicCode ="ze2_ren4_ren2") + @Excel(name = "verify-Assignee", width = 15) @ApiModelProperty(value = "验证符合性确认-责任人") @Dict(dicCode ="ze2_ren4_ren2") private String verifyDuty; 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 97d9bf538..19c77f628 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 @@ -174,7 +174,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl ids = records.stream().map(DummyInventoryBaseEO::getId).collect(Collectors.toList()); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids); + wrapper.in(DummyReadEO::getDummyInventoryBaseId, ids).in(DummyReadEO::getCreateBy,sysUser.getUsername()); List dummyReadEOS = iDummyReadEOService.list(wrapper); List dummyReadIdList = dummyReadEOS.stream().map(DummyReadEO::getDummyInventoryBaseId).collect(Collectors.toList()); for (DummyInventoryBaseEO record : pageList.getRecords()) { @@ -685,7 +685,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"向清单中添加了标准\""+serialNumber+"\""; + String contentLog = username+"向清单中添加了标准“"+serialNumber+"”"; dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId()); } } @@ -167,7 +167,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl infoEOList = new ArrayList<>(); infoEOList.add(dummyInventoryInfoEO); //查询数据库里原来的数据 @@ -234,7 +234,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"删除了清单中的\""+serialNumber+"\"标准"; + String contentLog = username+"删除了清单中的“"+serialNumber+"”标准"; dummyLogEOService.updateLog(contentLog, projectId); } @@ -258,7 +258,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl queryList(DummyInventoryInfoEO dummyInventoryInfoEO,HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(dummyInventoryInfoEO,req.getParameterMap()); // queryWrapper.in("dummy_inventory_base_id",dummyInventoryInfoEO.getDummyInventoryBaseId()); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("create_time","serial_number"); List dummyInventoryInfoEOList = this.list(queryWrapper); //技术领域处理 @@ -287,7 +287,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImple.getSerialNumber()).collect(Collectors.joining(",")); - String contentLog = username+"复制了\""+serialNumber+"\""; + String contentLog = username+"复制了“"+serialNumber+"”"; dummyLogEOService.updateLog(contentLog, projectId); } } @@ -303,7 +303,7 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl fileInfos = getOssFiles(dataList); - //数据转换(文件名称,技术领域,对应标准) + //数据转换(文件名称,技术领域,对应标准,发起人,责任人) dataTransition(dataList, fileInfos,dummyInventoryInfoEO); OutputStream os = null; @@ -1713,6 +1714,11 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl dataList, List fileInfos,DummyInventoryInfoEO dummyInventoryInfoEO) { //技术领域 List sysCategoryList = sysCategoryService.list(); + //普通数据字典 + List dictItemList = sysDictItemServiceImpl.selectItemsAll(); + List sysDictItemInitiator = dictItemList.stream().filter(e -> "fa1_qi3_ren2".equals(e.getDictCode())).collect(Collectors.toList()); + List sysDictItemDuty = dictItemList.stream().filter(e -> "ze2_ren4_ren2".equals(e.getDictCode())).collect(Collectors.toList()); + //文档库数据 List correspondingStandardIdList = new ArrayList<>(); for (DummyInventoryInfoEO inventoryInfoEO : dataList) { @@ -1721,33 +1727,49 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.in(BussDocumentLibraryEO::getId,correspondingStandardIdList); -// List bussDocumentLibraryEOList = iBussDocumentLibraryEOService.list(lambdaQueryWrapper); for (DummyInventoryInfoEO inventoryInfoEO : dataList) { - String correspondingStandard = inventoryInfoEO.getCorrespondingStandard(); String technologyTerritory = inventoryInfoEO.getTechnologyTerritory(); String designDeliverableTemplate = inventoryInfoEO.getDesignDeliverableTemplate(); String prehomoDeliverableTemplate = inventoryInfoEO.getPrehomoDeliverableTemplate(); String verifyDeliverableTemplate = inventoryInfoEO.getVerifyDeliverableTemplate(); - //对应标准 -// if(StringUtils.isNotBlank(correspondingStandard)){ -// StringBuilder sb = new StringBuilder(); -// for (String s : correspondingStandard.split(",")) { -// List collect = bussDocumentLibraryEOList.stream() -// .filter(e -> s.equals(e.getId())).collect(Collectors.toList()); -// if(collect.size() != 0){ -// sb.append(collect.get(0).getSerialNumber() + ","); -// }else{ -// sb.append(s + ","); -// } -// } -// if(StringUtils.isNotBlank(sb)){ -// String substring = sb.substring(0, sb.length() - 1); -// inventoryInfoEO.setCorrespondingStandard(substring); -// } -// } + //技术的发起人,责任人 + String designInitiator = inventoryInfoEO.getDesignInitiator(); + String designInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, designInitiator); + if(StringUtils.isNotBlank(designInitiatorPerson)){ + inventoryInfoEO.setDesignInitiator(designInitiatorPerson); + } + String designDuty = inventoryInfoEO.getDesignDuty(); + String designDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, designDuty); + if(StringUtils.isNotBlank(designDutyPerson)){ + inventoryInfoEO.setDesignDuty(designDutyPerson); + } + + //pre的发起人,责任人 + String prehomoInitiator = inventoryInfoEO.getPrehomoInitiator(); + String prehomoInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, prehomoInitiator); + if(StringUtils.isNotBlank(prehomoInitiatorPerson)){ + inventoryInfoEO.setPrehomoInitiator(prehomoInitiatorPerson); + } + String prehomoDuty = inventoryInfoEO.getPrehomoDuty(); + String prehomoDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, prehomoDuty); + if(StringUtils.isNotBlank(prehomoDutyPerson)){ + inventoryInfoEO.setPrehomoDuty(prehomoDutyPerson); + } + + //验证的发起人,责任人 + String verifyInitiator = inventoryInfoEO.getVerifyInitiator(); + String verifyInitiatorPerson = getPerson(dummyInventoryInfoEO, sysDictItemInitiator, verifyInitiator); + if(StringUtils.isNotBlank(verifyInitiatorPerson)){ + inventoryInfoEO.setVerifyInitiator(verifyInitiatorPerson); + } + String verifyDuty = inventoryInfoEO.getVerifyDuty(); + String verifyDutyPerson = getPerson(dummyInventoryInfoEO, sysDictItemDuty, verifyDuty); + if(StringUtils.isNotBlank(verifyDutyPerson)){ + inventoryInfoEO.setVerifyDuty(verifyDutyPerson); + } + + //技术领域 if(StringUtils.isNotBlank(technologyTerritory)){ StringBuilder sb = new StringBuilder(); @@ -1786,6 +1808,27 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl sysDictItemList, String designInitiator) { + if(StringUtils.isNotBlank(designInitiator)){ + StringBuilder sb = new StringBuilder(); + for (String s : designInitiator.split(",")) { + List itemList = sysDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList()); + if(itemList.size() != 0){ + if(CutEnum.CN.getValue().equals(dummyInventoryInfoEO.getCut())){ + sb.append(itemList.get(0).getItemText()+","); + }else{ + sb.append(itemList.get(0).getEnName()+","); + } + } + if(StringUtils.isNotBlank(sb)){ + String substring = sb.substring(0, sb.length() - 1); + return substring; + } + } + } + return null; + } + /** * 模板名称转换 * @param fileInfos diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java index ee0d28743..21533edcd 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java @@ -112,7 +112,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl wrapperTemp = new LambdaQueryWrapper<>(); wrapperTemp.in(HomeFunctionModuleEO::getCreateBy,loginUser.getUsername()).orderByAsc(HomeFunctionModuleEO::getState).orderByAsc(HomeFunctionModuleEO::getSort); List homeFunctionModuleEOS = this.list(wrapperTemp); - if(homeFunctionModuleEOList.size() == 0){ + if(homeFunctionModuleEOS.size() == 0){ if(CutEnum.EN.getValue().equals(cut)){ for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOList) { homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); 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 5c85fdf26..132fb2502 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 @@ -1473,7 +1473,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl inputList = new ArrayList<>(); - inputList.add(projectLawsInventoryEO); + ProjectLawsInventoryEO projectLawsInventoryEONew = new ProjectLawsInventoryEO(); + BeanUtils.copyProperties(projectLawsInventoryEO,projectLawsInventoryEONew); + inputList.add(projectLawsInventoryEONew); translateData(inputList); ProjectLawsInventoryEO inputInfoEO = inputList.get(0); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index 6c3e368f5..11ccd2fc5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -259,7 +259,7 @@ public class FileSplitItemsEOController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { - List> list = languageSwitchService.getHeader(flag, cut); + List> list = fileSplitItemsEOService.getHeader(flag, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java index b31d4322b..34a4c5265 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/controller/SarFileSplitInfoController.java @@ -243,7 +243,7 @@ public class SarFileSplitInfoController extends JeroController>> getHeader(@RequestParam(name = "flag") String flag, @RequestParam(name = "cut") String cut) { - List> list = languageSwitchService.getHeader(flag, cut); + List> list = sarFileSplitInfoService.getHeader(flag, cut); return Result.OK(list); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java index 70dee7290..4a9c3bddc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/IFileSplitItemsEOService.java @@ -81,4 +81,6 @@ public interface IFileSplitItemsEOService extends IService String getFieldForExport(); int insertForeach(List messageList); // 拆分已入库文件专用 + + List> getHeader(String flag, String cut); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java index 012516850..a0cb23233 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/ISarFileSplitInfoService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.jero.modules.split.entity.SarFileSplitInfoEO; import java.util.List; +import java.util.Map; /** * @Description: 文档拆分表 @@ -65,4 +66,7 @@ public interface ISarFileSplitInfoService extends IService { boolean bindToDocumentLibrary(String id, String connectId, String fileName); void dataProcessing(String cut, List sarFileSplitInfoEOList); + + List> getHeader(String flag, String cut); + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java index 8dec28efa..985a4c945 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java @@ -23,6 +23,7 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.document.enums.FieldTypeEnum; import com.jero.modules.document.service.IBussDocumentLibraryEOService; +import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.ocr.util.UUIDUtils; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; @@ -3574,4 +3575,47 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if(FieldTypeEnum.TEXT_LINK.getValue().equals(onlCgformField.getFieldShowType())){ + map.put("urlClick","true"); + } + if("file_name".equals(onlCgformField.getDbFieldName()) + || "iterms_conditions".equals(onlCgformField.getDbFieldName())){ + //跳转详情的标识 + map.put("click","true"); + } + //日期添加排序标识 + if ("create_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + + String dbFieldName = onlCgformField.getDbFieldName(); + map.put("db_field_name", dbFieldName); + + if(CutEnum.CN.getValue().equals(cut)){ + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + }else{ + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + return list; + } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java index 9a4b4b717..b34083705 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitInfoServiceImpl.java @@ -10,6 +10,8 @@ import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; +import com.jero.modules.document.enums.FieldTypeEnum; +import com.jero.modules.ocr.util.LineHumpUtil; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import com.jero.modules.split.entity.SarFileSplitInfoEO; @@ -263,4 +265,50 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl> getHeader(String flag, String cut) { + List fieldList = onlCgformFieldService.getFieldList(flag); + if (fieldList.size() != 0) { + //过滤列表字段(is_show_list-->列表是否显示0否 1是) + fieldList = fieldList.stream().filter(e -> YesOrNoEnum.YES.getValue().equals(String.valueOf(e.getIsShowList()))).collect(Collectors.toList()); + } + List> list = new ArrayList<>(); + for (OnlCgformField onlCgformField : fieldList) { + Map map = new HashMap<>(); + if(FieldTypeEnum.TEXT_LINK.getValue().equals(onlCgformField.getFieldShowType())){ + map.put("urlClick","true"); + } + if("file_name".equals(onlCgformField.getDbFieldName()) + || "serial_number".equals(onlCgformField.getDbFieldName()) + || "title".equals(onlCgformField.getDbFieldName())){ + //跳转详情的标识 + map.put("click","true"); + } + //日期添加排序标识 + if ("create_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + if ("update_time".equals(onlCgformField.getDbFieldName())) { + map.put("sort", "true");//列表排序标识 + } + + String dbFieldName = onlCgformField.getDbFieldName(); + map.put("db_field_name", LineHumpUtil.lineToHump(dbFieldName)); + + if(CutEnum.CN.getValue().equals(cut)){ + map.put("db_field_txt", onlCgformField.getDbFieldTxt());//字段中文名 + }else{ + map.put("db_field_txt", onlCgformField.getDbFieldEnName());//字段英文名 + } + list.add(map); + } + return list; + } + } diff --git a/jero-web/src/assets/logoOne.png b/jero-web/src/assets/logoOne.png new file mode 100644 index 000000000..3befba1e1 Binary files /dev/null and b/jero-web/src/assets/logoOne.png differ diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 576123a9f..6448d8ce7 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -73,7 +73,7 @@ module.exports = { lessOrEqual: 'Less Than Or Equal To', user: 'User', numericalValue: 'Numerical Value', - not: 'No', + not: 'No.', EnterValue: 'Please Enter a Value', SavedQuery: 'Saved Query', NoQueriesSaved: 'No Queries Were Saved', @@ -612,7 +612,7 @@ module.exports = { task: 'Task', TaskCutOffTime: 'Due Date', Transfer: 'Transfer', - CertificationDirectory: 'Certification directory', + CertificationDirectory: 'Certification Catalogue', TaskRequirements: 'Task requirements', CertificationProgress: 'Homo Progress', CurrentProjectStatusEvaluation: 'Current State', @@ -675,7 +675,7 @@ module.exports = { The: 'The', submitted: 'Data has been submitted and cannot be submitted again', basicInformationOfParameters: 'Basic information of parameters', - regulatoryCertificationTaskPlan: 'Regulatory / certification task plan', + regulatoryCertificationTaskPlan: 'Regulatory / Certification Task Plan', bringInRelevantPersonnel: 'Bring in relevant personnel', confirmBringInRelevantPersonnel: 'Confirm Bring in relevant personnel', problemType: 'Problem type', @@ -781,7 +781,7 @@ module.exports = { notEvaluated: 'Not evaluated', cannotExceed: 'Cannot exceed', Characters: 'Characters', - standardInformation: 'StandardInformation', + standardInformation: 'Standard Information', VirtualList: 'VirtualList', importTemplate: 'Import Template', verificationConfirmationDeadline: 'Verification compliance confirmation deadline', @@ -811,9 +811,9 @@ module.exports = { yellow: 'Yellow', resultReported: 'Result Reported', TheDoesNotContainData: 'The maintenance list of the virtual list does not contain data', - number: 'No', + number: 'No.', Deadline: 'Deadline', - toBeConfirmed: 'To be confirmed', + toBeConfirmed: 'No rating', designComplianceReview: 'Confirm design conformance', preHomeConfirmation: 'Pre-Homo confirmation', verificationComplianceReview: 'Verify conformance validation', @@ -893,4 +893,5 @@ module.exports = { ExportReport:'Export Report', basicInformation:'Basic Information', replyFromProjectContact:'Reply from project contact person', + pleaseUpload:'Please Upload', } \ 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 aed7ce7f6..f2a138480 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -898,4 +898,5 @@ module.exports = { ExportReport:'导出报告', basicInformation:'基础信息', replyFromProjectContact:'工程接口人回复', + pleaseUpload:'请上传', } \ No newline at end of file diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue index 122da76c0..55e8284cb 100644 --- a/jero-web/src/components/PersonnelSelection/index.vue +++ b/jero-web/src/components/PersonnelSelection/index.vue @@ -109,6 +109,7 @@ if (this.isSingleChoice) { if (this.userIds.length > 1) { this.$message.warning(this.$t('onlyOnePersonCanBeSelected')) + return } } let userIds = JSON.parse(JSON.stringify(this.userIds)) diff --git a/jero-web/src/components/SplitDetailTable/index.vue b/jero-web/src/components/SplitDetailTable/index.vue index ca45f8cc0..bcdf3c523 100644 --- a/jero-web/src/components/SplitDetailTable/index.vue +++ b/jero-web/src/components/SplitDetailTable/index.vue @@ -13,12 +13,12 @@ @change="tableOnChange" > - - - {{record.iterms_conditions&&record.iterms_conditions!=='null'?record.iterms_conditions.replace(/<.*?>/ig, ' ') : ''}} - + + + + + {{record.iterms_conditions&&record.iterms_conditions!=='null'?record.iterms_conditions.replace(/<.*?>/ig, ' ') : ''}} + diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index b275fbeea..1c35e175b 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -34,16 +34,11 @@ {{text && text.length > 18?text.slice(0,17)+'...':text}} - - - - - - - - - - + + + {{text}} + +
@@ -130,7 +125,9 @@ this.getTableList() }, methods: { - + urlClick(text,record) { + this.$emit('detailClick', record) + }, getTextWith(text, fontStyle) { var canvas = document.createElement('canvas') var context = canvas.getContext('2d') @@ -159,9 +156,14 @@ // scope.row.itermsConditions ? scope.row.itermsConditions.replace(/<.*?>/ig, ' ') : '' } + this.columns[index].scopedSlots = { + customRender: 'detailText' + } + if(res.db_field_txt === "编号" || res.db_field_txt === "标题" ){ this.columns[index].scopedSlots = { - customRender: 'detailText' + customRender: 'detail' } + } }) let width = 0 diff --git a/jero-web/src/components/importSplitUpload/index.vue b/jero-web/src/components/importSplitUpload/index.vue index fba928676..a96d529d3 100644 --- a/jero-web/src/components/importSplitUpload/index.vue +++ b/jero-web/src/components/importSplitUpload/index.vue @@ -17,7 +17,7 @@ @change="handleChange"> - 拆分文件 + {{$t('splitFile')}}
diff --git a/jero-web/src/components/jero/JLoading.vue b/jero-web/src/components/jero/JLoading.vue index eba0c4edd..29a67aea8 100644 --- a/jero-web/src/components/jero/JLoading.vue +++ b/jero-web/src/components/jero/JLoading.vue @@ -54,7 +54,7 @@ position: absolute; top: 0; left: 0; - z-index: 9999900; + z-index: 999; width: 100%; height: 100%; background-color: rgba(255, 255, 255, 0.9); diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue index e76180cd4..e2b49847b 100644 --- a/jero-web/src/components/layouts/TabLayout.vue +++ b/jero-web/src/components/layouts/TabLayout.vue @@ -93,6 +93,8 @@ this.$route.path == '/taskListProcess' || this.$route.path == '/ProjectDetails' || this.$route.path == '/handshakeProcess' || + this.$route.path == '/projectStatusAndProgress' || + this.$route.path == '/TaskPlanList' || this.$route.path == '/historicalVersion' || this.$route.path == '/dashboard/analysis' || this.$route.path == '/processDetails') { diff --git a/jero-web/src/components/libraryAddForm/index.vue b/jero-web/src/components/libraryAddForm/index.vue index f4e9cddcd..d76f7c527 100644 --- a/jero-web/src/components/libraryAddForm/index.vue +++ b/jero-web/src/components/libraryAddForm/index.vue @@ -572,6 +572,7 @@ display: inline-block; margin-top: 2px; height: 40px; + margin-bottom: 24px; } .itemModel-text { diff --git a/jero-web/src/components/menu/SideMenu.vue b/jero-web/src/components/menu/SideMenu.vue index 6cdaddbdc..adc5a8c3f 100644 --- a/jero-web/src/components/menu/SideMenu.vue +++ b/jero-web/src/components/menu/SideMenu.vue @@ -6,7 +6,7 @@ :collapsible="collapsible" v-model="collapsed" :trigger="null"> - +
- +
@@ -26,8 +27,16 @@ type: Boolean, default: true, required: false + }, + collapsed: { + type: Boolean, + required: false, + default: false } - } + }, + mounted() { + console.log(this.collapsed) + }, } \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue new file mode 100644 index 000000000..605349b17 --- /dev/null +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue @@ -0,0 +1,372 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue new file mode 100644 index 000000000..743e8bed5 --- /dev/null +++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue @@ -0,0 +1,215 @@ + + + + + \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue index b2a372396..b67d8d3d5 100644 --- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue +++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue @@ -65,6 +65,7 @@ ref="table" size="middle" :loading="loading" + :customRow="projectNameClick" :pagination="false" :scroll="{x: true,y:500}" :data-source="dataSource" @@ -374,9 +375,7 @@ myChart.resize() } myChart.on('mouseover', 'yAxis.category', function(e) { - console.log(e) let axisTip = document.querySelector('.axis-tip') - console.log(axisTip) axisTip.innerText = e.value axisTip.style.left = 100 + 'px' axisTip.style.top = (e.event.event.y) - 180 + 'px' @@ -387,6 +386,12 @@ axisTip.innerText = '' axisTip.style.display = 'none' }) + myChart.on('click', (params) => { + let newUrl = this.$router.resolve({ + path: '/TaskPlanList' + }) + window.open(newUrl.href, '_blank') + }) }, searchQuery() { this.getList() @@ -406,6 +411,18 @@ this.dataSource = [] } }) + }, + projectNameClick() { + return { + on: { + click: () => { + let newUrl = this.$router.resolve({ + path: '/projectStatusAndProgress' + }) + window.open(newUrl.href, '_blank') + } + } + } } } }