From e156433050f8e81be18430034015a1f4a35c6727 Mon Sep 17 00:00:00 2001 From: Chendy <596813911@qq.com> Date: Mon, 8 Sep 2025 10:39:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A7=94=E6=89=98=E6=89=A7?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 18 +++++++++ .../java/com/zdxt/auth/feign/DeptApiImpl.java | 24 ++++++++++++ .../system/dept/mapper/DeptMapper.java | 27 +++++++------ .../resources/mapper/system/DeptMapper.xml | 38 +++++++++++++++++++ .../code/domain/EnforcementRegistration.java | 27 +++++++++++++ .../mapper/EnforcementRegistrationMapper.xml | 10 ++++- .../java/com/zdxt/auth/feign/DeptApi.java | 9 +++++ 7 files changed, 141 insertions(+), 12 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 aa667d6f..5a1d05fa 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 @@ -1,5 +1,6 @@ package com.zdxt.app.controller; +import com.alibaba.fastjson.JSONObject; import com.zdxt.common.util.CommonUtil; import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.DictDataBean; @@ -877,4 +878,21 @@ public class AppEnforcementRegistrationController extends BaseController // registration.setParams(params); return ZDResponse.success("查询成功", registration); } + + /** + * 获取全部执法部门 + * @param bean + * @return + */ + @PostMapping("/getAllEnforceDept") + @ResponseBody + public TableDataInfo getAllEnforceDept(@RequestBody DeptBean bean){ + int count=deptApi.getAllEnforceDeptCount(bean); + List list= deptApi.getAllEnforceDept(bean); + TableDataInfo rspData = getDataTable(list); + rspData.setCode(0); + rspData.setRows(list); + rspData.setTotal(count); + return rspData; + } } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java index 0f6de482..2046a3b3 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DeptApiImpl.java @@ -326,4 +326,28 @@ public class DeptApiImpl implements DeptApi { BeanUtil.copyProperties(dept, bean); return bean; } + + @Override + public List getAllEnforceDept(DeptBean bean) { + Dept dept=new Dept(); + BeanUtil.copyProperties(bean,dept); + dept.setZone(2); + List list=deptMapper.getAllEnforceDept(dept); + List res=new ArrayList<>(); + list.forEach(li->{ + DeptBean db=new DeptBean(); + BeanUtil.copyProperties(li,db); + res.add(db); + }); + return res; + } + + @Override + public int getAllEnforceDeptCount(DeptBean bean) { + Dept dept=new Dept(); + BeanUtil.copyProperties(bean,dept); + dept.setZone(2); + int res=deptMapper.getAllEnforceDeptCount(dept); + return res; + } } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java index 1fe667d9..402e3bb3 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/dept/mapper/DeptMapper.java @@ -40,7 +40,7 @@ public interface DeptMapper /** * 查询部门人数 - * + * * @param dept 部门信息 * @return 结果 */ @@ -48,7 +48,7 @@ public interface DeptMapper /** * 查询部门是否存在用户 - * + * * @param deptId 部门ID * @return 结果 */ @@ -56,7 +56,7 @@ public interface DeptMapper /** * 查询部门管理数据 - * + * * @param dept 部门信息 * @return 部门信息集合 */ @@ -74,7 +74,7 @@ public interface DeptMapper /** * 删除部门管理信息 - * + * * @param deptId 部门ID * @return 结果 */ @@ -82,7 +82,7 @@ public interface DeptMapper /** * 新增部门信息 - * + * * @param dept 部门信息 * @return 结果 */ @@ -90,7 +90,7 @@ public interface DeptMapper /** * 修改部门信息 - * + * * @param dept 部门信息 * @return 结果 */ @@ -100,7 +100,7 @@ public interface DeptMapper /** * 修改子元素关系 - * + * * @param depts 子元素 * @return 结果 */ @@ -108,7 +108,7 @@ public interface DeptMapper /** * 根据部门ID查询信息 - * + * * @param deptId 部门ID * @return 部门信息 */ @@ -117,7 +117,7 @@ public interface DeptMapper /** * 校验部门名称是否唯一 - * + * * @param deptName 部门名称 * @param parentId 父部门ID * @return 结果 @@ -134,14 +134,14 @@ public interface DeptMapper /** * 修改所在部门的父级部门状态 - * + * * @param dept 部门 */ void updateDeptStatus(Dept dept); /** * 根据ID查询所有子部门 - * + * * @param deptId 部门ID * @return 部门列表 */ @@ -181,4 +181,9 @@ public interface DeptMapper * @return */ Dept selectDeptByCreditcode(String code); + + + List getAllEnforceDept(Dept bean); + + int getAllEnforceDeptCount(Dept bean); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml index 35b54f5a..40996899 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -539,5 +539,43 @@ where creditcode =#{code} + + + \ No newline at end of file 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 ebd1d32c..43c97528 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 @@ -254,11 +254,38 @@ public class EnforcementRegistration extends BaseDomain private String lawEnforceCategoryText; + /** + * 委托执法id + */ + private String entrustDeptId; + + /** + * 委托执法部门名称 + */ + private String entrustDeptName; + /** * 行政执法评价 */ private EnterpriseEvaluate enterpriseEvaluate; + + public String getEntrustDeptId() { + return entrustDeptId; + } + + public void setEntrustDeptId(String entrustDeptId) { + this.entrustDeptId = entrustDeptId; + } + + public String getEntrustDeptName() { + return entrustDeptName; + } + + public void setEntrustDeptName(String entrustDeptName) { + this.entrustDeptName = entrustDeptName; + } + public String getLawEnforceCategoryText() { return lawEnforceCategoryText; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 765b6fcc..95a826a4 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -53,6 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -71,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" law_enforcement_basis, law_enforcement_basis_text, remark, reslut, user_id, dept_id, is_delete, status, law_enforcement_code, is_complaint,is_submit, unite_check,check_css, enforce_reason, law_field,check_category, bureau_dept_id,bureau_dept_name,is_evaluate, law_id, law_text, has_union, has_auto, union_no, - law_enforce_category + law_enforce_category,entrust_dept_id,entrust_dept_name from enforcement_registration @@ -729,6 +731,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" has_union, has_auto, law_enforce_category, + entrust_dept_id, + entrust_dept_name, #{id}, @@ -777,6 +781,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{hasUnion}, #{hasAuto}, #{lawEnforceCategory}, + #{entrustDeptId}, + #{entrustDeptName}, @@ -829,6 +835,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" has_union = #{hasUnion}, has_auto = #{hasAuto}, law_enforce_category = #{lawEnforceCategory}, + entrust_dept_id=#{entrustDeptId}, + entrust_dept_name=#{entrustDeptName}, where id = #{id} diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java index 88a828a4..4dbf6554 100644 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java +++ b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DeptApi.java @@ -144,4 +144,13 @@ public interface DeptApi { */ DeptBean selectDeptByCreditcode(String code); + /** + * 获取全部执法部门 + * @param bean + * @return + */ + List getAllEnforceDept(DeptBean bean); + + int getAllEnforceDeptCount(DeptBean bean); + }