合并代码提交
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.njcn.harmonic.mapper.PwRStatOrgMapper">
|
||||
<mapper namespace="com.njcn.harmonic.mapper.distribution.PwRStatOrgMapper">
|
||||
|
||||
|
||||
<select id="selectListY" resultType="com.njcn.harmonic.pojo.vo.RStatOrgVO$PwRStatOrgVO">
|
||||
@@ -19,12 +19,6 @@
|
||||
from r_stat_org_y
|
||||
<where>
|
||||
data_type = #{dataType}
|
||||
<if test="param != null and param.ids != null and param.ids.size > 0">
|
||||
AND measurement_type_class IN
|
||||
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="deptIds != null and deptIds.size > 0">
|
||||
AND org_no IN
|
||||
<foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
|
||||
@@ -55,12 +49,6 @@
|
||||
from r_stat_org_q
|
||||
<where>
|
||||
data_type = #{dataType}
|
||||
<if test="param != null and param.ids != null and param.ids.size > 0">
|
||||
AND measurement_type_class IN
|
||||
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="deptIds != null and deptIds.size > 0">
|
||||
AND org_no IN
|
||||
<foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
|
||||
@@ -91,12 +79,6 @@
|
||||
from r_stat_org_m
|
||||
<where>
|
||||
data_type = #{dataType}
|
||||
<if test="param != null and param.ids != null and param.ids.size > 0">
|
||||
AND measurement_type_class IN
|
||||
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="deptIds != null and deptIds.size > 0">
|
||||
AND org_no IN
|
||||
<foreach collection='deptIds' item='item' index="index" open='(' separator=',' close=')'>
|
||||
|
||||
@@ -26,8 +26,8 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<RStatSubstationOrgVO> getMonthRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
|
||||
/**
|
||||
* 获取月区域稳态指标合格率统计表
|
||||
@@ -35,8 +35,8 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
|
||||
/**
|
||||
* 配网获取月区域稳态指标合格率统计表
|
||||
@@ -44,6 +44,6 @@ public interface RStatOrgMMapper extends BaseMapper<RStatOrgM> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<PwRStatOrgVO> getPwMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<PwRStatOrgVO> getPwMonthRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
}
|
||||
|
||||
@@ -26,8 +26,8 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<RStatSubstationOrgVO> getQuarterRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
|
||||
/**
|
||||
* 主网获取季区域稳态指标合格率统计表
|
||||
@@ -35,8 +35,8 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
|
||||
/**
|
||||
* 配网获取季区域稳态指标合格率统计表
|
||||
@@ -44,6 +44,6 @@ public interface RStatOrgQMapper extends BaseMapper<RStatOrgQ> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<PwRStatOrgVO> getPwQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<PwRStatOrgVO> getPwQuarterRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
}
|
||||
|
||||
@@ -26,8 +26,8 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<RStatSubstationOrgVO> getYearRStatHarmonicOrgInfo(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
|
||||
/**
|
||||
* 主网获取年区域稳态指标合格率统计表
|
||||
@@ -35,8 +35,8 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
|
||||
,@Param("dataType") String dataType);
|
||||
List<RStatOrgIndexVO.RStatOrgIndexInfoVO> getYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
|
||||
/**
|
||||
* 配网获取年区域稳态指标合格率统计表
|
||||
@@ -44,6 +44,6 @@ public interface RStatOrgYMapper extends BaseMapper<RStatOrgY> {
|
||||
* @param dataType
|
||||
* @return
|
||||
*/
|
||||
List<PwRStatOrgVO> getPwYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param
|
||||
, @Param("dataType") String dataType);
|
||||
List<PwRStatOrgVO> getPwYearRStatOrgIndex(@Param("param") StatSubstationBizBaseParam param,
|
||||
@Param("dataType") String dataType);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user