From ed48a11b69d7303c00934b2c21a88f03ad8b5068 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Mon, 28 Jul 2025 18:02:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E6=97=B6=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BC=81=E4=B8=9A=E6=B3=A8=E5=86=8C=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppEnforcementRegistrationController.java | 18 +++++++++++--- .../resources/mapper/system/UserMapper.xml | 7 ++++-- .../domain/NonEnforcementRegistration.java | 10 ++++++++ .../service/impl/ThirdLoginServiceImpl.java | 10 ++++++++ .../mapper/EnforcementRegistrationMapper.xml | 24 ++++++++++++++----- .../NonEnforcementRegistrationMapper.xml | 2 ++ 6 files changed, 60 insertions(+), 11 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 39722428..2e35ccb9 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil; import com.zdxt.auth.dto.DeptBean; import com.zdxt.auth.dto.DictDataBean; import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.DeptApi; import com.zdxt.auth.feign.DictDataApi; import com.zdxt.auth.feign.UserApi; import com.zdxt.auth.project.system.user.service.IUserService; @@ -50,6 +51,7 @@ public class AppEnforcementRegistrationController extends BaseController @Autowired private IEnterpriseEvaluateService enterpriseEvaluateService; @Autowired private IZqyjjdm137344Service iZqyjjdm137344Service; @Autowired private UserApi userApi; + @Autowired private DeptApi deptApi; @Autowired private DictDataApi dictDataApi; @Autowired private IUserService userService; @@ -204,9 +206,12 @@ public class AppEnforcementRegistrationController extends BaseController @ResponseBody public TableDataInfo queryListNew(EnforcementRegistration enforcementRegistration) { - if (Objects.nonNull(enforcementRegistration.getUserId())) { - UserBean userByUserId = userApi.getUserByUserId(enforcementRegistration.getUserId()); - enforcementRegistration.setDeptId(userByUserId == null ? null : userByUserId.getDeptId()); + if (Objects.nonNull(enforcementRegistration.getUserId()) && enforcementRegistration.getDateType()==0) { + UserBean userByUser = userApi.getUserByUserId(enforcementRegistration.getUserId()); + enforcementRegistration.setDeptId(userByUser == null ? null : userByUser.getDeptId()); + + DeptBean bureauDept = deptApi.iterationDeptParentToBureau(userByUser.getDeptId()); + enforcementRegistration.setBureauDeptId(bureauDept.getDeptId()); } //查询检查总次数 List registrations = enforcementRegistrationService.selectEnforcementRegistrationListNew(enforcementRegistration); @@ -226,6 +231,13 @@ public class AppEnforcementRegistrationController extends BaseController @ResponseBody public ZDResponse queryByEpId(EnforcementRegistration enforcementRegistration) { + if (Objects.nonNull(enforcementRegistration.getUserId()) && enforcementRegistration.getDateType()==0) { + UserBean userByUser = userApi.getUserByUserId(enforcementRegistration.getUserId()); + enforcementRegistration.setDeptId(userByUser == null ? null : userByUser.getDeptId()); + + DeptBean bureauDept = deptApi.iterationDeptParentToBureau(userByUser.getDeptId()); + enforcementRegistration.setBureauDeptId(bureauDept.getDeptId()); + } List list = enforcementRegistrationService.selectEnforcementRegistrationByEpId(enforcementRegistration); return ZDResponse.success("获取当前企业本月登记信息",list); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index 0ed4bc82..8f42bb47 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -205,8 +205,11 @@ - AND u.law_certificate_num is not null - AND u.law_certificate_num !="" + AND ( + (u.law_certificate_num is not null AND u.law_certificate_num !="") + or (d.`zone` = 5 or d.`zone` = 15) + or (d.`zone` = 6 or d.`zone` = 16) + ) and u.dept_id != 405 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java index b0482875..dd64e19f 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/NonEnforcementRegistration.java @@ -22,6 +22,8 @@ public class NonEnforcementRegistration extends BaseDomain private String enterpriseName; /** 被执法企业统一社会信用代码 */ private String enterpriseNumber; + /** 企业注册地址 */ + private String enterpriseAddress; /** 执法时间 */ private Date enforcementTime; @@ -95,6 +97,14 @@ public class NonEnforcementRegistration extends BaseDomain return enterpriseNumber; } + public String getEnterpriseAddress() { + return enterpriseAddress; + } + + public void setEnterpriseAddress(String enterpriseAddress) { + this.enterpriseAddress = enterpriseAddress; + } + public void setEnterpriseNumber(String enterpriseNumber) { this.enterpriseNumber = enterpriseNumber; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java index 19aa82aa..5d5337de 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/ThirdLoginServiceImpl.java @@ -202,6 +202,16 @@ public class ThirdLoginServiceImpl implements ThirdLoginService { user.setLawOfficer(false); } } + // 如果没有执法证件号, 则再次判断是否为消防 + if (!user.getLawOfficer()) { + // 根据执法部门判断如果是公安, 则为执法人员权限 true + DeptBean bureauDept = deptApi.iterationDeptParentToBureauGA(user_source.getDeptId()); + if (null != bureauDept && (6 == bureauDept.getZone() || 16 == bureauDept.getZone())) { + user.setLawOfficer(true); + } else { + user.setLawOfficer(false); + } + } Map payload = new HashMap<>(); payload.put("id", user.getUserId()); payload.put("name", user.getLoginName()); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index aadbbae1..8534ab4b 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -336,10 +336,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enforcement_time <= #{params.endTime} - - - ${params.dataScope} + + and (law_enforcer_id = #{userId} or user_id = #{userId} or law_enforcer_id = #{userId} or FIND_IN_SET(#{userId}, law_enforcer_id_two)) + + and bureau_dept_id = #{bureauDeptId} + + + + + GROUP BY enterprise_number order by enforcement_time desc) t @@ -414,10 +420,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and enforcement_time <= #{params.endTime} - - - ${params.dataScope} + + and (law_enforcer_id = #{userId} or user_id = #{userId} or law_enforcer_id = #{userId} or FIND_IN_SET(#{userId}, law_enforcer_id_two)) + + and bureau_dept_id = #{bureauDeptId} + + + + + order by enforcement_time desc diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml index 58b8c94c..53deae19 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/NonEnforcementRegistrationMapper.xml @@ -87,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" id, enterprise_name, enterprise_number, + enterprise_address, enforcement_time, law_enforcer, law_enforcer_id, @@ -121,6 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id}, #{enterpriseName}, #{enterpriseNumber}, + #{enterpriseAddress}, #{enforcementTime}, #{lawEnforcer}, #{lawEnforcerId}, From f0af76febdef24909246fff961ac08af141bebb9 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Tue, 29 Jul 2025 14:47:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=94=A8=E5=88=B0?= =?UTF-8?q?=E7=9A=84=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=94=B9=E6=88=90?= =?UTF-8?q?=E6=89=A7=E6=B3=95=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnforcementInspectionProgramMapper.xml | 34 +++++++++---------- .../mapper/EnforcementRegistrationMapper.xml | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml index 361a99da..ebfffedd 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementInspectionProgramMapper.xml @@ -187,19 +187,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bureau_dept_name like concat('%', #{bureauDeptName}, '%') - and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{beginTime} + and DATE_FORMAT(enforcement_time,'%Y-%m-%d') >= #{beginTime} - and #{endTime} >= DATE_FORMAT(create_time,'%Y-%m-%d') + and #{endTime} >= DATE_FORMAT(enforcement_time,'%Y-%m-%d') - and YEAR(create_time) = #{year} + and YEAR(enforcement_time) = #{year} - and QUARTER(create_time) = #{quarter} + and QUARTER(enforcement_time) = #{quarter} - and DATE_FORMAT(create_time, '%m') = #{month} + and DATE_FORMAT(enforcement_time, '%m') = #{month} ${params.dataScope} @@ -223,19 +223,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" bureau_dept_name like concat('%', #{bureauDeptName}, '%') - and DATE_FORMAT(create_time,'%Y-%m-%d') >= #{beginTime} + and DATE_FORMAT(enforcement_time,'%Y-%m-%d') >= #{beginTime} - and #{endTime} >= DATE_FORMAT(create_time,'%Y-%m-%d') + and #{endTime} >= DATE_FORMAT(enforcement_time,'%Y-%m-%d') - and YEAR(create_time) = #{year} + and YEAR(enforcement_time) = #{year} - and QUARTER(create_time) = #{quarter} + and QUARTER(enforcement_time) = #{quarter} - and DATE_FORMAT(create_time, '%m') = #{month} + and DATE_FORMAT(enforcement_time, '%m') = #{month} ${params.dataScope} @@ -291,19 +291,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and bureau_dept_name like concat('%', #{bureauDeptName}, '%') - and = concat('%', #{beginTime}, '%') ]]> + and = concat('%', #{enforcement_time}, '%') ]]> - and + and - and YEAR(create_time) = #{year} + and YEAR(enforcement_time) = #{year} - and QUARTER(create_time) = #{quarter} + and QUARTER(enforcement_time) = #{quarter} - and DATE_FORMAT(create_time, '%m') = #{month} + and DATE_FORMAT(enforcement_time, '%m') = #{month} ${params.dataScope} @@ -359,7 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM enforcement_inspection_program - AND YEAR(create_time) = #{year} + AND YEAR(enforcement_time) = #{year} ${params.dataScope} @@ -424,7 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM enforcement_inspection_program - AND YEAR(create_time) = #{year} + AND YEAR(enforcement_time) = #{year} ${params.dataScope} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 8534ab4b..b3affa3a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -505,7 +505,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} - order by create_time desc + order by enforcement_time desc