diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java index 18e682b7..f13cf767 100644 --- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java +++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/Role.java @@ -50,7 +50,7 @@ public class Role extends BaseDomain private Long[] menuIds; /** 部门组（数据权限） */ - private Long[] deptIds; + private String[] deptIds; private String systemCode; /** * 多租户字段 @@ -185,12 +185,12 @@ public class Role extends BaseDomain this.menuIds = menuIds; } - public Long[] getDeptIds() + public String[] getDeptIds() { return deptIds; } - public void setDeptIds(Long[] deptIds) + public void setDeptIds(String[] deptIds) { this.deptIds = deptIds; } diff --git a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/RoleDept.java b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/RoleDept.java index 0a8db90b..a61e2c2e 100644 --- a/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/RoleDept.java +++ b/lib/EmergencyBaseLib/EmergencyCommonEntity/src/main/java/com/zdxt/domain/auth/RoleDept.java @@ -14,7 +14,7 @@ public class RoleDept private Long roleId; /** 部门ID */ - private Long deptId; + private String deptId; public Long getRoleId() { @@ -26,12 +26,12 @@ public class RoleDept this.roleId = roleId; } - public Long getDeptId() + public String getDeptId() { return deptId; } - public void setDeptId(Long deptId) + public void setDeptId(String deptId) { this.deptId = deptId; } diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java index 2a79fe54..9cb1e7a9 100644 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppEnterpriseLawEnforcementController.java @@ -2,6 +2,7 @@ package com.zdxt.app.controller; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.zdxt.auth.dto.DeptBean; @@ -346,6 +347,18 @@ public class AppEnterpriseLawEnforcementController extends BaseController // enfrorcement.setParams(params); enfrorcement.setDeptObjs(objs); + // 执法人员需要展示用户名+执法码 + UserBean userBean1 = new UserBean(); + if (StringUtils.isNotEmpty(enfrorcement.getLawEnforcerId())) { + userBean1 = userApi.getUserByUserStrId(enfrorcement.getLawEnforcerId()); + if(StrUtil.isNotEmpty(String.valueOf(userBean1.getUserId()))){ + String lawCertificateNum = StringUtils.isEmpty(userBean1.getLawCertificateNum())?"": + userBean1.getLawCertificateNum(); + //执法人员 + enfrorcement.setLawEnforcerText(lawCertificateNum); + } + } + // 执法人员需要展示用户名+执法码 List userBeans = new ArrayList<>(); if (StringUtils.isNotEmpty(enfrorcement.getLawEnforcerTwoId())) { @@ -354,7 +367,7 @@ public class AppEnterpriseLawEnforcementController extends BaseController String tmpUserShow = ""; for (UserBean ub : userBeans) { String lawCertificateNum = StringUtils.isEmpty(ub.getLawCertificateNum())?"":ub.getLawCertificateNum(); - tmpUserShow += ub.getUserName() +" - "+ lawCertificateNum + ","; + tmpUserShow += ub.getUserName() +"-"+ lawCertificateNum + ","; } if (tmpUserShow.length() > 0) { tmpUserShow = tmpUserShow.substring(0, tmpUserShow.length()-1); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java index e152d4ec..9edd44ce 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java @@ -232,6 +232,7 @@ public class RoleServiceImpl implements IRoleService { roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); // 新增角色和部门信息（数据权限） return insertRoleDept(role); + } /** @@ -265,7 +266,7 @@ public class RoleServiceImpl implements IRoleService { int rows = 1; // 新增角色与部门（数据权限）管理 List list = new ArrayList(); - for (Long deptId : role.getDeptIds()) { + for (String deptId : role.getDeptIds()) { RoleDept rd = new RoleDept(); rd.setRoleId(role.getRoleId()); rd.setDeptId(deptId); diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/tenant/service/impl/SysTenantServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/tenant/service/impl/SysTenantServiceImpl.java index 083a4da9..01c3cd85 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/tenant/service/impl/SysTenantServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/tenant/service/impl/SysTenantServiceImpl.java @@ -201,7 +201,7 @@ public class SysTenantServiceImpl implements ISysTenantService { private List getSysRoleDepts(Dept dept, Role role) { List roleDeptList = new ArrayList<>(); RoleDept roleDept = new RoleDept(); - roleDept.setDeptId(Long.valueOf(dept.getDeptId())); + roleDept.setDeptId(String.valueOf(dept.getDeptId())); roleDept.setRoleId(role.getRoleId()); roleDeptList.add(roleDept); return roleDeptList; 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 958d0791..3538e0c2 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml @@ -392,7 +392,7 @@ update_by = #{updateBy}, update_time = sysdate() - where dept_id in (${ancestors}) + where dept_id in (#{ancestors}) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java index 50f710aa..54df8a09 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/EnforceRegCount.java @@ -25,6 +25,12 @@ public class EnforceRegCount * 企业统一信用代码 */ private String enterpriseNumber; + + /** + * 企业名称 + */ + private String enterpriseName; + /** 统计数量 */ private Integer num; /** 级别 */ @@ -35,6 +41,17 @@ public class EnforceRegCount */ private Integer warnType; + + /** + * 执法部门 + */ + private String enforcementDepartment; + + /** + * 执法部门ID + */ + private String enforcementDepartmentId; + public String getLawEnforcement() { return lawEnforcement; } @@ -82,4 +99,27 @@ public class EnforceRegCount public void setWarnType(Integer warnType) { this.warnType = warnType; } + + public String getEnforcementDepartment() { + return enforcementDepartment; + } + + public void setEnforcementDepartment(String enforcementDepartment) { + this.enforcementDepartment = enforcementDepartment; + } + + public String getEnforcementDepartmentId() { + return enforcementDepartmentId; + } + + public void setEnforcementDepartmentId(String enforcementDepartmentId) { + this.enforcementDepartmentId = enforcementDepartmentId; + } + public String getEnterpriseName() { + return enterpriseName; + } + + public void setEnterpriseName(String enterpriseName) { + this.enterpriseName = enterpriseName; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java index c50b897f..50e68f49 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/LawEnforcementWarningList.java @@ -47,6 +47,16 @@ public class LawEnforcementWarningList extends BaseDomain */ private String searchDate; + /** + * 执法部门 + */ + private String enforcementDepartment; + + /** + * 执法部门ID + */ + private String enforcementDepartmentId; + public void setId(String id) { this.id = id; @@ -131,6 +141,22 @@ public class LawEnforcementWarningList extends BaseDomain this.warnType = warnType; } + public String getEnforcementDepartment() { + return enforcementDepartment; + } + + public void setEnforcementDepartment(String enforcementDepartment) { + this.enforcementDepartment = enforcementDepartment; + } + + public String getEnforcementDepartmentId() { + return enforcementDepartmentId; + } + + public void setEnforcementDepartmentId(String enforcementDepartmentId) { + this.enforcementDepartmentId = enforcementDepartmentId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java index 4f3d6ebb..e5ae07f9 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzcfajjbxx026705.java @@ -37,6 +37,10 @@ public class Xzcfajjbxx026705 { * 当事人证件号码 */ private String c201016; + /** + * 执法主体 + */ + private String c201003; public String getC201000() { return c201000; @@ -85,4 +89,12 @@ public class Xzcfajjbxx026705 { public void setC206010(String c206010) { this.c206010 = c206010; } + + public String getC201003() { + return c201003; + } + + public void setC201003(String c201003) { + this.c201003 = c201003; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java index cb0d971c..7cd569d1 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Xzqzjbxx173774.java @@ -32,6 +32,11 @@ public class Xzqzjbxx173774 { */ private String c301010; + /** + * 措施名称 + */ + private String c302001; + public String getC301002() { return c301002; @@ -72,4 +77,12 @@ public class Xzqzjbxx173774 { public void setC301010(String c301010) { this.c301010 = c301010; } + + public String getC302001() { + return c302001; + } + + public void setC302001(String c302001) { + this.c302001 = c302001; + } } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java index 3c05860c..ec563ce3 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java @@ -129,11 +129,11 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc List enterpriseLawEnforcements = enterpriseLawEnforcementMapper.selectEnterpriseLawEnforcementList(enterpriseLawEnforcement); for (int i = 0; i < enterpriseLawEnforcements.size(); i++) { - LinkageDict linkageDict = + /*LinkageDict linkageDict = linkageDictService.selectLinkageDictById(enterpriseLawEnforcements.get(i).getCheckItem()); if(linkageDict != null){ enterpriseLawEnforcements.get(i).setCheckItem(linkageDict.getTitle()); - } + }*/ } return enterpriseLawEnforcements; } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java index b267a47c..55ed900a 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/task/EarlyWarningTask.java @@ -68,6 +68,10 @@ public class EarlyWarningTask { warning.setId(IdUtil.simpleUUID()); warning.setCreateTime(DateUtils.getNowDate()); + if(StrUtil.isNotEmpty(warn.getLawEnforcementId())){ + warning.setEnforcementDepartment(warn.getEnforcementDepartment()); + warning.setEnforcementDepartmentId(warn.getEnforcementDepartmentId()); + } //预警类型 warning.setWarnType(warn.getWarnType()); lawEnforcementWarningListService.insertLawEnforcementWarningList(warning); diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml index 07d8676c..6cbbd9c6 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/EnforcementRegistrationMapper.xml @@ -303,11 +303,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultType="com.zdxt.code.domain.EnforceRegCount"> SELECT t1.law_enforcement_id, - t1.enterprise_name AS law_enforcement, + t1.law_enforcement, + t1.enterprise_name, t1.enterprise_number, SUM(T1.total) as num FROM - ( SELECT enterprise_name, enterprise_number, law_enforcement_id, unite_check, create_time , + ( SELECT enterprise_name, enterprise_number, law_enforcement_id,law_enforcement, unite_check, create_time , count( enterprise_number ) AS total FROM enforcement_registration WHERE create_time >= DATE_SUB( CURDATE(), INTERVAL #{timeMonth} MONTH ) AND law_enforcement_id IS NOT NULL GROUP BY unite_check ,law_enforcement_id ) AS t1 GROUP BY t1.law_enforcement_id @@ -316,7 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" resultType="com.zdxt.code.domain.EnforceRegCount"> SELECT t1.law_enforcement_id, - t1.enterprise_name AS law_enforcement, + t1.enterprise_name , t1.enterprise_number, SUM(T1.total) as num FROM diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml index 67b58a0b..494d85c5 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml @@ -14,11 +14,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + select id, warning_time, warning_cause, warning_level, - create_time, enterprise_name, enterprise_number,enforcement_number,warn_type from law_enforcement_warning_list + create_time, enterprise_name, enterprise_number,enforcement_number,warn_type, + enforcement_department,enforcement_department_id from law_enforcement_warning_list