ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 企标更改流程列表接收数据

Browse Source
This commit is contained in:
mzaxd
2023-12-04 17:10:52 +08:00
parent 4f1297519c
commit 3ff10de496
7 changed files with 210 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+27 -27
View File
@@ -290,16 +290,16 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
}
// 责任部门暂不导入
// String zrbm = dto.getZrbm();
// if (oldDeptMap.get(zrbm) != null && oldDeptMap.get(zrbm).get(0) != null) {
// String curOrgName = oldDeptMap.get(zrbm).get(0).getCurOrgName();
// if (StrUtil.isNotBlank(curOrgName)) {
// List<SysDepart> departList = curDeptMap.get(curOrgName);
// if (departList.size() != 0) {
// gb.setResponsibleDepartment(departList.get(0).getId());
// }
// }
// }
String zrbm = dto.getZrbm();
if (oldDeptMap.get(zrbm) != null && oldDeptMap.get(zrbm).get(0) != null) {
String curOrgName = oldDeptMap.get(zrbm).get(0).getCurOrgName();
if (StrUtil.isNotBlank(curOrgName)) {
List<SysDepart> departList = curDeptMap.get(curOrgName);
if (departList.size() == 1) {
fb.setResponsibleDepartment(departList.get(0).getId());
}
}
}
String zrr = dto.getZrr();
String zrrid = dto.getZrrid();
if (StrUtil.isNotBlank(zrr) && StrUtil.isNotBlank(zrrid)) {
@@ -972,16 +972,16 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
gb.setReplacedByStandardNumber(dto.getBtdbzh());
// 责任部门暂不导入
// String zrbm = dto.getZrbm();
// if (oldDeptMap.get(zrbm) != null && oldDeptMap.get(zrbm).get(0) != null) {
// String curOrgName = oldDeptMap.get(zrbm).get(0).getCurOrgName();
// if (StrUtil.isNotBlank(curOrgName)) {
// List<SysDepart> departList = curDeptMap.get(curOrgName);
// if (departList.size() != 0) {
// gb.setResponsibleDepartment(departList.get(0).getId());
// }
// }
// }
String zrbm = dto.getZrbm();
if (oldDeptMap.get(zrbm) != null && oldDeptMap.get(zrbm).get(0) != null) {
String curOrgName = oldDeptMap.get(zrbm).get(0).getCurOrgName();
if (StrUtil.isNotBlank(curOrgName)) {
List<SysDepart> departList = curDeptMap.get(curOrgName);
if (departList.size() == 1) {
gb.setResponsibleDepartment(departList.get(0).getId());
}
}
}
String zrr = dto.getZrr();
String zrrid = dto.getZrrid();
if (StrUtil.isNotBlank(zrr) && StrUtil.isNotBlank(zrrid)) {
@@ -1027,7 +1027,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
}
// 3. 将文件关系列表转为Map，用于快速查找
// Map<String, List<OSSFile>> standardNumberToFileMap = ossFileList.stream().collect(Collectors.groupingBy(OSSFile::getStandardNo));
Map<String, List<OSSFile>> standardNumberToFileMap = ossFileList.stream().collect(Collectors.groupingBy(OSSFile::getStandardNo));
// 4. 遍历待保存或更新的列表，设置ID
StringBuilder oldIds = new StringBuilder();
@@ -1074,12 +1074,12 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
}
String standardId = entity.getId();
// 保存文件关联
// List<OSSFile> ossFiles = standardNumberToFileMap.get(entity.getStandardNumber());
// if (ossFiles != null && !ossFiles.isEmpty()) {
// OSSFile ossFile = ossFiles.get(0);
// ossFile.setStandardId(standardId);
// ossFileService.save(ossFile);
// }
List<OSSFile> ossFiles = standardNumberToFileMap.get(entity.getStandardNumber());
if (ossFiles != null && !ossFiles.isEmpty()) {
OSSFile ossFile = ossFiles.get(0);
ossFile.setStandardId(standardId);
ossFileService.save(ossFile);
}
}
log.info("老法规国标覆盖导入完成");
// 获取当前时间戳（毫秒）