省测卡片问题

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -2034,7 +2034,6 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         if (StringUtils.isEmpty(bizOrgCode) && StringUtil.isNotEmpty(companyCode)) {
             bizOrgCode = planTaskMapper.queryByCompanyCode(companyCode);
         }
-        DecimalFormat df = new DecimalFormat("#.00");
         List<Map<String, Object>> statics = planTaskMapper.getStatics(bizOrgCode);
         int xcdw = 0;
         int hgdw = 0;
@@ -2065,10 +2064,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             for (Map<String, Object> map  : statics
             ) {
                 if(map.get("code").equals("xfxchgzb")) {
-                    map.put("value",df.format( hgdw / xcdw ));
+                    map.put("value",(hgdw / xcdw)*100);
                 }
                 if(map.get("code").equals("xfxclcl")) {
-                    map.put("value",df.format( lcdw / xcdw ));
+                    map.put("value",(lcdw / xcdw)*100 );
                 }
             }
         }

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5959,6 +5959,7 @@
             wl_equipment_specific wes
         WHERE
             wes.biz_org_code LIKE CONCAT(#{bizOrgCode}, '%')
+
     </select>
 
     <select id="selectCarStats" resultType="java.util.Map">
@@ -5968,8 +5969,11 @@
             0 AS redCodeCount
         FROM
             wl_car wc
+            LEFT JOIN wl_equipment wle ON wle.id = wc.equipment_id
+            LEFT JOIN wl_equipment_category wec ON wle.category_id = wec.id
         WHERE
             wc.biz_org_code LIKE CONCAT(#{bizOrgCode}, '%')
+            and LEFT (wec.CODE, 6) = '210101'
     </select>
 
     <select id="getFireWaterInfo" resultType="Map">