treshenkov/credit_tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return active packages only with on_monitoring status

Browse source
This commit is contained in:
Mikhail Trofimov 2025-06-27 13:14:36 +03:00
parent 6e5350b6ab
commit 72f7f6e2ac
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/nbch/credit_tracker/mapper/signal/SignalMapper.java
View file

@ -36,7 +36,7 @@ public interface SignalMapper {
PackageData findPackageData(@Param("id") Integer id); PackageData findPackageData(@Param("id") Integer id);
List<PackageData> findPackageDataList(@Param("userId") String userId); List<PackageData> findPackageDataList(@Param("userId") String userId, @Param("status") String status);
List<PackageData> findPackagesByStatus(@Param("status") String status); List<PackageData> findPackagesByStatus(@Param("status") String status);

2
src/main/java/ru/nbch/credit_tracker/service/SignalService.java
View file

@ -152,7 +152,7 @@ public class SignalService {
activePackages.setStatus("OK"); activePackages.setStatus("OK");
activePackages.setMembercode(memberCode); activePackages.setMembercode(memberCode);
Packages packages = new Packages(); Packages packages = new Packages();
mapper.findPackageDataList(memberCode).forEach(data -> { mapper.findPackageDataList(memberCode, Status.ON_MONITORING.name()).forEach(data -> {
Package pack = new Package(); Package pack = new Package();
pack.setPackageName(data.getPackageName()); pack.setPackageName(data.getPackageName());
pack.setCreatedAt(data.getCreatedAt() != null ? data.getCreatedAt().toString() : null); pack.setCreatedAt(data.getCreatedAt() != null ? data.getCreatedAt().toString() : null);

2
src/main/resources/mybatis/mapper/signal/SignalMapper.xml
View file

@ -109,7 +109,7 @@
<select id="findPackageDataList" resultMap="packageDataResultMap" resultType="ru.nbch.credit_tracker.entities.dto.PackageData"> <select id="findPackageDataList" resultMap="packageDataResultMap" resultType="ru.nbch.credit_tracker.entities.dto.PackageData">
SELECT package_name, created_at SELECT package_name, created_at
FROM signals_user_packages FROM signals_user_packages
WHERE membercode IS NOT NULL AND LEFT(membercode, 6) = #{userId} WHERE membercode IS NOT NULL AND LEFT(membercode, 6) = #{userId} AND status = #{status}
</select> </select>
<select id="findPackagesByStatus" resultMap="packageDataResultMap" resultType="ru.nbch.credit_tracker.entities.dto.PackageData"> <select id="findPackagesByStatus" resultMap="packageDataResultMap" resultType="ru.nbch.credit_tracker.entities.dto.PackageData">