diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java index f3453998..3d1b4563 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/mapper/EnforcementRegistrationMapper.java @@ -148,7 +148,7 @@ public interface EnforcementRegistrationMapper extends BaseMapperPlus selectAnalysisPageV2(@Param("page") Page page, @Param("bo") EnforcementRegistrationBo bo, @Param("dataFilter") String dataFilter); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml index 3caf676e..3752f130 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationReportMapper.xml @@ -379,7 +379,7 @@ FROM ( SELECT er.district, er.street, er.enterprise_name, er.enterprise_number, - er.bureau_dept_name, er.law_enforcer, er.law_enforcer_two, + er.bureau_dept_id, er.bureau_dept_name, er.law_enforcer, er.law_enforcer_two, er.law_enforcement_item_text, MAX(er.enforcement_time) AS enforcement_time, COUNT(er.enterprise_number) AS num