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

194-bug修改

Browse Source
This commit is contained in:
liyawei
2022-11-07 16:40:12 +08:00
parent 1403ca6b91
commit 07c8d1dcea
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/processModel/exportWkExcel.java
+2 -1
View File
@@ -78,7 +78,8 @@ public class exportWkExcel {
char letter = 'A'; char letter = 'A';
for(letter = 'A'; letter <= 'Z'; ++letter){ for(letter = 'A'; letter <= 'Z'; ++letter){
Map<String,String> typeMap = new HashMap<>(); Map<String,String> typeMap = new HashMap<>();
typeMap.put("Q/FT "+letter,"Q/FT "+letter); typeMap.put("label","Q/FT "+letter);
typeMap.put("value","Q/FT "+letter);
bussStandTypeList.add(typeMap); bussStandTypeList.add(typeMap);
} }
resultMap.put("BUSSSTANDCLASS",bussStandTypeList); resultMap.put("BUSSSTANDCLASS",bussStandTypeList);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+4 -4
View File
@@ -558,7 +558,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setUnCount(s.getUnCount()); // uncount==0 p.setUnCount(s.getUnCount()); // uncount==0
}else if (s.getUnCount() == 0L && s.getCounts()==0L){ }else if (s.getUnCount() == 0L && s.getCounts()==0L){
p.setUnCount(2L); p.setUnCount(2L);
}else { }else { // 有不满足时
p.setUnCount(1L); // 不符合 p.setUnCount(1L); // 不符合
} }
p.setEndTimes(s.getEndTimes()); p.setEndTimes(s.getEndTimes());
@@ -573,10 +573,10 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
if(StringUtils.equals(s.getStandType(),"BUSINESS_STAND")){ if(StringUtils.equals(s.getStandType(),"BUSINESS_STAND")){
p.setSSRQ(s.getIssueTime()); p.setSSRQ(s.getIssueTime());
} }
if (0L == s.getUnCount()) { if (0L == s.getUnCount()) { // 没有不满足时
if (s.getIsCount() != 0L) { if (s.getIsCount() != 0L) { // 只有满足和不涉及---符合
p.setUnCount(0L); // 符合 p.setUnCount(0L); // 符合
} else if (s.getIsOverCount() != 0L) { } else if (s.getIsOverCount() != 0L) { //只有不涉及---不涉及
p.setUnCount(-1L); // 不涉及 p.setUnCount(-1L); // 不涉及
} }
} }