Merge branch 'wyl' into 'main'

fix bug

See merge request !27

src/main/java/com/cardiff/client_project/mapper/SuperAdminMapper.java

@@ -130,31 +130,85 @@ public class SuperAdminMapper {
     public List update(Object o) {
         if(o instanceof CommonAdmin){
             CommonAdmin commonAdmin=(CommonAdmin)o;
-            String sql = "UPDATE common_admin SET name = ?, email = ? , status = ? ,phone=? WHERE id = ?";
-            jdbcTemplate.update(sql, preparedStatement -> {
-                preparedStatement.setString(1, commonAdmin.getName());
-                preparedStatement.setString(2, commonAdmin.getEmail());
-                preparedStatement.setInt(3, commonAdmin.getStatus());
-                preparedStatement.setString(4,commonAdmin.getPhone());
-                preparedStatement.setInt(5, commonAdmin.getId());
-            });
+            StringBuilder sql = new StringBuilder("UPDATE common_admin SET ");
+            List<Object> params = new ArrayList<>();
+
+            if (commonAdmin.getName() != null && !commonAdmin.getName().isEmpty()) {
+                sql.append("name = ?, ");
+                params.add(commonAdmin.getName());
+            }
+
+            if (commonAdmin.getEmail() != null && !commonAdmin.getEmail().isEmpty()) {
+                sql.append("email = ?, ");
+                params.add(commonAdmin.getEmail());
+            }
+
+            if (commonAdmin.getPhone() != null && !commonAdmin.getPhone().isEmpty()) {
+                sql.append("phone = ?, ");
+                params.add(commonAdmin.getPhone());
+            }
+            if (Integer.valueOf(commonAdmin.getStatus())!=null) {
+                sql.append("status = ?, ");
+                params.add(commonAdmin.getStatus());
+            }
+            // Remove the last comma and space
+            sql.setLength(sql.length() - 2);
+
+            // Add the WHERE clause
+            sql.append(" WHERE id = ?");
+            params.add(commonAdmin.getId());
+
+            jdbcTemplate.update(sql.toString(), params.toArray());
+
             List<AdminVO> adminVOS = selectAllAdmin();
             return adminVOS;
+
         }
         if(o instanceof Hospital){
             Hospital hospital = (Hospital) o;
-            String sql = "UPDATE hospital SET name = ?, phone = ? , address = ?, maxAmount = ?, amountPatient = ?, status = ? WHERE id = ?";
-            jdbcTemplate.update(sql, preparedStatement -> {
-                preparedStatement.setString(1, hospital.getName());
-                preparedStatement.setString(2, hospital.getPhone());
-                preparedStatement.setString(3, hospital.getAddress());
-                preparedStatement.setInt(4,hospital.getMaxAmount());
-                preparedStatement.setInt(5, hospital.getAmountPatient());
-                preparedStatement.setInt(6, hospital.getStatus());
-                preparedStatement.setInt(7, hospital.getId());
-            });
+            StringBuilder sql = new StringBuilder("UPDATE hospital SET ");
+            List<Object> params = new ArrayList<>();
+
+            if (hospital.getName() != null && !hospital.getName().isEmpty()) {
+                sql.append("name = ?, ");
+                params.add(hospital.getName());
+            }
+
+            if (hospital.getPhone() != null && !hospital.getPhone().isEmpty()) {
+                sql.append("phone = ?, ");
+                params.add(hospital.getPhone());
+            }
+
+            if (Integer.valueOf(hospital.getStatus()) != null) {
+                sql.append("status = ?, ");
+                params.add(hospital.getStatus());
+            }
+
+            if (hospital.getAddress() != null && !hospital.getAddress().isEmpty()) {
+                sql.append("address = ?, ");
+                params.add(hospital.getAddress());
+            }
+
+            if ((Integer.valueOf(hospital.getMaxAmount()) != null)){
+                sql.append("maxAmount = ?, ");
+                params.add(hospital.getMaxAmount());
+            }
+
+            if (Integer.valueOf(hospital.getAmountPatient()) != null) {
+                sql.append("amountPatient = ?, ");
+                params.add(hospital.getAmountPatient());
+            }
+
+
+            sql.setLength(sql.length() - 2);
+            sql.append(" WHERE id = ?");
+            params.add(hospital.getId());
+
+            jdbcTemplate.update(sql.toString(), params.toArray());
+
             List<Hospital> hospitals = selectAllHospital();
             return hospitals;
+
         }
         return null;
     }
@@ -167,7 +221,7 @@ public class SuperAdminMapper {
      * @return
      */
     public List<SelectVO> selectByItem(SelectDTO selectDTO) {
-
+        System.out.println("test:"+selectDTO);
         // Get query type
         String type = selectDTO.getType();
         // Build the basic SQL and parameter list
@@ -196,9 +250,12 @@ public class SuperAdminMapper {
             sql.append(" AND address LIKE ?");
             params.add("%" + selectDTO.getAddress() + "%");
         }
-        //default status=1
-        sql.append(" AND status LIKE ?");
-        params.add("%" + selectDTO.getStatus() + "%");
+        if (Integer.valueOf(selectDTO.getStatus())!=null) {
+            sql.append(" AND status = ?, ");
+            params.add(selectDTO.getStatus());
+        }
+        sql.setLength(sql.length() - 2);
+
         System.out.println("sql: "+sql.toString());
         List<SelectVO> query = jdbcTemplate.query(sql.toString(), params.toArray(), new BeanPropertyRowMapper<>(SelectVO.class));
         System.out.println("quert"+query);

src/main/resources/templates/mainHospitalView.html

@@ -96,7 +96,7 @@
                 console.log(data)
                 if(data.code==1){
                     updateTable(data.data)
-                    location.reload()
+                    //location.reload()
                 }else {
                     alert(data.msg)
                 }
@@ -148,10 +148,14 @@
     //use jQuery's load() to load content dynamically,Events cannot be bound in dom mode
     $(document).on("click", "#searchButton", function () {
         let status=document.getElementById("searchStatus").value;
+
         if(status==="active"){
             status=1;
-        }else {
+        }
+        else if(status==="inactive"){
             status=0;
+        }else {
+            status=1;
         }
 
         var data={
@@ -171,7 +175,7 @@
 
                 if(data.code!=0){
                     updateTable(data.data);
-                    location.reload()
+                   // location.reload()
                 }else {
                     alert(data.msg)
                 }
@@ -186,13 +190,14 @@
         // create new table
         data.forEach(row => {
             const tr = `
-            <tr th:data-id="${row.id}"
-            th:data-name="${row.name}"
-            th:data-phone="${row.phone}"
-            th:data-address="${row.address}"
-            th:data-max-amount="${row.maxAmount}"
-            th:data-amount-patient="${row.amountPatient}"
-            th:data-status="${row.status_str}">
+            <tr
+            data-id="${row.id}"
+            data-name="${row.name}"
+            data-phone="${row.phone}"
+            data-address="${row.address}"
+            data-max-amount="${row.maxAmount}"
+            data-amount-patient="${row.amountPatient}"
+            data-status="${row.status_str}">
                 <td>${row.id}</td>
                 <td>${row.name}</td>
                 <td>${row.phone}</td>

src/main/resources/templates/mainSupAdminView.html

@@ -59,11 +59,10 @@
 <script th:inline="javascript">
     $(document).on("click","#freeze",function (){
         const row = $(this).closest('tr');
-        console.log(row.data('id'))
-        var status;
+        let status;
         if(row.data('status')==="ACTIVE"){
             status=0;
-        }else {
+        }else if(row.data('status')==="INACTIVE"){
             status=1
         }
         var data={
@@ -84,10 +83,11 @@
                 console.log(data)
                 if(data.code==1){
                     updateTable(data.data)
-                    location.reload()
+                   //location.reload()
                 }else {
                     alert(data.msg)
                 }
+                location.reload()
             },
 
         });
@@ -127,10 +127,14 @@
         let status=document.getElementById("searchStatus").value;
         if(status==="active"){
             status=1;
-        }else {
+        }
+        else if(status==="inactive"){
             status=0;
+        }else {
+            status=1;
         }
 
+
         var data={
             'name':document.getElementById("searchName").value,
             'phone':document.getElementById("searchPhone").value,
@@ -147,7 +151,7 @@
 
                 if(data.code!=0){
                     updateTable(data.data);
-                    location.reload()
+                   //location.reload()
                 }else {
                     alert(data.msg)
                 }
@@ -158,15 +162,14 @@
     function updateTable(data) {
         let tbody = $("table tbody"); // choose table's tbody
         tbody.empty(); // clean old data
-
         // create new table
         data.forEach(row => {
             const tr = `
             <tr data-id="${row.id}"
-            th:data-name="${row['name']}"
-            th:data-phone="${row['phone']}"
-            th:data-email="${row['email']}"
-            th:data-status="${row['status_str']}">
+            data-name="${row['name']}"
+            data-phone="${row['phone']}"
+            data-email="${row['email']}"
+            data-status="${row['status_str']}">
                 <td>${row.id}</td>
                 <td>${row.name}</td>
                 <td>${row.phone}</td>