设备月报 优化

@@ -11,6 +11,7 @@ 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.biz.IBusinessService;
 import com.skua.modules.common.service.ICommonSqlService;
 import com.skua.modules.equipment.service.IEquipmentAnalysisService;
 import com.skua.modules.equipment.service.IEquipmentMaintainTaskService;
@@ -56,6 +57,8 @@ public class EquipmentInfoMonthReportController {
     private IBaseService baseService;
     @Autowired
     private IEquipmentAnalysisService equipmentAnalysisService;
+    @Autowired
+    private IBusinessService businessService;
 
     @AutoLog(value = "设备月报-设备管理情况")
     @ApiOperation(value = "设备月报-设备管理情况", notes = "设备月报-设备管理情况")
@@ -315,14 +318,28 @@ public class EquipmentInfoMonthReportController {
         sql += "   left join sys_dict_item di on di.item_value = t.equipment_level where t.install_date  >= '"+startDate+"' and t.install_date <= '"+endDate+"'  group by t.depart_id ";
         sql += " )aaa  on aaa.depart_id = d.id    ";
         sql += " where d.depart_type = 1 ";*/
-        String sql ="select  d.depart_name, aaa.* from (";
-        sql += "   select  t.id 'info_id', t.depart_id ,  t.equipment_name,  t.asset_amount,    di.item_text 'equipment_level'  from equipment_info t  ";
-        sql += "   left join sys_dict_item di on di.item_value = t.equipment_level ";
-        sql += "   where t.create_time  >= '"+startDate+"' and t.create_time <= '"+endDate+"'  ";
-        sql += ")aaa  left join sys_depart d on aaa.depart_id = d.id     ";
-        if(StringUtils.isNotEmpty(departIds)){
-            sql += "  and aaa.depart_id in ("+ JSUtils.quoteEach(departIds,",") +") ";
+//        String sql ="select  d.depart_name, aaa.* from (";
+//        sql += "   select  t.id 'info_id', t.depart_id ,  t.equipment_name,  t.asset_amount,    di.item_text 'equipment_level'  from equipment_info t  ";
+//        sql += "   left join sys_dict_item di on di.item_value = t.equipment_level ";
+//        sql += "   where t.create_time  >= '"+startDate+"' and t.create_time <= '"+endDate+"'  ";
+//        sql += ")aaa  left join sys_depart d on aaa.depart_id = d.id     ";
+//        if(StringUtils.isNotEmpty(departIds)){
+//            sql += "  and aaa.depart_id in ("+ JSUtils.quoteEach(departIds,",") +") ";
+//        }
+        String inDepartIds = Arrays.stream(departIds.split(",")).map(item -> "'" + item + "'").collect(Collectors.joining(","));
+        String sql = " select equipment_id from (select  emp.maintenance_type , emt.results_enforcement, emt.depart_id, emt.equipment_id   from equipment_maintain_task  emt left join equipment_maintain_plan emp  on   emt.plan_id = emp.id  ";
+        sql += " where emt.maintain_time >= '"+startDate+" 00:00:00' and emt.maintain_time <='"+endDate+" 23:59:59'   ) aaa  where aaa.results_enforcement >2  and aaa.maintenance_type = 'dxjg' and aaa.depart_id in (" + inDepartIds + ")";
+        sql = "select * from equipment_info where id in (" + sql + ") and id is not null";
+        List<Map<String, Object>> queryMapList0 = commonSqlService.queryForList(sql);
+        // 翻译
+        Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
+        Map<String, String> equipmentLevelDictMap = businessService.dictMap("equipment-equipment_level", null);
+        for (Map<String, Object> item: queryMapList0) {
+            String departId = ConvertUtils.getString(item.get("depart_id"));
+            String equipmentLevel = ConvertUtils.getString(item.get("equipment_level"));
+            item.put("depart_name", sysDepartDictMap.get(departId));
+            item.put("equipment_level", equipmentLevelDictMap.get(equipmentLevel));
         }
-        return commonSqlService.queryForList(sql);
+        return queryMapList0;
     }
 }

@@ -929,7 +929,7 @@
     </select>
     <!--维护维修费用详情 -->
     <select id="getContrastCostDetails" resultType="java.util.Map">
-        select d.id depart_id , d.depart_name ,ifnull(aaa.maintainCost,0) maintainCost,ifnull(bbb.repairCost,0) repairCost from sys_depart  d
+        select d.id depart_id , d.depart_name ,round(ifnull(aaa.maintainCost,0) / 10000, 2) maintainCost,round(ifnull(bbb.repairCost,0) / 10000, 2) repairCost from sys_depart  d
         left join (
           SELECT emt.depart_id ,  IFNULL(sum(emt.maintenance_cost),0) maintainCost
               FROM  equipment_maintain_task emt

@@ -1052,8 +1052,8 @@ public class ProductionEquipmentServiceImpl implements IProductionEquipmentServi
         contrastCost.forEach(c -> {
             ContrastVO contrastVO = new ContrastVO();
             String month = c.get("month").toString();
-            String maintainCost = c.get("maintainCost").toString();
-            String repairCost = c.get("repairCost").toString();
+            String maintainCost = DigitalUtils.nPoint(ConvertUtils.getDouble(c.get("maintainCost"), 0) / 10000, 2);
+            String repairCost = DigitalUtils.nPoint(ConvertUtils.getDouble(c.get("repairCost"), 2) / 10000, 2);
             contrastVO.setMonth(month);
             contrastVO.setMaintainNum(maintainCost);
             contrastVO.setRepairNum(repairCost);