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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the, bug #52285

See merge request LiuChao/foton-slrs-system-rest!449
This commit is contained in:
super_liu
2022-04-11 17:37:52 +08:00
parent 9c0326c722 bbaab05b58
commit 362f82c639
2 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsStandInfo/service/impl/SarLawsStandInfoServiceImpl.java
+8 -3
View File
@@ -373,9 +373,9 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
getAttrMap.putAll(newMap);
}
if (getAttrMap != null && !getAttrMap.isEmpty()) {
row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
}
// if (getAttrMap != null && !getAttrMap.isEmpty()) {
// row.setAttrInfoCaseMap(transformUpperCase(getAttrMap));
// }
row.setAttrInfoMap(getAttrMap);
}
@@ -598,6 +598,11 @@ public class SarLawsStandInfoServiceImpl extends ServiceImpl<SarLawsStandInfoDao
for(SarLawsStandInfoExport row : sarlist){
attrInfoDetailsExport(row);
row.setLawsType(filterValue(dicMap,row.getLawsType()));
row.setLawsSyqy(filterValue(dicMap,row.getLawsSyqy()));
row.setLawsSycx(filterValue(dicMap,row.getLawsSycx()));
row.setLawsLabel(filterValue(dicMap,row.getLawsLabel()));
row.setLawsYear(filterValue(dicMap,row.getLawsYear()));
Map<String, Object> getAttrMap = row.getAttrInfoMap();
Map<String, Object> getNewMap = new LinkedHashMap<>();
if (getAttrMap != null && getAttrMap.size() > 0) {