报表

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/service/impl/ResumptionReportServiceImpl.java

@@ -303,6 +303,9 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
         //判断机构类型,如果机构类型大于行社，都展示行社数据
         SysOrg sysOrg = orgService.selectSysOrgById(resumptionDTO.getOrgId(), SecurityConstants.INNER);
         List<SysOrg> sysOrgs;
+        if (null == sysOrg.getType()) {
+            return Collections.emptyList();
+        }
         if (sysOrg.getType() < 3 || sysOrg.getShortName().endsWith("地区行社") || sysOrg.getType() == 9) {
             sysOrgs = orgService.selectSysOrgByPathAndType(sysOrg.getPath(), 3, SecurityConstants.INNER);
         } else if (sysOrg.getType() == 3) {
@@ -321,16 +324,16 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
             }
             IntrusionTestReportVO intrusionTestReportVO1 = resumptionReportMapper.selectStandbyPower(resumptionDTO.getStartTime(), resumptionDTO.getEndTime(), o.getPath());
             BeanUtils.copyProperties(intrusionTestReportVO1, intrusionTestReportVO);
-          //隐患
+            //隐患
             Map map = resumptionReportMapper.selectStandbyPowerAbnormalNumber(resumptionDTO.getStartTime(), resumptionDTO.getEndTime(), o.getPath());
             Object abnormalNumber = map.get("abnormalNumber");
-            intrusionTestReportVO1.setAbnormalNumber(Integer.valueOf(abnormalNumber.toString()));
+            intrusionTestReportVO.setAbnormalNumber(Integer.valueOf(abnormalNumber.toString()));
 
             Object realityRectificationNumber = map.get("realityRectificationNumber");
-            intrusionTestReportVO1.setRealityRectificationNumber(Integer.valueOf(realityRectificationNumber.toString()));
+            intrusionTestReportVO.setRealityRectificationNumber(Integer.valueOf(realityRectificationNumber.toString()));
 
             Object realityRectificationRate = map.get("realityRectificationRate");
-            intrusionTestReportVO1.setRealityRectificationRate(realityRectificationRate.toString());
+            intrusionTestReportVO.setRealityRectificationRate(realityRectificationRate.toString());
             intrusionTestReportVO.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             intrusionTestReportVO.setOrgName(o.getShortName());
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(o.getPath());

soc-modules/soc-modules-core/src/main/resources/mapper/reportForms/ResumptionReportMapper.xml

@@ -105,10 +105,6 @@
     <select id="selectStandbyPower"
             resultType="com.xunmei.core.reportForms.resumption.vo.IntrusionTestReportVO">
         SELECT
-        IFNULL( SUM( IF ( c.confirm_status >= 2 AND c.reform_status IN ( 10, 11 ), 1, 0 ) ), 0 ) AS abnormalNumber,
-        IFNULL( SUM( IF ( c.reform_status = 11, 1, 0 )), 0 ) AS realityRectificationNumber,
-
-       /* IFNULL( a.exception_count, 0 ) AS abnormalNumber,*/
         COUNT( a.id ) AS planNumber,
         IFNULL( SUM( IF ( a.`status` = 3, 1, 0 )), 0 ) AS realityNumber,
         IF