diff --git a/jero-boot/jero-boot-center/src/test/java/com/adc/da/ApplicationTests.java b/jero-boot/jero-boot-center/src/test/java/com/adc/da/ApplicationTests.java index 6a843a224..fa0c37928 100644 --- a/jero-boot/jero-boot-center/src/test/java/com/adc/da/ApplicationTests.java +++ b/jero-boot/jero-boot-center/src/test/java/com/adc/da/ApplicationTests.java @@ -5,6 +5,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; + @RunWith(SpringRunner.class) @SpringBootTest public class ApplicationTests { 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 c0b52a993..ee728309c 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 @@ -223,7 +223,7 @@ public class ParamsManifestEOController extends JeroController getAllManifest(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index cc2e8edd3..9ea023013 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -785,7 +785,7 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl list = list(queryWrapper); int collectFinishNumber = (int) list.stream().filter(e->CollectManifestStateEnum.SYNC_REPORT.getValue().equals(e.getState())).count(); - if (collectFinishNumber == list.size()) { + if (collectFinishNumber == list.size() && list.size() > 0) { map.put("finish", true); map.put("time", list.get(0).getUpdateTime()); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java index 828401057..99f07dbab 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/opensso/controller/SSOLoginController.java @@ -16,6 +16,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDictService; import com.jero.modules.system.service.ISysUserService; +import com.jero.modules.system.util.HttpRequestUtil; import com.jero.modules.system.util.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -63,6 +64,8 @@ public class SSOLoginController { //密码登录错误的最大限制次数 public static final int RETRY_LOGIN_MAX_COUNT = 5; + @Value("${opensso.authorizeUrl}") + private String authorizeUrl; @Value("${opensso.accessTokenUrl}") private String accessTokenUrl; @Value("${opensso.profileUrl}") @@ -79,7 +82,7 @@ public class SSOLoginController { @GetMapping(value = "/ssoAuth") public void ssoAuth(HttpServletRequest request, HttpServletResponse response){ String callbackUri = "http%3A%2F%2F139.9.235.66%3A8008%2Fjero-boot%2Fopensso%2Fcallback"; - String authUrl = "https://signin-test.nio.com/oauth2/authorize" +"?client_id=" + clientId + String authUrl = authorizeUrl +"?client_id=" + clientId + "&redirect_uri=" + redirectUri + "&response_type=code"; try { response.sendRedirect(authUrl); @@ -103,8 +106,8 @@ public class SSOLoginController { log.info("access_token_url:" + getAccessTokenUrl); Map headerMapToken = new HashMap<>(); headerMapToken.put("Content-Type", "text/html;charset=utf-8"); -// String accessTokenResult = HttpRequestUtil.getResponseOfGET(getAccessTokenUrl, headerMapToken); - String accessTokenResult = "access_token=2.0N6OFCARTH7MRCVPSENQONSA67WGHV4FDR25TSHFCCXI6FA3NRVAA----&expires=602405"; + String accessTokenResult = HttpRequestUtil.getResponseOfGET(getAccessTokenUrl, headerMapToken); +// String accessTokenResult = "access_token=2.0N6OFCARTH7MRCVPSENQONSA67WGHV4FDR25TSHFCCXI6FA3NRVAA----&expires=602405"; log.info("获取access_token返回结果：" + accessTokenResult); // 返回结果：access_token=2.0N6OFCARTH7MRCVPSENQONSA67WGHV4FDR25TSHFCCXI6FA3NRVAA----&expires=602405 if(StringUtils.isEmpty(accessTokenResult) || !accessTokenResult.contains("access_token")){ @@ -120,8 +123,8 @@ public class SSOLoginController { log.info("profile_url:" + getProfileUrl); Map headerMapProfile = new HashMap<>(); headerMapProfile.put("Content-Type", "application/json; charset=utf-8"); -// String profileResult = HttpRequestUtil.getResponseOfGET(getProfileUrl, headerMapProfile); - String profileResult = "{ id: \"chengjun.wang.o\", attributes: [{workNo: \"\"},{account_id: \"\"},{user_name: \"chengjun.wang.o\"},{email: \"chengjun.wang.o@nio.com\"}]}"; + String profileResult = HttpRequestUtil.getResponseOfGET(getProfileUrl, headerMapProfile); +// String profileResult = "{ id: \"chengjun.wang.o\", attributes: [{workNo: \"\"},{account_id: \"\"},{user_name: \"chengjun.wang.o\"},{email: \"chengjun.wang.o@nio.com\"}]}"; log.info("获取profile返回结果：" + profileResult); // 返回结果：{ id: "chengjun.wang.o", attributes: [{workNo: ""},{account_id: ""},{user_name: "chengjun.wang.o"},{email: "chengjun.wang.o@nio.com"}]} JSONObject userThirdIdJson = JSONObject.parseObject(profileResult); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java index 54538a10a..0890cb30b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java @@ -73,4 +73,17 @@ public class PPEmployee { private String phone_device_type; // Mobile/Landline private String formatted_phone_number; + public void setCreation_time(Date creation_time) { + long timeStamp = creation_time.getTime(); + long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳 + Date time = new Date(longTimeStamp); + this.creation_time = time; + } + + public void setUpdate_time(Date update_time) { + long timeStamp = update_time.getTime(); + long longTimeStamp = new Long(timeStamp * 1000); // 精确到毫秒的时间戳 + Date time = new Date(longTimeStamp); + this.update_time = time; + } } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/timer/PPSyncDataTimer.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/timer/PPSyncDataTimer.java index b67b9da3d..bd3ccc583 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/timer/PPSyncDataTimer.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/timer/PPSyncDataTimer.java @@ -29,7 +29,7 @@ public class PPSyncDataTimer { @Autowired private ISyncDataService syncDataService; -// @Scheduled(cron = "0 10 0 * * ?") //每天凌晨0点10分执行 + @Scheduled(cron = "0 10 0 * * ?") //每天凌晨0点10分执行 public void syncDepartInfo() { if (isOpen) { log.info("<======================================启动同步部门信息======================================>"); @@ -47,7 +47,7 @@ public class PPSyncDataTimer { } } -// @Scheduled(cron = "0 10 1 * * ?") //每天凌晨1点10分执行 + @Scheduled(cron = "0 10 1 * * ?") //每天凌晨1点10分执行 public void syncUserInfo() { log.info("<======================================启动同步用户信息=======================================>"); if (isOpen) { 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 2f3131edc..eed24dafb 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 @@ -2086,7 +2086,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); List fileFieldList = onlCgformFieldList.stream().map(OnlCgformField::getDbFieldName).collect(Collectors.toList()); + StringBuilder sbTemp = new StringBuilder(); + StringBuilder sbContent = new StringBuilder(); + StringBuilder sbContentInfo = new StringBuilder(); + StringBuilder sbField = new StringBuilder(); + StringBuilder sbNew = new StringBuilder(); + dataList.get(0).entrySet().forEach(entry -> { + String keyTemp = entry.getKey(); + if(fileFieldList.contains(keyTemp)) { + String valueTemp = (String) entry.getValue(); + List fields = fieldList.stream().filter(e -> e.getDbFieldName().equals(keyTemp)).collect(Collectors.toList()); + List fileInfosTemp = iOSSFileService.getFileInfos(valueTemp); + //之前的文件 + List fileNameList = fileInfosTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + String value = (String) map.get(keyTemp); + List fileInfosTempNew = iOSSFileService.getFileInfos(value); + //现在的文件 + List fileNameListNew = fileInfosTempNew.stream().map(OSSFile::getFileName).collect(Collectors.toList()); + boolean checkDiffrent = checkDiffrent(fileNameList, fileNameListNew); + if (!checkDiffrent && fileNameListNew.size() != 0) { + //消息 + sbField.append(fields.get(0).getDbFieldEnName() + ","); + + for (String s : fileNameListNew) { + if (!fileNameList.contains(s)) { + //消息详情 + sbNew.append(fields.get(0).getDbFieldEnName() + " " + s + ","); + } + } + if (StringUtils.isNotBlank(sbField)) { + String substring = sbField.substring(0, sbField.length() - 1); + String content = substring; + } + if (StringUtils.isNotBlank(sbNew)) { + String substring = sbNew.substring(0, sbNew.length() - 1); + //Standard GB 7258 Uploaded Supplement File AA.dox, Release File BB.dox + String dbFieldEnName = fields.get(0).getDbFieldEnName(); + String contentInfo = dbFieldEnName + " " + fileNameList + ","; + } + } + } + }); - //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 String href = "" + serialNumber + "" + " " + titleEn; + String contentFile = ""; + String contentInfoFile = ""; + if(StringUtils.isNotBlank(sbField)){ + String substring = sbField.substring(0, sbField.length() - 1); + contentFile = category + " " + serialNumber + " " + titleEn + " uploaded " + substring; + } + if(StringUtils.isNotBlank(sbNew)){ + String substring = sbNew.substring(0, sbNew.length() - 1); + contentInfoFile = category + " " + href + " uploaded " + substring; + } + + //编辑时处理首页文档动态 1. 标准XXXX的状态改为 2. 标准XXXX的适用车型改为 3. 标准XXXX删除了XXXX文件 4. 标准XXXX上传了XXXX文件 +// String href = "" + serialNumber + "" + " " + titleEn; StringBuilder msgContentSb = new StringBuilder(); StringBuilder msgContentInfoSb = new StringBuilder(); @@ -2480,46 +2535,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLIst = new ArrayList<>(); - for (Map.Entry entry : map.entrySet()) { - String key = entry.getKey(); - String value = String.valueOf(entry.getValue()); - //文件 - if(fileFieldList.contains(key) && !"null".equals(value) && StringUtils.isNotBlank(value)){ - fileIdLIst.addAll(Arrays.asList(value.split(","))); - } - } - //之前的文件 - List fileListTemp = new ArrayList<>(); - if(fileIdLIstTemp.size() != 0){ - fileListTemp = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIstTemp,",")); - } - List fileNameListTemp = fileListTemp.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - - - //编辑的文件 - List fileList = new ArrayList<>(); - if(fileIdLIst.size() != 0){ - fileList = iOSSFileService.getFileInfoAll(StringUtils.join(fileIdLIst,",")); - } - List fileNameList = fileList.stream().map(OSSFile::getFileName).collect(Collectors.toList()); - //删除的文件 - - List deleteFileList = new ArrayList<>(); - for (String fileName : fileNameListTemp) { - if(fileNameList.size() != 0 && !fileNameList.contains(fileName)){ - deleteFileList.add(fileName); - } - } - //上传的文件 - List upFileList = new ArrayList<>(); - for (String fileName : fileNameList) { - if(!fileNameListTemp.contains(fileName)){ - upFileList.add(fileName); - } - } int count = 0; - for (Map.Entry entry : map.entrySet()) { String key = entry.getKey(); String value = String.valueOf(entry.getValue()); @@ -2549,7 +2565,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl stateDictItemList = dictItemList.stream() @@ -2585,15 +2601,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 0){ String msgContent = msgContentSb.substring(0, msgContentSb.length() - 1); @@ -2976,11 +2989,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl e.getSerialNumber()).collect(Collectors.joining(",")); iDummyContentChangeEOService.saveBatch(list); sendMsg(null,dummyInventoryInfoEOList.get(0).getDummyInventoryBaseId(), null, addSerialNumber,null,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut()); - // private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList, - // String addSerialNumber,String deleteSerialNumber,String state,String cut) { + // private void sendMsg(Map baseDiff, String idTemp,List> infoDiffList, + // String addSerialNumber,String deleteSerialNumber,String state,String cut) { }else { if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) { throw new JeroBootException("维护清单为空,发布失败"); @@ -448,7 +451,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl records) { - Set technologyTerritorySet = new HashSet<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { //子标题 if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { @@ -467,6 +470,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl technologyTerritorySet = new HashSet<>(); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); technologyTerritorySet.addAll(list); @@ -587,29 +591,85 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); - //设计符合性确认-交付物类型 + Set deliverableTypeSet = new HashSet<>(); + List designDeliverableTypeIdList= new ArrayList<>(); + List prehomoDeliverableTypeIdList = new ArrayList<>(); + List verifyDeliverableTypeIdList = new ArrayList<>(); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { - String designDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeName); - }else { - dummyInventoryInfoEO.setDesignDeliverableType("空"); + designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(",")); + deliverableTypeSet.addAll(verifyDeliverableTypeIdList); + } + //树形结构 + List deliverableTypeList = new ArrayList<>(); + if (deliverableTypeSet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, deliverableTypeSet); + deliverableTypeList = sysCategoryService.list(wrapper); + } + + //设计符合性确认-交付物类型 + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { + StringBuilder designBuilder = new StringBuilder(); + for(String id : designDeliverableTypeIdList){ + List designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (designList.size() != 0) { + designBuilder.append(designList.get(0).getName() + ","); + } + } + String designName = null; + if (StringUtils.isNotBlank(designBuilder)) { + designName = designBuilder.substring(0, designBuilder.length() - 1); + } + dummyInventoryInfoEO.setDesignDeliverableTypeName(designName); + } else { + dummyInventoryInfoEO.setDesignDeliverableTypeName("空"); } //prehomo确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { - String prehomoDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeName); - }else { - dummyInventoryInfoEO.setPrehomoDeliverableType("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + StringBuilder prehomoBuilder = new StringBuilder(); + for(String id : prehomoDeliverableTypeIdList){ + List prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (prehomoList.size() != 0) { + prehomoBuilder.append(prehomoList.get(0).getName() + ","); + } + } + String prehomoName = null; + if (StringUtils.isNotBlank(prehomoBuilder )) { + prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + } + dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoName); + + } else { + dummyInventoryInfoEO.setPrehomoDeliverableTypeName("空"); } //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { - String verifyDeliverableTypeName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getItemText()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeName); - }else { - dummyInventoryInfoEO.setVerifyDeliverableType("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + StringBuilder verifyBuilder = new StringBuilder(); + for(String id : verifyDeliverableTypeIdList){ + List verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + + if (verifyList.size() != 0) { + verifyBuilder.append(verifyList.get(0).getName() + ","); + } + } + String verifyName = null; + if (StringUtils.isNotBlank(verifyBuilder)) { + verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1); + } + dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyName); + } else { + dummyInventoryInfoEO.setVerifyDeliverableTypeName("空"); } + //发起人 List fa1_qi3_ren2 = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.FA1_QI3_REN2.getValue()); //设计符合性确认-发起人 @@ -657,12 +717,63 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); + //设计符合性确认交付物模板 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableTemplate().split(","))); + } + // Prehomo确认交付物模板 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableTemplate().split(","))); + } + // 验证符合性确认交付物模板 + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableTemplate().split(","))); + } + List fileInfos = new ArrayList<>(); + if(deliverableList.size() != 0){ + fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); + } + //交付物类型模板 + if(fileInfos.size() != 0){ + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableTemplate())){ + String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getDesignDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + dummyInventoryInfoEO.setDesignDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableTemplate())){ + String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getPrehomoDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + dummyInventoryInfoEO.setPrehomoDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableTemplate())){ + String fileName = getFileName(fileInfos,dummyInventoryInfoEO.getVerifyDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + dummyInventoryInfoEO.setVerifyDeliverableTemplateName(fileName); + } + } + } } } + private String getFileName(List fileInfos, String deliverableTemplate){ + StringBuilder sb = new StringBuilder(); + for (String s : deliverableTemplate.split(",")) { + List collect = fileInfos.stream().filter(e -> s.equals(e.getId())).collect(Collectors.toList()); + sb.append(collect.get(0).getFileName() + ","); + } + String sbStr = ""; + if(org.apache.commons.lang3.StringUtils.isNotBlank(sb)){ + sbStr = sb.substring(0, sb.length() - 1); + } + return sbStr; + } //翻译成英文名 public void disposeDataToEn(List records) { - Set technologyTerritorySet = new HashSet<>(); + for (DummyInventoryInfoEO dummyInventoryInfoEO : records) { //子标题 if (StringUtils.isBlank(dummyInventoryInfoEO.getSubtitle())) { @@ -681,6 +792,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl technologyTerritorySet = new HashSet<>(); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getTechnologyTerritory())) { List list = Arrays.asList(dummyInventoryInfoEO.getTechnologyTerritory().split(",")); technologyTerritorySet.addAll(list); @@ -799,27 +911,81 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); - //设计符合性确认-交付物类型 + Set deliverableTypeSet = new HashSet<>(); + List designDeliverableTypeIdList= new ArrayList<>(); + List prehomoDeliverableTypeIdList = new ArrayList<>(); + List verifyDeliverableTypeIdList = new ArrayList<>(); if (StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { - String designDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getDesignDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setDesignDeliverableType(designDeliverableTypeEnName); - }else { - dummyInventoryInfoEO.setDesignDeliverableType("null"); + designDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(dummyInventoryInfoEO.getVerifyDeliverableType().split(",")); + deliverableTypeSet.addAll(verifyDeliverableTypeIdList); + } + //树形结构 + List deliverableTypeList = new ArrayList<>(); + if (deliverableTypeSet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, deliverableTypeSet); + deliverableTypeList = sysCategoryService.list(wrapper); + } + + //设计符合性确认-交付物类型 + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getDesignDeliverableType())) { + StringBuilder designBuilder = new StringBuilder(); + for(String id : designDeliverableTypeIdList){ + List designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (designList.size() != 0) { + designBuilder.append(designList.get(0).getEnName() + ","); + } + } + String designEnName = null; + if (StringUtils.isNotBlank(designBuilder)) { + designEnName = designBuilder.substring(0, designBuilder.length() - 1); + } + dummyInventoryInfoEO.setDesignDeliverableTypeName(designEnName); + } else { + dummyInventoryInfoEO.setDesignDeliverableTypeName("null"); } //prehomo确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { - String prehomoDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getPrehomoDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setPrehomoDeliverableType(prehomoDeliverableTypeEnName); - }else { - dummyInventoryInfoEO.setPrehomoDeliverableType("null"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getPrehomoDeliverableType())) { + StringBuilder prehomoBuilder = new StringBuilder(); + for(String id : prehomoDeliverableTypeIdList){ + List prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (prehomoList.size() != 0) { + prehomoBuilder.append(prehomoList.get(0).getEnName() + ","); + } + } + String prehomoEnName = null; + if (StringUtils.isNotBlank(prehomoBuilder )) { + prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + } + dummyInventoryInfoEO.setPrehomoDeliverableTypeName(prehomoEnName); + } else { + dummyInventoryInfoEO.setPrehomoDeliverableTypeName("null"); } //验证符合性确认-交付物类型 - if (StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { - String verifyDeliverableTypeEnName = deliverableTemplate.stream().filter(e -> e.getItemValue().equals(dummyInventoryInfoEO.getVerifyDeliverableType())).map(f -> f.getEnName()).collect(Collectors.joining(",")); - dummyInventoryInfoEO.setVerifyDeliverableType(verifyDeliverableTypeEnName); - }else { - dummyInventoryInfoEO.setVerifyDeliverableType("null"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(dummyInventoryInfoEO.getVerifyDeliverableType())) { + StringBuilder verifyBuilder = new StringBuilder(); + for(String id : verifyDeliverableTypeIdList){ + List verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + + if (verifyList.size() != 0) { + verifyBuilder.append(verifyList.get(0).getEnName() + ","); + } + } + String verifyEnName = null; + if (StringUtils.isNotBlank(verifyBuilder)) { + verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1); + } + dummyInventoryInfoEO.setVerifyDeliverableTypeName(verifyEnName); + } else { + dummyInventoryInfoEO.setVerifyDeliverableTypeName("null"); } //发起人 @@ -956,7 +1122,7 @@ 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"; - contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog); + contentInfo = setInfoDiffListContent(contentInfo,infoDiffList,contentLog); } } } @@ -974,10 +1140,10 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); - String infoDiffNew = "list.get(1)"; + String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { contentInfo += "'"+DummyInventoryBaseFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOld + " to " + infoDiffNew + ","; @@ -1160,8 +1326,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableTemplate").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTemplateName"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableTemplateName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { @@ -1196,8 +1362,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { @@ -1208,8 +1374,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplate").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTemplateName"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableTemplateName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { @@ -1244,8 +1410,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { @@ -1256,8 +1422,8 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableTemplate").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTemplateName"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTemplateName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); if (StringUtils.isBlank(contentLog)) { diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java index bd3ace02d..2498df41f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryInfoEOServiceImpl.java @@ -206,14 +206,14 @@ public class DummyInventoryInfoEOServiceImpl extends ServiceImpl> infoDiffListEn = new ArrayList<>(); infoDiffListEn.add(infoDiffEn); + if(infoDiff.size()>1) { + contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null, infoDiffList, contentLog); + enContentLog = dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog, infoDiffListEn, null); - contentLog = dummyInventoryBaseEOService.setInfoDiffListContent(null,infoDiffList,contentLog); - enContentLog=dummyInventoryBaseEOService.setInfoDiffListContent(enContentLog,infoDiffListEn,null); - - dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); - dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); + dummyLogEOService.updateLog(contentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.CN.getValue()); + dummyLogEOService.updateLog(enContentLog, dummyInventoryInfoEO.getDummyInventoryBaseId(),CutEnum.EN.getValue()); + } } - /** * 通过id删除 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java index 08ed0849e..3fd0a22b0 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/util/ListDiff.java @@ -29,7 +29,8 @@ public class ListDiff { && !f.getName().equals("implementTime") && !f.getName().equals("xin1Che1Xing2Shi2Shi1Ri4Qi1") && !f.getName().equals("implementTime") && !f.getName().equals("inventoryAffirmStatusName") && !f.getName().equals("taskAffirmStatusName") && !f.getName().equals("roleCode") - && !f.getName().equals("roleName") + && !f.getName().equals("roleName") && !f.getName().equals("verifyDeliverableType")&& !f.getName().equals("designDeliverableType") + && !f.getName().equals("prehomoDeliverableType") ){ StringBuilder v1String= new StringBuilder(String.valueOf(v1)); @@ -42,7 +43,9 @@ public class ListDiff { // } if(f.getName().contains("erritory") || f.getName().contains("emplate") || f.getName().equals(("shi4Yong4Fan4Wei2")) || f.getName().equals("region") - || f.getName().equals("applyScope")){ + || f.getName().equals("applyScope") || f.getName().contains("DeliverableType") + + ){ result.put(f.getName(), v1String.append("|").append(v2String).toString()); }else { // 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 21533edcd..f5157cf51 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 @@ -105,7 +105,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.in(HomeFunctionModuleEO::getState,"0"); + wrapper.in(HomeFunctionModuleEO::getState,"0").isNull(HomeFunctionModuleEO::getCreateBy); List homeFunctionModuleEOList = this.list(wrapper); //当前用户配置的图表 diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java index 81430dfea..2f78c3d92 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.document.service.IBussDocumentLibraryEOService; import com.jero.modules.ocr.entity.OcrRecordEO; @@ -82,18 +83,42 @@ public class OcrRecordEOController extends JeroController syncToDocument(@RequestBody OcrRecordEO ocrRecordEO) { + String cut = ocrRecordEO.getCut(); if(StringUtils.isBlank(ocrRecordEO.getConnectId())){ - return Result.error("同步失败"); + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("同步失败！"); + } else { + return Result.error("sync failure!"); + } } + + // 文档库删了识别的pdf文件时 + LambdaQueryWrapper pdfFileLambdaQueryWrapper = new LambdaQueryWrapper<>(); + pdfFileLambdaQueryWrapper.eq(OSSFile::getConnectId, ocrRecordEO.getConnectId()); + List pdfFiles = ossFileService.list(pdfFileLambdaQueryWrapper); + if (CollectionUtil.isEmpty(pdfFiles)) { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("文档库已不存在转换前的pdf文件，同步失败！"); + } else { + return Result.error("Document Library no longer existed before the conversion of PDF files, synchronization fails!"); + } + + } + //查询doc文件的id - LambdaQueryWrapper ossFileLambdaQueryWrapper = new LambdaQueryWrapper<>(); - ossFileLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName()); - List ossFiles = ossFileService.list(ossFileLambdaQueryWrapper); - if (CollectionUtil.isEmpty(ossFiles)) { - return Result.error("没有可同步的文件"); + LambdaQueryWrapper docLambdaQueryWrapper = new LambdaQueryWrapper<>(); + docLambdaQueryWrapper.eq(OSSFile::getUrl, ocrRecordEO.getDocName()); + List docFiles = ossFileService.list(docLambdaQueryWrapper); + if (CollectionUtil.isEmpty(docFiles)) { + if (CutEnum.CN.getValue().equals(cut)) { + return Result.error("转换后的word文件不存在，同步失败！"); + } else { + return Result.error("Converted Word file does not exist, the synchronization fails!"); + } + } OSSFile ossFile = new OSSFile(); - String docFileId = ossFiles.get(0).getId(); + String docFileId = docFiles.get(0).getId(); ossFile.setId(docFileId); ossFile.setConnectId(ocrRecordEO.getConnectId()); ossFileService.updateById(ossFile); @@ -104,7 +129,12 @@ public class OcrRecordEOController extends JeroController @Override public List getPageInfo(NcrTrackVO ncrTrackVO) { if(StringUtils.isNotBlank(ncrTrackVO.getSerialNumber())){ + if(ncrTrackVO.getSerialNumber().contains("%")){ + ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replaceAll("%", "/%")); + } ncrTrackVO.setSerialNumber(ncrTrackVO.getSerialNumber().replace("*","")); } if(StringUtils.isNotBlank(ncrTrackVO.getTitle())){ + if(ncrTrackVO.getTitle().contains("%")){ + ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("%","/%")); + } ncrTrackVO.setTitle(ncrTrackVO.getTitle().replace("*","")); } List sysUserList = sysUserService.list(); 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 5fb91d7d2..c789e3de7 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 @@ -382,9 +382,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); List dataList = list(queryWrapper.eq("id", projectLawsInventoryEO.getId())); List dataListCopy = DeepCopyListUtil.depCopy(dataList); - + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + setDateNull(projectLawsInventoryEO, updateWrapper); //保存 - saveOrUpdate(projectLawsInventoryEO); + this.update(projectLawsInventoryEO,updateWrapper); +// saveOrUpdate(projectLawsInventoryEO); //翻译-中文 translateData(infoEOList); @@ -412,6 +414,24 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl updateWrapper) { + if(ObjectUtils.isEmpty(projectLawsInventoryEO.getXin1Che1Xing2Shi2Shi1Ri4Qi1())){ + updateWrapper.set(ProjectLawsInventoryEO::getXin1Che1Xing2Shi2Shi1Ri4Qi1,null); + } + if(ObjectUtils.isEmpty(projectLawsInventoryEO.getImplementTime())){ + updateWrapper.set(ProjectLawsInventoryEO::getImplementTime,null); + } + if(ObjectUtils.isEmpty(projectLawsInventoryEO.getDesignDueDate())){ + updateWrapper.set(ProjectLawsInventoryEO::getDesignDueDate,null); + } + if(ObjectUtils.isEmpty(projectLawsInventoryEO.getPrehomoDueDate())){ + updateWrapper.set(ProjectLawsInventoryEO::getPrehomoDueDate,null); + } + if(ObjectUtils.isEmpty(projectLawsInventoryEO.getVerifyDueDate())){ + updateWrapper.set(ProjectLawsInventoryEO::getVerifyDueDate,null); + } + } + /** * 更新流程信息 * @param projectLawsInventoryEO @@ -1558,12 +1578,6 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl 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(); @@ -1584,6 +1598,18 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl idList = Arrays.asList(projectLawsInventoryEO.getIds().split(",")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + List infoList = list(queryWrapper.in("id", idList)); + String projectLibraryId = infoList.get(0).getProjectLibraryId(); //更新log LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String username = sysUser.getUsername(); @@ -1725,9 +1756,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); - //设计符合性确认-交付物类型 + //交付物类型 + Set deliverableTypeSet = new HashSet<>(); + List designDeliverableTypeIdList= new ArrayList<>(); + List prehomoDeliverableTypeIdList = new ArrayList<>(); + List verifyDeliverableTypeIdList = new ArrayList<>(); 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("空"); + designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(",")); + deliverableTypeSet.addAll(verifyDeliverableTypeIdList); + } + //树形结构 + List deliverableTypeList = new ArrayList<>(); + if (deliverableTypeSet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, deliverableTypeSet); + deliverableTypeList = sysCategoryService.list(wrapper); + } + + //设计符合性确认-交付物类型 + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { + StringBuilder designBuilder = new StringBuilder(); + for(String id : designDeliverableTypeIdList){ + List designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (designList.size() != 0) { + designBuilder.append(designList.get(0).getName() + ","); + } + } + String designName = null; + if (StringUtils.isNotBlank(designBuilder)) { + designName = designBuilder.substring(0, designBuilder.length() - 1); + } + projectLawsInventoryEO.setDesignDeliverableTypeName(designName); + } else { + projectLawsInventoryEO.setDesignDeliverableTypeName("空"); } //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("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + StringBuilder prehomoBuilder = new StringBuilder(); + for(String id : prehomoDeliverableTypeIdList){ + List prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (prehomoList.size() != 0) { + prehomoBuilder.append(prehomoList.get(0).getName() + ","); + } + } + String prehomoName = null; + if (StringUtils.isNotBlank(prehomoBuilder )) { + prehomoName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + } + projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoName); + + } else { + projectLawsInventoryEO.setPrehomoDeliverableTypeName("空"); } //验证符合性确认-交付物类型 - 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("空"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + StringBuilder verifyBuilder = new StringBuilder(); + for(String id : verifyDeliverableTypeIdList){ + List verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + + if (verifyList.size() != 0) { + verifyBuilder.append(verifyList.get(0).getName() + ","); + } + } + String verifyName = null; + if (StringUtils.isNotBlank(verifyBuilder)) { + verifyName = verifyBuilder.substring(0, verifyBuilder.length() - 1); + } + projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyName); + } else { + projectLawsInventoryEO.setVerifyDeliverableTypeName("空"); } @@ -1989,6 +2074,48 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); + //设计符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); + } + // Prehomo确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); + } + // 验证符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); + } + List fileInfos = new ArrayList<>(); + if(deliverableList.size() != 0){ + fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); + } + //交付物类型模板 + if(fileInfos.size() != 0){ + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName); + + } + } + } } } @@ -2089,27 +2216,82 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableTemplate = sysDictItemMapper.selectItemsByDictCode(DummyInventoryBaseFieldEnum.DELIVERABLE_TEMPLATE.getValue()); - //设计符合性确认-交付物类型 + //交付物类型 + Set deliverableTypeSet = new HashSet<>(); + List designDeliverableTypeIdList= new ArrayList<>(); + List prehomoDeliverableTypeIdList = new ArrayList<>(); + List verifyDeliverableTypeIdList = new ArrayList<>(); 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"); + designDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getDesignDeliverableType().split(",")); + deliverableTypeSet.addAll(designDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + prehomoDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableType().split(",")); + deliverableTypeSet.addAll(prehomoDeliverableTypeIdList); + } + if (StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + verifyDeliverableTypeIdList = Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableType().split(",")); + deliverableTypeSet.addAll(verifyDeliverableTypeIdList); + } + //树形结构 + List deliverableTypeList = new ArrayList<>(); + if (deliverableTypeSet.size() != 0) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(SysCategory::getId, deliverableTypeSet); + deliverableTypeList = sysCategoryService.list(wrapper); + } + + //设计符合性确认-交付物类型 + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableType())) { + StringBuilder designBuilder = new StringBuilder(); + for(String id : designDeliverableTypeIdList){ + List designList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (designList.size() != 0) { + designBuilder.append(designList.get(0).getEnName() + ","); + } + } + String designEnName = null; + if (StringUtils.isNotBlank(designBuilder)) { + designEnName = designBuilder.substring(0, designBuilder.length() - 1); + } + projectLawsInventoryEO.setDesignDeliverableTypeName(designEnName); + } else { + projectLawsInventoryEO.setDesignDeliverableTypeName("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 (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableType())) { + StringBuilder prehomoBuilder = new StringBuilder(); + for(String id : prehomoDeliverableTypeIdList){ + List prehomoList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + if (prehomoList.size() != 0) { + prehomoBuilder.append(prehomoList.get(0).getEnName() + ","); + } + } + String prehomoEnName = null; + if (StringUtils.isNotBlank(prehomoBuilder )) { + prehomoEnName = prehomoBuilder .substring(0, prehomoBuilder .length() - 1); + } + projectLawsInventoryEO.setPrehomoDeliverableTypeName(prehomoEnName); + } else { + projectLawsInventoryEO.setPrehomoDeliverableTypeName("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"); + if (deliverableTypeList.size() != 0 && StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableType())) { + StringBuilder verifyBuilder = new StringBuilder(); + for(String id : verifyDeliverableTypeIdList){ + List verifyList = deliverableTypeList.stream().filter(e -> id.equals(e.getId())).collect(Collectors.toList()); + + if (verifyList.size() != 0) { + verifyBuilder.append(verifyList.get(0).getEnName() + ","); + } + } + String verifyEnName = null; + if (StringUtils.isNotBlank(verifyBuilder)) { + verifyEnName = verifyBuilder.substring(0, verifyBuilder.length() - 1); + } + projectLawsInventoryEO.setVerifyDeliverableTypeName(verifyEnName); + } else { + projectLawsInventoryEO.setVerifyDeliverableTypeName("null"); } @@ -2248,6 +2430,47 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl deliverableList = new ArrayList<>(); + //设计符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getDesignDeliverableTemplate().split(","))); + } + // Prehomo确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getPrehomoDeliverableTemplate().split(","))); + } + // 验证符合性确认交付物模板 + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + deliverableList.addAll(Arrays.asList(projectLawsInventoryEO.getVerifyDeliverableTemplate().split(","))); + } + List fileInfos = new ArrayList<>(); + if(deliverableList.size() != 0){ + fileInfos = iOSSFileService.getFileInfos(org.apache.commons.lang3.StringUtils.join(deliverableList, ",")); + } + //交付物类型模板 + if(fileInfos.size() != 0){ + if(StringUtils.isNotBlank(projectLawsInventoryEO.getDesignDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getDesignDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setDesignDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getPrehomoDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getPrehomoDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setPrehomoDeliverableTemplateName(fileName); + } + } + if(StringUtils.isNotBlank(projectLawsInventoryEO.getVerifyDeliverableTemplate())){ + String fileName = getFileName(projectLawsInventoryEO, fileInfos,projectLawsInventoryEO.getVerifyDeliverableTemplate()); + if(org.apache.commons.lang3.StringUtils.isNotBlank(fileName)){ + projectLawsInventoryEO.setVerifyDeliverableTemplateName(fileName); + + } + } + } } } @@ -4272,13 +4495,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("designDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("designDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("designDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); contentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; - List listEn = Arrays.asList(infoDiffEn.get("designDeliverableType").split(",")); + List listEn = Arrays.asList(infoDiffEn.get("designDeliverableTypeName").split("\\|")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); enContentLog += "'"+ProjectInventoryFieldEnum.DESIGN_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; @@ -4332,13 +4555,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("prehomoDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("prehomoDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("prehomoDeliverableTypeName").split("\\|")); String infoDiffOld = list.get(0); String infoDiffNew = list.get(1); contentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getName() + "'由" + infoDiffOld + "改为了" + infoDiffNew + ","; - List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableType").split(",")); + List listEn = Arrays.asList(infoDiffEn.get("prehomoDeliverableTypeName").split("\\|")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); enContentLog += "'"+ProjectInventoryFieldEnum.PREHOMO_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; @@ -4393,13 +4616,13 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl list = Arrays.asList(infoDiff.get("verifyDeliverableType").split(",")); + if (StringUtils.isNotBlank(infoDiff.get("verifyDeliverableTypeName"))) { + List list = Arrays.asList(infoDiff.get("verifyDeliverableTypeName").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(",")); + List listEn = Arrays.asList(infoDiffEn.get("verifyDeliverableTypeName").split("\\|")); String infoDiffOldEn = listEn.get(0); String infoDiffNewEn = listEn.get(1); enContentLog += "'"+ProjectInventoryFieldEnum.VERIFY_DELIVERABLE_TYPE.getEnName() +"' has been changed from " + infoDiffOldEn + " to " + infoDiffNewEn + ","; @@ -4452,15 +4675,14 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> bussDocumentLibraryEOList = bussDocumentLibraryEOService.getListBySerialNumber(splitInfoEO.getSerialNumber()); + if (CollectionUtil.isNotEmpty(bussDocumentLibraryEOList)) { + splitInfoEO.setDocumentId(bussDocumentLibraryEOList.get(0).get("id").toString()); + } if(StringUtils.isNotEmpty(splitInfoEO.getFileId())) { splitInfoEO.setFlag("1"); }else{ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml index f7d54fc5b..80377e4c8 100644 --- a/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml +++ b/jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml @@ -93,7 +93,7 @@ spring: mvc: static-path-pattern: /** resource: - static-locations: classpath:/static/,classpath:/public/ + static-locations: classpath:/static/,classpath:/public/,classpath:/home/ autoconfigure: exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure datasource: @@ -388,7 +388,7 @@ people: # secret: CDf2D9404C6ac1B0f7c3e3845ae0282a # appSecret CN PROD版 secret: 7C3F03170E3ea489df04Ce8DEC7Df4f7 - cronJobIsOpen: true + cronJobIsOpen: false ## Feishu Feishu: # 测试 @@ -404,10 +404,18 @@ local-tool: uri: http://139.9.235.66:9022 opensso: # TEST版 - accessTokenUrl: https://signin-test.nio.com/oauth2/accessToken - profileUrl: https://signin-test.nio.com/oauth2/profile +# accessTokenUrl: https://signin-test.nio.com/oauth2/accessToken +# profileUrl: https://signin-test.nio.com/oauth2/profile +# clientId: 100679 +# clientSecret: CDf2D9404C6ac1B0f7c3e3845ae0282a +# redirectUri: http%3A%2F%2F139.9.235.66%3A8010 + + # PROD版 + authorizeUrl: https://signin.nio.com/oauth2/authorize + accessTokenUrl: https://signin.nio.com/oauth2/accessToken + profileUrl: https://signin.nio.com/oauth2/profile clientId: 100679 - clientSecret: CDf2D9404C6ac1B0f7c3e3845ae0282a + clientSecret: 7C3F03170E3ea489df04Ce8DEC7Df4f7 redirectUri: http%3A%2F%2F139.9.235.66%3A8010 --- diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdcf.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdcf.png new file mode 100644 index 000000000..e1948c9b9 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdcf.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wddb.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wddb.png new file mode 100644 index 000000000..5db1b6cba Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wddb.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdfy.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdfy.png new file mode 100644 index 000000000..2348991fc Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdfy.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdk.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdk.png new file mode 100644 index 000000000..9eec0396e Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdk.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsb.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsb.png new file mode 100644 index 000000000..5948fd0bd Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsb.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsc.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsc.png new file mode 100644 index 000000000..8cb017b4c Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/wdsc.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xmk.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xmk.png new file mode 100644 index 000000000..3136ddf3a Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xmk.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xnqd.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xnqd.png new file mode 100644 index 000000000..27d19d0a4 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xnqd.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xxsj.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xxsj.png new file mode 100644 index 000000000..0d49e11db Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/xxsj.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/yjcj.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/yjcj.png new file mode 100644 index 000000000..2a0af2b81 Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/yjcj.png differ diff --git a/jero-boot/jero-boot-single-startup/src/main/resources/static/home/zswdk.png b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/zswdk.png new file mode 100644 index 000000000..43be627ea Binary files /dev/null and b/jero-boot/jero-boot-single-startup/src/main/resources/static/home/zswdk.png differ diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 5b0de0a85..862267a30 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -133,10 +133,10 @@ } .itemModel-multi { - width: calc(100% - 130px)!important; - display: inline-block!important; - margin-top: 2px!important; - height: 40px!important; + width: calc(100% - 130px) !important; + display: inline-block !important; + margin-top: 2px !important; + height: 40px !important; } .itemModel-multi .ant-form-explain, .ant-form-extra { diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 0b3cf876b..1a3566d7b 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -708,6 +708,8 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'Enclosure', // 认证 + Correspondingstandarddeleted: 'Correspondingstandarddeleted', + changeTheTitle: 'Title already exists, please change the title', resetPassword: 'reset Password', departmentAllocation: 'department Allocation', ListTitle: 'List Title', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 420dcdeae..2c5d00079 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -718,6 +718,8 @@ module.exports = { uploadTime: '上传时间', enclosure: '附件', // 认证 + Correspondingstandarddeleted: '对应标准已删除', + changeTheTitle: '标题已存在，请更换标题', resetPassword: '重置密码', departmentAllocation: '部门配置', ListTitle: '清单标题', diff --git a/jero-web/src/components/SplitTable/index.vue b/jero-web/src/components/SplitTable/index.vue index 1c35e175b..45d17a3fa 100644 --- a/jero-web/src/components/SplitTable/index.vue +++ b/jero-web/src/components/SplitTable/index.vue @@ -126,7 +126,15 @@ }, methods: { urlClick(text,record) { - this.$emit('detailClick', record) + if(record.documentId === null) { + this.$message.warning(this.$t('Correspondingstandarddeleted')) + } else { + let newUrl = this.$router.resolve({ + path: '/docManage/library/detail', + query: record + }) + window.open(newUrl.href, '_blank') + } }, getTextWith(text, fontStyle) { var canvas = document.createElement('canvas') diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index d4056b84f..46fde66e8 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -64,7 +64,7 @@ - + - + diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index 17d51f430..0a556aa49 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -353,7 +353,9 @@ }, methods: { getInfoById() { - getAction(this.url.getInfo, { id: this.$route.query.id }).then((res) => { + let _id = this.$route.query.documentId === undefined ? this.$route.query.id : this.$route.query.documentId + console.log(_id) + getAction(this.url.getInfo, { id: _id }).then((res) => { if (res.success) { this.detailList = res.result } else { diff --git a/jero-web/src/views/documentManage/tags/dialog/DicList.vue b/jero-web/src/views/documentManage/tags/dialog/DicList.vue index 952560c1e..464806d35 100644 --- a/jero-web/src/views/documentManage/tags/dialog/DicList.vue +++ b/jero-web/src/views/documentManage/tags/dialog/DicList.vue @@ -418,7 +418,7 @@ } this.loadData() }else{ - this.$message.warning(this.$t('operationFailed')); + this.$message.warning(res.message); } }) } diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue index a3467523e..cc447a406 100644 --- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue +++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue @@ -3,7 +3,7 @@
{{$t('engineeringConfirmation')}} -
diff --git a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue index e7ebead41..67239e72e 100644 --- a/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue +++ b/jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue @@ -1,11 +1,12 @@