QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 零部件支持多选查询

Browse Source
This commit is contained in:
mzaxd
2024-08-22 14:24:40 +08:00
parent 5e4736dcd0
commit e4e070b719
1 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+10 -8
View File
@@ -163,18 +163,22 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
public void setEnable(boolean enable) { public void setEnable(boolean enable) {
ENCRYPT_ENABLE = enable; ENCRYPT_ENABLE = enable;
} }
@Value("${download.decrypt.url}") @Value("${download.decrypt.url}")
public void setDecryptUrl(String decryptUrl) { public void setDecryptUrl(String decryptUrl) {
DECRYPT_URL = decryptUrl; DECRYPT_URL = decryptUrl;
} }
@Value("${download.decrypt.app_code}") @Value("${download.decrypt.app_code}")
public void setDecryptAppCode(String decryptAppCode) { public void setDecryptAppCode(String decryptAppCode) {
DECRYPT_APP_CODE = decryptAppCode; DECRYPT_APP_CODE = decryptAppCode;
} }
@Value("${download.decrypt.secret_key}") @Value("${download.decrypt.secret_key}")
public void setDecryptSecretKey(String decryptSecretKey) { public void setDecryptSecretKey(String decryptSecretKey) {
DECRYPT_SECRET_KEY = decryptSecretKey; DECRYPT_SECRET_KEY = decryptSecretKey;
} }
@Value("#{'${adminRoleCode}'.split(',')}") @Value("#{'${adminRoleCode}'.split(',')}")
private List<String> adminRoleCodeList; private List<String> adminRoleCodeList;
@Value("#{'${enterpriseDetailRoleCode}'.split(',')}") @Value("#{'${enterpriseDetailRoleCode}'.split(',')}")
@@ -2391,7 +2395,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
} }
@NotNull @NotNull
private List<String> getLawsPartNameStandard(String partName) { private List<String> getLawsPartNameStandard(String partNames) {
String[] partNameIdList = partNames.split(",");
Set<LawsPartNameStandard> partNameStandardSet = new HashSet<>();
for (String partName : partNameIdList) {
PartName targetNode = partNameService.getById(partName); PartName targetNode = partNameService.getById(partName);
List<PartName> resultNodeList = new ArrayList<>(); List<PartName> resultNodeList = new ArrayList<>();
// 获取整颗零部件树 // 获取整颗零部件树
@@ -2408,13 +2415,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
LambdaQueryWrapper<LawsPartNameStandard> pnsWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsPartNameStandard> pnsWrapper = new LambdaQueryWrapper<>();
pnsWrapper.in(LawsPartNameStandard::getPartNameId, resultNodeList.stream().map(PartName::getCode).collect(Collectors.toList())); pnsWrapper.in(LawsPartNameStandard::getPartNameId, resultNodeList.stream().map(PartName::getCode).collect(Collectors.toList()));
List<LawsPartNameStandard> partNameStandardList = partNameStandardService.list(pnsWrapper); partNameStandardSet.addAll(partNameStandardService.list(pnsWrapper));
if (partNameStandardList.isEmpty()) {
return new ArrayList<>();
} }
return partNameStandardSet.stream().map(LawsPartNameStandard::getStandardId).collect(Collectors.toList());
return partNameStandardList.stream().map(LawsPartNameStandard::getStandardId).collect(Collectors.toList());
} }
@@ -2625,7 +2628,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
} }
@Override @Override
public byte[] getMinioFileContent(OSSFile file) throws Exception { public byte[] getMinioFileContent(OSSFile file) throws Exception {
return this.getMinioFileContentNormal(file, false); return this.getMinioFileContentNormal(file, false);