大屏-外部报验情况

business-common/src/main/java/com/rongwei/bscommon/sys/dao/ZhcxItpProjectNodesDao.java

@@ -131,7 +131,7 @@ public interface ZhcxItpProjectNodesDao extends BaseMapper<ZhcxItpProjectNodesDo
             "   AND d.DELETED = '0'" +
             "  <if test='projectId != null'> and d.PROJECTID = #{projectId} </if>" +
             "  <if test='machineno != null'> and d.MACHINENO = #{machineno} </if>" +
-            "  ) " +
+            "  ) and n.DELETED = '0'" +
             "   GROUP BY n.PROJECTID " +
             "</script>")
     List<ShipOffStoreNodeTotal> getShipOffStoreNodeTotal(ComlpateIndicatorsRequest req);

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

@@ -373,7 +373,7 @@ public class ZhcxLowaltitudeDebtfreeCheckServiceImpl extends ServiceImpl<ZhcxLow
             indicator.setMachineid(row.getString("machinenoid"));
             indicator.setMachineno(row.getString("machineno"));
             indicator.setDisplayboard("红");
-            indicator.setIndicatorname("低空不欠债完成情况");
+            indicator.setIndicatorname("低空检查情况");
             indicator.setType("lowaltitude_complate");
             indicator.setSort(1);
 

business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxOutsideInspectionItpServiceImpl.java

@@ -1514,7 +1514,7 @@ public class ZhcxOutsideInspectionItpServiceImpl extends ServiceImpl<ZhcxOutside
             indicator.setDisplayboard("绿");
             indicator.setIndicatorname("到期检验情况");
             indicator.setType("outside_inspection_complate");
-            indicator.setSort(1);
+            indicator.setSort(7);
 
             if(ObjectUtil.isEmpty(inspectionTolalMap.get(nodeTotal.getProjectid()))) {
                 indicator.setCompleted(0);