From d36b5e01b1a4215010e44fa61e68394a019c8462 Mon Sep 17 00:00:00 2001 From: "Mac\\David" Date: Thu, 25 Apr 2024 12:17:20 +0800 Subject: [PATCH] update dashboard service --- .../com/ffii/tsms/modules/data/service/DashboardService.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt index e10b29c..56e5e4a 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt @@ -36,10 +36,12 @@ open class DashboardService( + " s.address as subsidiaryAddress," + " s.district as subsidiaryDistrict," + " s.brNo as subsidiaryBrNo," - + " s.typeId as subsidiaryTypeId" + + " s.typeId as subsidiaryTypeId," + + " count(p.id) as projectNo" + " from customer c" + " left join customer_subsidiary cs on c.id = cs.customerId" + " left join subsidiary s on cs.subsidiaryId = s.id" + + " left join project p on cs.id = p.customerSubsidiaryId" + " where c.deleted = 0" ) if (args != null) { @@ -48,6 +50,7 @@ open class DashboardService( if (args.containsKey("customerCode")) sql.append(" AND c.code = :customerCode"); } + sql.append(" group by c.id, c.name, c.code, c.address, c.district, c.brNo, c.typeId, s.id, s.name, s.code, s.address, s.district, s.brNo, s.typeId"); return jdbcDao.queryForList(sql.toString(), args) } }