维修月报 优化

@@ -9,8 +9,10 @@ import com.skua.common.constant.BusinessConstant;
 import com.skua.core.api.vo.Result;
 import com.skua.core.aspect.annotation.AutoLog;
 import com.skua.core.context.BaseContextHandler;
+import com.skua.core.util.ConvertUtils;
 import com.skua.modules.base.service.IBaseService;
 import com.skua.modules.common.service.ICommonSqlService;
+import com.skua.modules.equipment.service.IEquipmentAnalysisService;
 import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
 import com.skua.modules.equipment.service.IEquipmentRepairService;
 import com.skua.modules.equipment.vo.EquipmentMaintainRepairReportVO;
@@ -19,6 +21,7 @@ import com.skua.modules.equipment.vo.EquipmentRepairForm;
 import com.skua.modules.system.entity.SysDepart;
 import com.skua.modules.system.service.ISysDepartService;
 import com.skua.tool.dfs.CaseWhen;
+import com.skua.tool.util.DigitalUtils;
 import com.skua.tool.util.JSUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -50,6 +53,8 @@ public class EquipmentInfoMonthReportController {
     private IEquipmentRepairService equipmentRepairService;
     @Autowired
     private IBaseService baseService;
+    @Autowired
+    private IEquipmentAnalysisService equipmentAnalysisService;
 
     @AutoLog(value = "设备月报-设备管理情况")
     @ApiOperation(value = "设备月报-设备管理情况", notes = "设备月报-设备管理情况")
@@ -243,7 +248,7 @@ public class EquipmentInfoMonthReportController {
         sql += "  left join (select t.depart_id  , (sum(t.plan_cost)/10000) 'plan_cost' from equipment_maintain_plan t where t.release_status = '1' and t.start_time >= '"+startDate+" 00:00:00' and t.end_time <='"+endDate+" 23:59:59'  group by t.depart_id   )bbb on bbb.depart_id = d.id ";
         sql += "  left join ( select  depart_id, (ifnull(sum(total_cost),0)/10000) 'repair_cost'  from equipment_repair where reality_maintenance_end_time >= '"+startDate+" 00:00:00' and reality_maintenance_end_time <='"+endDate+" 23:59:59' group by depart_id ) ccc  on ccc.depart_id  = d.id  ";
         sql += " left join (select  depart_id,count(1) 'repair_form_total_count'  from equipment_repair  where   repair_date >= '"+startDate+" 00:00:00' and repair_date <='"+endDate+" 23:59:59' group by depart_id ) ddd  on ddd.depart_id  = d.id  ";
-        sql += " left join ( select  depart_id,count(1) 'repair_form_complete_count' from equipment_repair where  finish_flag in ('ywx','yys') and  reality_maintenance_end_time >= '"+startDate+" 00:00:00' and reality_maintenance_end_time <='"+endDate+" 23:59:59' group by depart_id ) eee  on eee.depart_id  = d.id ";
+        sql += " left join ( select  depart_id,count(1) 'repair_form_complete_count' from equipment_repair where  finish_flag in ('ywx','yys') and  repair_date >= '"+startDate+" 00:00:00' and repair_date <='"+endDate+" 23:59:59' group by depart_id ) eee  on eee.depart_id  = d.id ";
         sql += " left join (select  depart_id,count(1) 'complete_count' from inspection_task  where task_state = '2' and  task_start_time >= '"+startDate+" 00:00:00' and task_end_time <='"+endDate+" 23:59:59'  group by depart_id ) fff  on fff.depart_id  = d.id  ";
         sql += " left join (select  depart_id,count(1) 'total_count' from inspection_task  where  task_start_time >= '"+startDate+" 00:00:00' and task_end_time <='"+endDate+" 23:59:59'  group by depart_id ) ggg  on ggg.depart_id  = d.id  ";
         sql += " where d.depart_type = 1 ";
@@ -251,8 +256,22 @@ public class EquipmentInfoMonthReportController {
             sql += "  and d.id in ("+ JSUtils.quoteEach(departIds,",") +") ";
         }
         sql += "  order by aaa.intact desc ";
-        sql += "  ) TTT where (TTT.intact+TTT.plan_cost+TTT.repair_cost+TTT.repair_form_complete_rate+TTT.repair_form_complete_count+TTT.inspection_complete_rate)>0";
-        return commonSqlService.queryForList(sql);
+        sql += "  ) TTT where (TTT.intact+TTT.plan_cost+TTT.repair_cost+TTT.repair_form_complete_rate+TTT.repair_form_complete_count+TTT.inspection_complete_rate)>=0";
+        List<Map<String, Object>> queryMapList0 = commonSqlService.queryForList(sql);
+        List<Map<String, Object>> intactRateMapList = equipmentAnalysisService.equipmentInTactRateByDepart(new HashMap<String, Object>(){{
+            put("startTime", startDate + BusinessConstant.startTimeSuffix);
+            put("endTime", endDate + BusinessConstant.endTimeSuffix);
+            put("departId", departIds);
+        }});
+        for (Map<String, Object> item: queryMapList0) {
+            for (Map<String, Object> intactRateMap: intactRateMapList) {
+                if (item.get("depart_id").equals(intactRateMap.get("departId"))) {
+                    item.put("intact", DigitalUtils.nPoint(ConvertUtils.getDouble(intactRateMap.get("intactRate"), 0) * 100, 2));
+                    break;
+                }
+            }
+        }
+        return queryMapList0;
     }
     //2 设备大修、更新开展情况
     private List<Map<String,Object>> equipmentMaintainList(String departIds,String startDate,String endDate){