From 36940d21767bad1540bd948a2b99c55f60180868 Mon Sep 17 00:00:00 2001
From: kelvinsuen <kelvin.suen@2fi-solutions.com.hk>
Date: Thu, 31 Jul 2025 17:42:38 +0800
Subject: [PATCH] add client code add pdf version update user group sql

---
 .../lioner/client/service/ClientService.java  | 33 ++++++++++---------
 .../lioner/client/web/ClientController.java   |  2 +-
 .../lioner/pdf/service/PdfService.java        |  3 +-
 .../12_update_group/01_update_group.sql       |  5 +++
 4 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 src/main/resources/db/changelog/changes/12_update_group/01_update_group.sql

diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
index 4ba3b33..fa72062 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
@@ -255,19 +255,20 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
 
 	public List<Map<String,Object>> list(Map<String, Object> args){
 			StringBuilder sql = new StringBuilder("SELECT"
-				+ " id "
-				+ " , fullname "
-				+ " , lastname "
-				+ " , firstname "
-				+ " , title "
-				+ " , email "
-				+ " , phone1 "
-				+ " , phone2 "
-				+ " , remarks "
-				+ " , created "
-				+ " , dob "
-				+ " , caseManagerId "
-				+ " , consultantId "
+				+ " id, "
+				+ " clientCode, "
+				+ " fullname, "
+				+ " lastname, "
+				+ " firstname, "
+				+ " title, "
+				+ " email, "
+				+ " phone1, "
+				+ " phone2, "
+				+ " remarks, "
+				+ " created, "
+				+ " dob, "
+				+ " caseManagerId, "
+				+ " consultantId "
 				+ " FROM client "
 				+ " WHERE deleted = FALSE "
 			// StringBuilder sql = new StringBuilder("SELECT"
@@ -287,8 +288,8 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
 		);
 
 		if (args != null) {
-			if (args.containsKey("fullname")) 
-				sql.append(" AND fullname LIKE :fullname ");
+			if (args.containsKey("clientCode")) 
+				sql.append(" AND clientCode LIKE :clientCode ");
 			if (args.containsKey("lastname")) 
 				sql.append(" AND lastname LIKE :lastname ");
 			if (args.containsKey("firstname")) 
@@ -1026,7 +1027,7 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
 		int year = LocalDate.now().getYear();
 
         String sql = "select "
-            + " COUNT(1) "
+            + " COUNT(1) + 1 "
             + " FROM client "         
 			+ " WHERE YEAR(created) = :year "            
         ;
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java b/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java
index 9849056..399e820 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/client/web/ClientController.java
@@ -82,7 +82,7 @@ public class ClientController{
 	public RecordsRes<Map<String, Object>> list(HttpServletRequest request) throws ServletRequestBindingException {
 		return new RecordsRes<>(clientService.list(
 				CriteriaArgsBuilder.withRequest(request)
-						.addStringLike("fullname")
+						.addStringLike("clientCode")
                         .addStringLike("lastname")
                         .addStringLike("firstname")
                         // .addStringLike("title")
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index 26b15f4..f0d5619 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -687,7 +687,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 			+ " templateId, "
 			+ " fileId, "
 			+ " created, "
-			+ " modified "
+			+ " modified, "
+			+ " version "
 			+ " FROM filled_form "
 			+ " WHERE deleted = FALSE "
 		);
diff --git a/src/main/resources/db/changelog/changes/12_update_group/01_update_group.sql b/src/main/resources/db/changelog/changes/12_update_group/01_update_group.sql
new file mode 100644
index 0000000..302adeb
--- /dev/null
+++ b/src/main/resources/db/changelog/changes/12_update_group/01_update_group.sql
@@ -0,0 +1,5 @@
+--liquibase formatted sql
+
+--changeset kelvin:update group
+
+UPDATE `lionerdb`.`group` SET `name` = 'Case Manager', `description` = 'Case Manager Group' WHERE (`name` = 'Case Officer');
\ No newline at end of file