Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

DELL

3 天以前 d8475b8670b6b4cbcd1bc9e57d30a6f433d206ab

 src/main/resources/mapper/BattInfMapper.xml

@@ -231,6 +231,12 @@
            <if test="stic.product!=null">
                and tb_batt_inf.product=#{stic.product}
            </if>
            <if test="stic.inuseStartTime!=null">
                and tb_batt_inf.inuse_time>=#{stic.inuseStartTime}
            </if>
            <if test="stic.inuseEndTime!=null">
                and tb_batt_inf.inuse_time&lt;=#{stic.inuseEndTimee}
            </if>
            <if test="stic.uid>100">
                and tb_batt_inf.station_id in(
                select distinct station_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
@@ -466,7 +472,7 @@
            </if>
        </where>
    </select>
    <select id="getBattgroupIdList" resultType="com.whyc.pojo.db_station.BattInf">
    <select id="getBattgroupIdInf" resultType="com.whyc.pojo.db_station.BattInf">
        select distinct tb_batt_inf.*
        ,tb_station_inf.station_type,tb_station_inf.station_name,tb_station_inf.provice,tb_station_inf.city,tb_station_inf.country,tb_station_inf.full_name
        from db_station.tb_batt_inf,db_station.tb_station_inf
@@ -476,4 +482,20 @@
        </where>
        limit 1
    </select>
    <select id="getBattgroupIdListByPowerId" resultType="com.whyc.pojo.db_station.BattInf">
        select distinct tb_batt_inf.*
        from db_station.tb_batt_inf
        <where>
             tb_batt_inf.power_id=#{powerId}
        </where>
        order by battgroup_num asc
    </select>
    <select id="getBattgroupIdListByDevId" resultType="com.whyc.pojo.db_station.BattInf">
        select distinct tb_batt_inf.*
        from db_station.tb_batt_inf
        <where>
            tb_batt_inf.dev_id=#{devId}
        </where>
        order by battgroup_num asc
    </select>
</mapper>