From 27847fe835eb3fd09ce7d02f3aab5c226fa1e760 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Fri, 30 May 2025 15:00:18 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEnforcementRegistrationController.java        | 12 +++++++++++-
 .../mapper/EnforcementRegistrationMapper.xml         |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
index d30b1400..9ffe6a01 100644
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnforcementRegistrationController.java
@@ -18,6 +18,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
@@ -196,9 +197,18 @@ public class AppEnforcementRegistrationController extends BaseController
             UserBean userByUserId = userApi.getUserByUserId(enforcementRegistration.getUserId());
             enforcementRegistration.setDeptId(userByUserId == null ? null : userByUserId.getDeptId());
         }
+        //查询检查总次数
+        List<EnforcementRegistration> registrations = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
+        int count = 0;
+        if (registrations.size() >0) {
+            count = registrations.stream().map(item -> Integer.valueOf(item.getNum())).reduce(0, Integer::sum);
+        }
+        //查询列表
         startPage();
         List<EnforcementRegistration> list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration);
-        return getDataTable(list);
+        TableDataInfo dataTable = getDataTable(list);
+        dataTable.setMsg(count);
+        return dataTable;
     }
 
     @GetMapping("/queryByEpId")
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
index 229ddbe8..64065844 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml
@@ -242,6 +242,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--            and t.bureau_dept_id = #{deptId} or find_in_set(#{deptId}, d.ancestors)-->
 <!--          </if>-->
        </where>
+       order by t.num desc
     </select>
 
     <select id="selectEnforcementRegistrationByEpId" parameterType="EnforcementRegistration" resultMap="EnforcementRegistrationResult">