From 74ba827f93c31bf38ed5112c260a1ad88a2024eb Mon Sep 17 00:00:00 2001 From: yanyan Date: Wed, 14 May 2025 20:03:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 29 ++++ .../code/domain/EnforcementRegistration.java | 10 ++ .../mapper/EnforcementRegistrationMapper.java | 4 + .../IEnforcementRegistrationService.java | 4 + .../EnforcementRegistrationServiceImpl.java | 21 +++ .../mapper/EnforcementRegistrationMapper.xml | 137 ++++++++++++++++++ 6 files changed, 205 insertions(+) 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 1509fb30..27f5674f 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 @@ -10,6 +10,8 @@ import com.zdxt.code.domain.*; import com.zdxt.code.service.*; import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.Constants; +import com.zdxt.common.util.ServletUtils; import com.zdxt.common.util.StringUtils; import com.zdxt.common.util.TableDataInfo; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -23,6 +25,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.temporal.ChronoUnit; import java.util.*; +import java.util.stream.Collectors; /** @@ -182,6 +185,32 @@ public class AppEnforcementRegistrationController extends BaseController return getDataTable(list); } + + /** + * 查询执法端-执法登记列表 + */ +// @RequiresPermissions("code:registration:list") + @GetMapping("/queryListNew") + @ResponseBody + public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration) + { + startPage(); + if (StringUtils.isEmpty(enforcementRegistration.getSearchValue()) + && StringUtils.isEmpty(enforcementRegistration.getEnterpriseNumber())) { + return getDataTable(new ArrayList()); + } + List list = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); + return getDataTable(list); + } + + @GetMapping("/queryByEpId") + @ResponseBody + public ZDResponse queryByEpId(EnforcementRegistration enforcementRegistration) + { + List list = enforcementRegistrationService.selectEnforcementRegistrationByEpId(enforcementRegistration); + return ZDResponse.success("获取当前企业本月登记信息",list); + } + /** * 查询企业端-执法登记列表 */ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java index 2992ac9c..aad26d97 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforcementRegistration.java @@ -229,6 +229,8 @@ public class EnforcementRegistration extends BaseDomain private String checkCategory; private String checkCategoryText; + private String num; + /** * 行政执法评价 */ @@ -755,4 +757,12 @@ public class EnforcementRegistration extends BaseDomain public void setRegionId(String regionId) { this.regionId = regionId; } + + public String getNum() { + return num; + } + + public void setNum(String num) { + this.num = num; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java index f2eb017f..d79e3e1e 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/EnforcementRegistrationMapper.java @@ -33,6 +33,10 @@ public interface EnforcementRegistrationMapper * @return 执法端-执法登记集合 */ List selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); + + List selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration); + + List selectEnforcementRegistrationByEpId(EnforcementRegistration enforcementRegistration); List selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration); List selectEnforcementRegistrationAndAddressList(EnforcementRegistration enforcementRegistration); /*substring(i.enterprise_address,INSTR(i.enterprise_address, '深圳市')+3,INSTR(i.enterprise_address, '区')-3)as qy,substring(i.enterprise_address,INSTR(i.enterprise_address, '区')+1,INSTR(i.enterprise_address, '街道')-INSTR(i.enterprise_address, '区')+1)as jd*/ diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java index 0ac72c5d..80218105 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IEnforcementRegistrationService.java @@ -35,6 +35,10 @@ public interface IEnforcementRegistrationService * @return 执法端-执法登记集合 */ List selectEnforcementRegistrationList(EnforcementRegistration enforcementRegistration); + + List selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration); + + List selectEnforcementRegistrationByEpId(EnforcementRegistration enforcementRegistration); List selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration); List selectUnite(EnforcementRegistration enforcementRegistration); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java index 859ffd52..15a5f9d3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java @@ -28,12 +28,15 @@ import com.zdxt.code.mapper.LinkageDictMapper; import com.zdxt.code.service.*; import com.zdxt.common.annotation.DataScope; import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; import com.zdxt.common.zdxtFile.AttFileRespDTO; import com.zdxt.common.zdxtFile.FilePreviewUtilBean; import com.zdxt.common.zdxtFile.ZdxtFileCommon; import com.zdxt.domain.auth.DictData; +import org.apache.commons.collections.CollectionUtils; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.zdxt.code.mapper.EnforcementRegistrationMapper; @@ -193,6 +196,24 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat enforcementRegistrationMapper.selectEnforcementRegistrationList(enforcementRegistration); return enforcementRegistrations; } + + @Override +// @DataScope + public List selectEnforcementRegistrationListNew(EnforcementRegistration enforcementRegistration) + { + List enforcementRegistrations = + enforcementRegistrationMapper.selectEnforcementRegistrationListNew(enforcementRegistration); + return enforcementRegistrations; + } + + @Override + public List selectEnforcementRegistrationByEpId(EnforcementRegistration enforcementRegistration) + { + List enforcementRegistrations = + enforcementRegistrationMapper.selectEnforcementRegistrationByEpId(enforcementRegistration); + return enforcementRegistrations; + } + @Override @DataScope public List selectEnforcementRegistrationList1(EnforcementRegistration enforcementRegistration) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index c6118aef..820386f3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -153,6 +154,142 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by enforcement_time desc + + + + + +