[task-3104]设备看板调整

ibps-provider-root/modules/provider-business/src/main/java/com/lc/ibps/business/service/impl/StatisticServiceImpl.java

@@ -183,7 +183,7 @@ public class StatisticServiceImpl implements StatisticService {
         //  各部门设备检定/校准完成情况
         equipDTO.setVerificationData(getVerificationData());
 
-        //  检验科设备停用/报废列表
+        //  所有设备维修次数
         equipDTO.setScrapData(getEquipScrapList());
 
         list.add(equipDTO);
@@ -255,20 +255,33 @@ public class StatisticServiceImpl implements StatisticService {
     }
 
     private List<List<String>> getEquipScrapList(){
-        String sql = "SELECT e.name_,a.she_bei_ming_chen,a.she_bei_bian_hao_,a.chu_li_lei_xing_ from " +
-                "(SELECT bian_zhi_bu_men_,she_bei_ming_chen,she_bei_bian_hao_,chu_li_lei_xing_ from t_sbtybfjlb WHERE " +
-                "shi_fou_guo_shen_='已完成' and di_dian_='%s' ORDER BY create_time_ desc)a , " +
-                "ibps_party_entity e where a.bian_zhi_bu_men_=e.id_ ";
+        String sql = "SELECT \n" +
+                "    a.id_ AS id_,\n" +
+                "    COUNT(b.she_bei_id_) AS repair_times,\n" +
+                "    a.bian_zhi_bu_men_ AS bian_zhi_bu_men_,\n" +
+                "    e.name_ AS name_,\n" +
+                "    a.she_bei_ming_cheng_ AS she_bei_ming_chen,\n" +
+                "    a.she_bei_shi_bie_h AS she_bei_bian_hao_,\n" +
+                "    a.yuan_she_bei_bian AS yuan_she_bei_bian,\n" +
+                "    a.she_bei_zhuang_ta AS she_bei_zhuang_ta\n" +
+                "FROM t_sbdj a\n" +
+                "LEFT JOIN (SELECT she_bei_id_ FROM t_sbwxsqb WHERE shi_fou_guo_shen_='已完成') b ON a.id_ = b.she_bei_id_\n" +
+                "LEFT JOIN ibps_party_entity e ON a.bian_zhi_bu_men_ = e.id_\n" +
+                "where a.di_dian_='%s' GROUP BY a.id_ ";
         sql = String.format(sql,getDiDian());
         List<Map<String,Object>> list = (List<Map<String, Object>>) commonDao.query(sql);
         List<List<String>> equipList = new ArrayList<>();
         if (BeanUtils.isNotEmpty(list)){
             for (Map<String,Object> map : list){
                 List<String> str = new ArrayList<>();
-                str.add(map.get("name_").toString());
-                str.add(map.get("she_bei_ming_chen").toString());
-                str.add(map.get("she_bei_bian_hao_").toString());
-                str.add(map.get("chu_li_lei_xing_").toString());
+                str.add(map.get("id_").toString());
+                str.add(map.get("repair_times").toString());
+                str.add(map.get("bian_zhi_bu_men_")==null?"":map.get("bian_zhi_bu_men_").toString());
+                str.add(map.get("yuan_she_bei_bian")==null?"":map.get("yuan_she_bei_bian").toString());
+                str.add(map.get("name_")==null?"":map.get("name_").toString());
+                str.add(map.get("she_bei_ming_chen")==null?"":map.get("she_bei_ming_chen").toString());
+                str.add(map.get("she_bei_bian_hao_")==null?"":map.get("she_bei_bian_hao_").toString());
+                str.add(map.get("she_bei_zhuang_ta")==null?"":map.get("she_bei_zhuang_ta").toString());
                 equipList.add(str);
             }
         }