Browse Source

大屏-低空不欠债问题修复

wangming 6 months ago
parent
commit
f33918f608

+ 7 - 3
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxLowaltitudeDebtfreeCheckServiceImpl.java

@@ -405,15 +405,19 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
      * @return
      */
     private String getCompletionstatus(ZhcxLowaltitudeDebtfreeCheckDo check) {
-        if(ObjectUtil.isNotEmpty(check.getPowercompletionstatus())) {
+
+        if("assembling".equals(check.getQualitystatus())) {
+            if(ObjectUtil.isEmpty(check.getCompletionstatus())) {
+                return "0/0";
+            }
             return check.getCompletionstatus();
         }
 
-        if(ObjectUtil.isNotEmpty(check.getCompletionstatus())) {//总装完成情况
+        if(ObjectUtil.isEmpty(check.getPtcompletionstatus())) {
             return check.getCompletionstatus();
         }
 
-        return "0/0";
+        return check.getPtcompletionstatus();
     }
 
     /**