FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_3

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-12-15 17:50:57 +08:00
parent f00f5b9021 14e2b3368c
commit 3bbbc90900
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarStandFileEOServiceImpl.java
+7 -2
View File
@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -100,7 +101,7 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
for (String key:result.getAttrInfoCaseMap().keySet()) { for (String key:result.getAttrInfoCaseMap().keySet()) {
if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){ if (null!=result.getAttrInfoCaseMap().get(key) && !"".equals(result.getAttrInfoCaseMap().get(key))){
if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){ if (result.getAttrInfoCaseMap().get(key).toString().contains(",")){
choose.add(result.getAttrInfoCaseMap().get(key).toString().replace(",","")); choose.addAll(new ArrayList<>(Arrays.asList(result.getAttrInfoCaseMap().get(key).toString().split(","))));
}else { }else {
choose.add(result.getAttrInfoCaseMap().get(key).toString()); choose.add(result.getAttrInfoCaseMap().get(key).toString());
} }
@@ -112,7 +113,11 @@ public class SarStandFileEOServiceImpl implements SarStandFileEOService {
} }
queryWrapper.eq("STAND_ID",standId); queryWrapper.eq("STAND_ID",standId);
queryWrapper.eq("USE_MODEL","SOURCE_FILE"); if ("0".equals(type)){
queryWrapper.eq("USE_MODEL", "WEB_FILE");
}else {
queryWrapper.eq("USE_MODEL", "SOURCE_FILE");
}
queryWrapper.in("ATT_ID",choose); queryWrapper.in("ATT_ID",choose);
List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper); List<SarStandFileEO> sarStandFileEOS = sarStandFileEODao.selectList(queryWrapper);