From f2519bff5e08fc624029540c6c6b8693099c9979 Mon Sep 17 00:00:00 2001 From: Chendy <596813911@qq.com> Date: Wed, 3 Sep 2025 17:22:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=9D=A5?= =?UTF-8?q?=E6=BA=90=E6=96=B0=E5=A2=9E=E6=89=A7=E6=B3=95=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 25 +++++++++++++++++- .../code/registration/registration.html | 25 ++++++++++++++++-- .../code/domain/EnforcementRegistration.java | 25 +++++++++++++++++- .../EnforcementRegistrationServiceImpl.java | 26 ++++++++++++------- .../mapper/EnforcementRegistrationMapper.xml | 11 ++++++-- .../mapper/EnterpriseComplaintMapper.xml | 8 +++--- 6 files changed, 100 insertions(+), 20 deletions(-) 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 6aab5a7a..aa667d6f 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 @@ -587,6 +587,17 @@ public class AppEnforcementRegistrationController extends BaseController } } } + // 执法类别 + if (StringUtils.isNotEmpty(enforcementRegistration.getLawEnforceCategory())) { + dictParams.setDictType("law_enforce_category"); + List dicts = dictDataApi.getDictData(dictParams); + for (DictDataBean d : dicts) { + if (d.getDictValue().equals(enforcementRegistration.getLawEnforceCategory())) { + enforcementRegistration.setLawEnforceCategoryText(d.getDictLabel()); + break; + } + } + } } return ZDResponse.success("查询成功",enforcementRegistration); } @@ -668,7 +679,7 @@ public class AppEnforcementRegistrationController extends BaseController } } } - // 执法类别 + // 任务来源 if (StringUtils.isNotEmpty(reg.getCheckCategory())) { dictParams.setDictType("check_category"); List dicts = dictDataApi.getDictData(dictParams); @@ -679,6 +690,18 @@ public class AppEnforcementRegistrationController extends BaseController } } } + + // 执法类别 + if (StringUtils.isNotEmpty(reg.getLawEnforceCategory())) { + dictParams.setDictType("law_enforce_category"); + List dicts = dictDataApi.getDictData(dictParams); + for (DictDataBean d : dicts) { + if (d.getDictValue().equals(reg.getLawEnforceCategory())) { + reg.setLawEnforceCategoryText(d.getDictLabel()); + break; + } + } + } // 评价 //查询行政检查评价 diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html index 8e6c00f6..32b5d4ba 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/registration/registration.html @@ -63,7 +63,7 @@

  • 执法类别：

    - @@ -102,6 +102,15 @@
    • +
  • +
  • +

    任务来源：

    + +
    • +

  • 时段：

    select r.id,r.bureau_dept_name,r.bureau_dept_id,r.law_enforcer,r.law_enforcer_two,r.enterprise_name,r.enterprise_number,i.enterprise_address,r.law_enforcement_item_text,r.unite_check, - r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time from enforcement_registration r + r.check_category,r.check_css,r.is_complaint,r.create_time,r.law_id, r.enforcement_time,r.law_enforce_category + from enforcement_registration r left join (select * from enterprise_information group by enterprise_number order by is_delete asc) i on r.enterprise_number=i.enterprise_number and r.bureau_dept_name is not null @@ -569,6 +572,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND DATE_FORMAT(r.enforcement_time, '%m') = #{month} + and law_enforce_category = #{lawEnforceCategory} @@ -724,6 +728,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" union_no, has_union, has_auto, + law_enforce_category, #{id}, @@ -771,6 +776,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{unionNo}, #{hasUnion}, #{hasAuto}, + #{lawEnforceCategory}, @@ -822,6 +828,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" unite_check = #{uniteCheck}, has_union = #{hasUnion}, has_auto = #{hasAuto}, + law_enforce_category = #{lawEnforceCategory}, where id = #{id} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml index 11677c5b..e50405e9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnterpriseComplaintMapper.xml @@ -361,14 +361,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - AND m.title like concat('%',#{searchValue},'%') + AND (m.title like concat('%',#{searchValue},'%') or m.bureauDeptName like concat('%',#{searchValue},'%') or m.lawEnforcer like concat('%',#{searchValue},'%') or m.lawEnforcerOther like concat('%',#{searchValue},'%') or m.lawEnforcementType like concat('%',#{searchValue},'%') or m.lawEnforcementType = #{checkCategoryCode} - + ) and date_format(m.enforcementTime,'%Y-%m-%d') >=#{beginTime} @@ -388,14 +388,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - AND m.title like concat('%',#{searchValue},'%') + AND (m.title like concat('%',#{searchValue},'%') or m.bureauDeptName like concat('%',#{searchValue},'%') or m.lawEnforcer like concat('%',#{searchValue},'%') or m.lawEnforcerOther like concat('%',#{searchValue},'%') or m.lawEnforcementType like concat('%',#{searchValue},'%') or m.lawEnforcementType = #{checkCategoryCode} - + ) and date_format(m.enforcementTime,'%Y-%m-%d') >= #{beginTime}