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_master

Browse Source
This commit is contained in:
CD
2022-11-07 15:16:22 +08:00
parent d0542a79b1 1403ca6b91
commit 58e0240749
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java
+5 -6
View File
@@ -555,11 +555,11 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
p.setTextStatus(s.getTextStatus()); p.setTextStatus(s.getTextStatus());
if (s.getUnCount()==0L && s.getCounts()>0L) { if (s.getUnCount()==0L && s.getCounts()>0L) {
p.setUnCount(s.getUnCount()); 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());
for (SarStandAttrInfo a:list2){ for (SarStandAttrInfo a:list2){
@@ -575,10 +575,9 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProje
} }
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) {
if (s.getIsOverCount() != 0L) { p.setUnCount(-1L); // 不涉及
p.setUnCount(-1L);
} }
} }
list.add(p); list.add(p);