本年度蓄电池优劣分析修改

lxw

2023-07-25 60edae5480e2a2ecfb0a49c032155e973e59a5f3

本年度蓄电池优劣分析修改

 src/main/resources/mapper/BattInfMapper.xml

@@ -621,18 +621,21 @@
        SELECT count(DISTINCT BattGroupId)
        from db_batt_testdata.tb_batttestdata_inf
        where test_type = 3
          and test_starttype = 3
          and BattGroupId in (select distinct db_battinf.tb_battinf.BattGroupId
                              from db_battinf.tb_battinf,
                                   db_user.tb_user_battgroup_baojigroup_battgroup,
                                   db_user.tb_user_battgroup_baojigroup_usr,
                                   db_user.tb_user_inf
                              where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId =
                                    db_battinf.tb_battinf.BattGroupId
                                and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id =
                                    db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
                                and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid
                                and db_user.tb_user_inf.uid = #{userId})
            and test_starttype = 3
            and YEAR (
            test_starttime) = YEAR (NOW())
          and BattGroupId in (
        select distinct db_battinf.tb_battinf.BattGroupId
        from db_battinf.tb_battinf,
            db_user.tb_user_battgroup_baojigroup_battgroup,
            db_user.tb_user_battgroup_baojigroup_usr,
            db_user.tb_user_inf
        where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId =
            db_battinf.tb_battinf.BattGroupId
          and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id =
            db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
          and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid
          and db_user.tb_user_inf.uid = #{userId})
    </select>

</mapper>

 src/main/resources/mapper/BatttestdataInfMapper.xml

@@ -538,18 +538,20 @@
    where tb_batttestdata_inf.BattGroupId = tb_battinf.BattGroupId
      and test_starttype = 3
      and test_type = 3
      and YEAR (
      test_starttime) = YEAR (NOW())
      and tb_batttestdata_inf.battgroupid in (
      select distinct db_battinf.tb_battinf.BattGroupId
      from db_battinf.tb_battinf,
           db_user.tb_user_battgroup_baojigroup_battgroup,
           db_user.tb_user_battgroup_baojigroup_usr,
           db_user.tb_user_inf
      where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId =
            db_battinf.tb_battinf.BattGroupId
        and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id =
            db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
        and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid
        and db_user.tb_user_inf.uid = #{userId})
    select distinct db_battinf.tb_battinf.BattGroupId
    from db_battinf.tb_battinf,
      db_user.tb_user_battgroup_baojigroup_battgroup,
      db_user.tb_user_battgroup_baojigroup_usr,
      db_user.tb_user_inf
    where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId =
      db_battinf.tb_battinf.BattGroupId
      and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id =
      db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
      and db_user.tb_user_inf.uid = db_user.tb_user_battgroup_baojigroup_usr.uid
      and db_user.tb_user_inf.uid = #{userId})
    ORDER BY tb_batttestdata_inf.BattGroupId asc, test_starttime desc
  </select>
</mapper>