报表

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/monitor/service/impl/MonitorAccessReportServiceImpl.java

@@ -92,6 +92,10 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
 
     @Override
     public List<MonitoringAccessVO> selectAll(MonitoringAccessDTO monitoringAccessDTO) {
+        if (monitoringAccessDTO.getStartDate().endsWith("32")){
+            String[] split = monitoringAccessDTO.getEndDate().split("-");
+            monitoringAccessDTO.setStartDate(split[0]+"-"+split[1] + "-01 00:00:00");
+        }
         monitoringAccessDTO.setStartDate(monitoringAccessDTO.getStartDate() + " 00:00:00");
         monitoringAccessDTO.setEndDate(monitoringAccessDTO.getEndDate() + " 23:59:59");
         if (null == monitoringAccessDTO.getOrgId()) {
@@ -122,7 +126,10 @@ public class MonitorAccessReportServiceImpl implements MonitorAccessReportServic
             monitoringAccessVO.setCity(sysOrg1.getShortName().indexOf("地区行社") == -1 ? sysOrg1.getShortName().substring(0, 2) : sysOrg1.getShortName().split("地区行社")[0]);
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
             monitoringAccessDTO.setOrgPath(s.getPath());
+            Long orgId=monitoringAccessDTO.getOrgId();
+            monitoringAccessDTO.setOrgId(null);
             MonitoringAccessVO monitoringAccessVO1 = monitorAccessReportMapper.selectAll(monitoringAccessDTO);
+            monitoringAccessDTO.setOrgId(orgId);
             String avg = monitorAccessReportMapper.avg(monitoringAccessDTO);
             if (s.getType() == 4) {
                 integer = 1;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/resumption/mapper/ResumptionReportMapper.java

@@ -26,7 +26,7 @@ public interface ResumptionReportMapper {
      */
     Integer planRectification(@Param("taskId") Long taskId);
 
-    IntrusionTestReportVO selectIntrusionTestReport(@Param("date") String date, @Param("orgPath") String orgPath);
+    IntrusionTestReportVO selectIntrusionTestReport(@Param("orgId")Long orgId,@Param("date") String date, @Param("orgPath") String orgPath);
 
     IntrusionTestReportVO selectServiceBankReport(@Param("date") String date, @Param("orgPath") String orgPath);
 

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

@@ -206,11 +206,15 @@ public class ResumptionReportServiceImpl implements ResumptionReportService {
                     sysOrg1 = orgService.selectOrgById(orgService.selectOrgById(orgService.selectOrgById(o.getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER).getParentId(), SecurityConstants.INNER);
                 }
             }
-            IntrusionTestReportVO intrusionTestReportVO1 = resumptionReportMapper.selectIntrusionTestReport(resumptionDTO.getSearchTime(), o.getPath());
+            IntrusionTestReportVO intrusionTestReportVO1 = resumptionReportMapper.selectIntrusionTestReport(null, resumptionDTO.getSearchTime(), o.getPath());
+            Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(o.getPath());
+            if (o.getType() == 4) {
+                integer = 1;
+                intrusionTestReportVO1 = resumptionReportMapper.selectIntrusionTestReport(o.getId(), resumptionDTO.getSearchTime(), null);
+            }
             BeanUtils.copyProperties(intrusionTestReportVO1, intrusionTestReportVO);
             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());
             intrusionTestReportVO.setNetworkNumber(integer);
             intrusionTestReportVOList.add(intrusionTestReportVO);
         });

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/mapper/SafetyInspectMapper.java

@@ -18,9 +18,9 @@ import java.util.Map;
  */
 @Mapper
 public interface SafetyInspectMapper {
-    SafetyInspectVO selectAllByPath(@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType);
+    SafetyInspectVO selectAllByPath(@Param("orgId")Long orgId,@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType);
 
-    SafetyInspectVO selectSelfByPath(@Param("cycle") Integer cycle, @Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType);
+    SafetyInspectVO selectSelfByPath(@Param("orgId")Long orgId,@Param("cycle") Integer cycle, @Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType);
 
     Page<SafetyInspectVO> report(@Param("page") Page<SafetyInspectVO> page, @Param("safetyInspectDTO") SafetyInspectDTO safetyInspectDTO);
 
@@ -31,11 +31,11 @@ public interface SafetyInspectMapper {
      *
      * @return
      */
-    Map orgDimension(@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
+    Map orgDimension(@Param("orgId")Long orgId,@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
 
-    Integer orgDimensionPlanInspectOrg(@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
+    Integer orgDimensionPlanInspectOrg(@Param("orgId")Long orgId,@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
 
-    Integer orgDimensionRealityInspectOrg(@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
+    Integer orgDimensionRealityInspectOrg(@Param("orgId")Long orgId,@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
 
     /**
      * zic隐患维度
@@ -45,5 +45,5 @@ public interface SafetyInspectMapper {
      * @param orgType
      * @return
      */
-    Map pitfallDimension(@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
+    Map pitfallDimension(@Param("orgId")Long orgId,@Param("orgPath") String orgPath, @Param("year") String year, @Param("orgType") Integer orgType, @Param("type") Integer type);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/reportForms/safetyInspect/service/impl/SafetyInspectServiceImpl.java

@@ -69,11 +69,17 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             safetyInspectVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             safetyInspectVO.setOrgName(s.getShortName());
             //次数
-            SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectAllByPath(s.getPath(),safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
+            SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectAllByPath(null,s.getPath(),safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
             //机构维度
-            Map map = safetyInspectMapper.orgDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),4);
-            Integer planInspectOrg = safetyInspectMapper.orgDimensionPlanInspectOrg(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
-            Integer realityInspectOrg = safetyInspectMapper.orgDimensionRealityInspectOrg(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+            Integer planInspectOrg = safetyInspectMapper.orgDimensionPlanInspectOrg(null,s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+            Integer realityInspectOrg = safetyInspectMapper.orgDimensionRealityInspectOrg(null,s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+            Map map1 = safetyInspectMapper.pitfallDimension(null,s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),4);
+            if (s.getType() == 4) {
+                safetyInspectVOS=safetyInspectMapper.selectAllByPath(s.getId(),null,safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType());
+                planInspectOrg=safetyInspectMapper.orgDimensionPlanInspectOrg(s.getId(),s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+                 realityInspectOrg = safetyInspectMapper.orgDimensionRealityInspectOrg(s.getId(),s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(), 4);
+                map1 = safetyInspectMapper.pitfallDimension(s.getId(),null, safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),4);
+            }
             Double i = 0d;
             if (planInspectOrg != 0 && realityInspectOrg != 0) {
                 i = (double) realityInspectOrg / planInspectOrg * 100;
@@ -82,16 +88,12 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
             safetyInspectVO.setRealityInspectOrg(realityInspectOrg);
             safetyInspectVO.setInspectCoverRate(String.format("%.2f", i) + "%");
             safetyInspectVO.setOrgName(s.getShortName());
-            Map map1 = safetyInspectMapper.pitfallDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),4);
-
             safetyInspectVO.setPitfallNumber(Integer.valueOf(map1.get("pitfallNumber").toString()));
             safetyInspectVO.setRectificationNumber(Integer.valueOf(map1.get("rectificationNumber").toString()));
             safetyInspectVO.setRectificationRate(map1.get("rectificationRate").toString());
-
             safetyInspectVO.setPlanInspectNumber(safetyInspectVOS.getPlanInspectNumber());
             safetyInspectVO.setRealityInspectNumber(safetyInspectVOS.getRealityInspectNumber());
             safetyInspectVO.setInspectRate(safetyInspectVOS.getInspectRate());
-          //  safetyInspectVO.setPitfallNumber(safetyInspectVOS.getPitfallNumber());
             safetyInspectVOList.add(safetyInspectVO);
         });
         return safetyInspectVOList;
@@ -128,26 +130,29 @@ public class SafetyInspectServiceImpl implements SafetyInspectService {
                 }
             }
             Integer integer = monitorAccessReportMapper.selectNetworkNumberByPath(s.getPath());
+            //次数
+            SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectSelfByPath(null,safetyInspectDTO.getCycle(),s.getPath(),safetyInspectDTO.getYear(),safetyInspectDTO.getOrgType());
+            Map map1 = safetyInspectMapper.pitfallDimension(null,s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
+            //机构维度
+            Map map = safetyInspectMapper.orgDimension(null,s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
+            if (s.getType()==4){
+                integer=1;
+                safetyInspectVOS=safetyInspectMapper.selectSelfByPath(s.getId(),safetyInspectDTO.getCycle(),null,safetyInspectDTO.getYear(),safetyInspectDTO.getOrgType());
+                map1= safetyInspectMapper.pitfallDimension(s.getId(),null, safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
+                map=safetyInspectMapper.orgDimension(s.getId(),null, safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
+            }
             safetyInspectVO.setPlanInspectOrg(integer);
             safetyInspectVO.setCity(sysOrg1.getShortName().indexOf("地区行社")==-1?sysOrg1.getShortName().substring(0,2):sysOrg1.getShortName().split("地区行社")[0]);
             safetyInspectVO.setOrgName(s.getShortName());
-            //次数
-            SafetyInspectVO safetyInspectVOS = safetyInspectMapper.selectSelfByPath(safetyInspectDTO.getCycle(),s.getPath(),safetyInspectDTO.getYear(),safetyInspectDTO.getOrgType());
-            //机构维度
-            Map map = safetyInspectMapper.orgDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
-          //  safetyInspectVO.setPlanInspectOrg(Integer.valueOf(map.get("planInspectOrg").toString()));
             safetyInspectVO.setRealityInspectOrg(Integer.valueOf(map.get("realityInspectOrg").toString()));
             safetyInspectVO.setInspectCoverRate(map.get("inspectCoverRate").toString());
             safetyInspectVO.setOrgName(s.getShortName());
-            Map map1 = safetyInspectMapper.pitfallDimension(s.getPath(), safetyInspectDTO.getYear(), safetyInspectDTO.getOrgType(),3);
             safetyInspectVO.setPitfallNumber(Integer.valueOf(map1.get("pitfallNumber").toString()));
             safetyInspectVO.setRectificationNumber(Integer.valueOf(map1.get("rectificationNumber").toString()));
             safetyInspectVO.setRectificationRate(map1.get("rectificationRate").toString());
-
             safetyInspectVO.setPlanInspectNumber(safetyInspectVOS.getPlanInspectNumber());
             safetyInspectVO.setRealityInspectNumber(safetyInspectVOS.getRealityInspectNumber());
             safetyInspectVO.setInspectRate(safetyInspectVOS.getInspectRate());
-            //  safetyInspectVO.setPitfallNumber(safetyInspectVOS.getPitfallNumber());
             safetyInspectVOList.add(safetyInspectVO);
         });
         return safetyInspectVOList;

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

@@ -58,8 +58,14 @@
         </if>
 
                 <if test="startDate != null  and endDate != null">
-                    AND a.plan_start_time >= #{startDate} AND a.plan_end_time &lt;= #{endDate}
+
+
+                    and (a.plan_start_time BETWEEN #{startDate}
+                    and #{endDate}
+                    OR a.plan_end_time BETWEEN #{startDate}
+                    and #{endDate})
                 </if>
+
     </select>
     <select id="avg" resultType="java.lang.String">
         SELECT

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

@@ -92,6 +92,9 @@
                 AND reform_status = 11
         WHERE
             b.plan_type =4
+          <if test="orgId !=null">
+              and a.org_id=#{orgId}
+          </if>
         <if test="date !=null">
             AND a.ymd_date like concat(#{date},'%')
         </if>

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

@@ -95,6 +95,9 @@
         WHERE
         a.deleted = 0
         AND c.check_type =4
+          <if test="orgId !=null">
+              and a.org_id=#{orgId}
+          </if>
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>
@@ -122,6 +125,9 @@
         LEFT JOIN sys_org c ON a.org_id = c.id
         WHERE
         a.deleted = 0
+          <if test="orgId !=null">
+              and a.org_id =#{orgId}
+          </if>
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>
@@ -159,6 +165,9 @@
         WHERE
             a.src_type = 2
         AND d.check_type =#{type}
+          <if test="orgId !=null">
+              and a.org_id =#{orgId}
+          </if>
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>
@@ -193,6 +202,9 @@
         WHERE
         a.deleted = 0
         AND c.check_type =3
+          <if test="orgId !=null">
+              and a.org_id =#{orgId}
+          </if>
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>
@@ -213,6 +225,9 @@
         LEFT JOIN sys_org c ON a.org_id = c.id
         WHERE
         a.deleted = 0
+          <if test="orgId !=null">
+              and a.org_id =#{orgId}
+          </if>
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>
@@ -236,6 +251,9 @@
         WHERE
         a.deleted = 0
         AND a.`status` =3
+          <if test="orgId !=null">
+              and a.org_id=#{orgId}
+          </if>
         <if test="orgPath !=null and orgPath !=''">
             and a.org_path like concat(#{orgPath},'%')
         </if>