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 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 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" + order by t.num desc