优化代码

java110-db/src/main/resources/mapper/report/BaseDataStatisticsServiceDaoImplMapper.xml

@@ -391,6 +391,29 @@
         and t.community_id = #{communityId}
         group by DATE_FORMAT(t.create_time,'%Y-%m-%d')
     </select>
+    <select id="getCommunityInspectionAnalysis" parameterType="Map" resultType="Map">
+        select DATE_FORMAT(t.create_time,'%Y-%m-%d') createTime,count(1) countValue
+        from inspection_task t
+        where 1=1
+        and t.status_cd = '0'
+        and t.state in ('20200406','20200407')
+        and t.create_time &gt; #{startTime}
+        and t.create_time &lt; #{endTime}
+        and t.community_id = #{communityId}
+        group by DATE_FORMAT(t.create_time,'%Y-%m-%d')
+    </select>
+    <select id="getCommunityMaintainanceAnalysis" parameterType="Map" resultType="Map">
+        select DATE_FORMAT(t.create_time,'%Y-%m-%d') createTime,count(1) countValue
+        from maintainance_task t
+        where 1=1
+        and t.status_cd = '0'
+        and t.state in ('20200406','20200407')
+        and t.create_time &gt; #{startTime}
+        and t.create_time &lt; #{endTime}
+        and t.community_id = #{communityId}
+        group by DATE_FORMAT(t.create_time,'%Y-%m-%d')
+    </select>
+
 
 
 

java110-interface/src/main/java/com/java110/intf/report/IBaseDataStatisticsInnerServiceSMO.java

@@ -75,4 +75,10 @@ public interface IBaseDataStatisticsInnerServiceSMO {
 
     @RequestMapping(value = "/getCommunityRepairCountAnalysis", method = RequestMethod.POST)
     List<Map> getCommunityRepairCountAnalysis(@RequestBody Map info);
+
+    @RequestMapping(value = "/getCommunityInspectionAnalysis", method = RequestMethod.POST)
+    List<Map> getCommunityInspectionAnalysis(@RequestBody Map info);
+
+    @RequestMapping(value = "/getCommunityMaintainanceAnalysis", method = RequestMethod.POST)
+    List<Map> getCommunityMaintainanceAnalysis(@RequestBody Map info);
 }

service-report/src/main/java/com/java110/report/cmd/admin/GetCommunityOperationalAnalysisCmd.java

@@ -77,6 +77,16 @@ public class GetCommunityOperationalAnalysisCmd extends Cmd {
         repairData = fillDate(repairData, startTime, endTime);
         data.put("repairData", repairData);
 
+        //todo 查询巡检数据数
+        List<Map> inspectionData = baseDataStatisticsInnerServiceSMOImpl.getCommunityInspectionAnalysis(reqJson);
+        inspectionData = fillDate(inspectionData, startTime, endTime);
+        data.put("inspectionData", inspectionData);
+
+        //todo 查询保养数据数
+        List<Map> maintainanceData = baseDataStatisticsInnerServiceSMOImpl.getCommunityMaintainanceAnalysis(reqJson);
+        maintainanceData = fillDate(maintainanceData, startTime, endTime);
+        data.put("maintainanceData", maintainanceData);
+
         context.setResponseEntity(ResultVo.createResponseEntity(data));
 
     }

service-report/src/main/java/com/java110/report/dao/IBaseDataStatisticsServiceDao.java

@@ -57,4 +57,8 @@ public interface IBaseDataStatisticsServiceDao {
     List<Map> getCommunityFeeDetailCountAnalysis(Map info);
 
     List<Map> getCommunityRepairCountAnalysis(Map info);
+
+    List<Map> getCommunityInspectionAnalysis(Map info);
+
+    List<Map> getCommunityMaintainanceAnalysis(Map info);
 }

service-report/src/main/java/com/java110/report/dao/impl/BaseDataStatisticsServiceDaoImpl.java

@@ -98,4 +98,16 @@ public class BaseDataStatisticsServiceDaoImpl extends BaseServiceDao implements
         List<Map> infos = sqlSessionTemplate.selectList("baseDataStatisticsServiceDaoImpl.getCommunityRepairCountAnalysis", info);
         return infos;
     }
+
+    @Override
+    public List<Map> getCommunityInspectionAnalysis(Map info) {
+        List<Map> infos = sqlSessionTemplate.selectList("baseDataStatisticsServiceDaoImpl.getCommunityInspectionAnalysis", info);
+        return infos;
+    }
+
+    @Override
+    public List<Map> getCommunityMaintainanceAnalysis(Map info) {
+        List<Map> infos = sqlSessionTemplate.selectList("baseDataStatisticsServiceDaoImpl.getCommunityMaintainanceAnalysis", info);
+        return infos;
+    }
 }

service-report/src/main/java/com/java110/report/smo/impl/BaseDataStatisticsInnerServiceSMOImpl.java

@@ -120,4 +120,16 @@ public class BaseDataStatisticsInnerServiceSMOImpl extends BaseServiceSMO implem
         List<Map> infos = baseDataStatisticsServiceDaoImpl.getCommunityRepairCountAnalysis(info);
         return infos;
     }
+
+    @Override
+    public List<Map> getCommunityInspectionAnalysis(@RequestBody Map info) {
+        List<Map> infos = baseDataStatisticsServiceDaoImpl.getCommunityInspectionAnalysis(info);
+        return infos;
+    }
+
+    @Override
+    public List<Map> getCommunityMaintainanceAnalysis(@RequestBody Map info) {
+        List<Map> infos = baseDataStatisticsServiceDaoImpl.getCommunityMaintainanceAnalysis(info);
+        return infos;
+    }
 }