修改部门和角色关联报错

修改企业画像案件信息

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;
     }

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;
     }

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<UserBean> 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);

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<RoleDept> list = new ArrayList<RoleDept>();
-        for (Long deptId : role.getDeptIds()) {
+        for (String deptId : role.getDeptIds()) {
             RoleDept rd = new RoleDept();
             rd.setRoleId(role.getRoleId());
             rd.setDeptId(deptId);

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<RoleDept> getSysRoleDepts(Dept dept, Role role) {
         List<RoleDept> 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;

lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/DeptMapper.xml

@@ -392,7 +392,7 @@
             <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
             update_time = sysdate()
         </set>
-        where dept_id in (${ancestors})
+        where dept_id in (#{ancestors})
     </update>
 
 

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;
+    }
 }

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)

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;
+    }
 }

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;
+    }
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java

@@ -129,11 +129,11 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
         List<EnterpriseLawEnforcement> 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;
     }

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);

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

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LawEnforcementWarningListMapper.xml

@@ -14,11 +14,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="enterpriseNumber"    column="enterprise_number"    />
         <result property="enforcementNumber"    column="enforcement_number"    />
         <result property="warnType"    column="warn_type"    />
+        <result property="enforcementDepartment"    column="enforcement_department"    />
+        <result property="enforcementDepartmentId"    column="enforcement_department_id"    />
     </resultMap>
 
     <sql id="selectLawEnforcementWarningListVo">
         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
     </sql>
 
     <select id="selectLawEnforcementWarningListList" parameterType="LawEnforcementWarningList" resultMap="LawEnforcementWarningListResult">
@@ -41,8 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and warning_time <![CDATA[ <= ]]> #{params.endWarningTime}
             </if>
             <if test="warnType != null">AND warn_type = #{warnType}</if>
+            <if test=" enforcementDepartmentId != null  and enforcementDepartmentId != ''">
+                enforcement_department_id = #{enforcementDepartmentId},
+            </if>
         </where>
-        order by warning_time desc
+        order by warning_level,warning_time desc
     </select>
     
     <select id="selectLawEnforcementWarningListById" parameterType="String" resultMap="LawEnforcementWarningListResult">
@@ -61,6 +67,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">enterprise_name,</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">enterprise_number,</if>
             <if test="enforcementNumber != null  and enforcementNumber != ''">enforcement_number,</if>
+            <if test=" enforcementDepartment != null  and enforcementDepartment != ''">enforcement_department,</if>
+            <if test=" enforcementDepartmentId != null  and enforcementDepartmentId != ''">enforcement_department_id,</if>
             <if test="warnType != null">warn_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -72,6 +80,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="enterpriseName != null  and enterpriseName != ''">#{enterpriseName},</if>
             <if test="enterpriseNumber != null  and enterpriseNumber != ''">#{enterpriseNumber},</if>
             <if test="enforcementNumber != null  and enforcementNumber != ''">#{enforcementNumber},</if>
+            <if test=" enforcementDepartment != null  and enforcementDepartment != ''">#{enforcementDepartment},</if>
+            <if test=" enforcementDepartmentId != null  and enforcementDepartmentId != ''">#{enforcementDepartmentId},</if>
             <if test="warnType != null">#{warnType},</if>
          </trim>
     </insert>

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Xzjcjbxx025711Mapper.xml

@@ -304,17 +304,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="queryQZAJByEnterpriseNumber" parameterType="String" resultType="com.zdxt.code.domain.Xzqzjbxx173774">
-        SELECT a.c301002,a.c301001,a.c301003, b.c302002, b.c302007, c.c301010  FROM XZQZJBXX173774 a
+        SELECT
+        	a.c301002,
+            a.c301001,
+            a.c301003,
+            b.c302002,
+            b.c302007,
+            c.c301010,
+            b.c302001
+         FROM XZQZJBXX173774 a
             LEFT JOIN XZQZCSXX274939 b ON a.c301000 = b.c301000
             LEFT JOIN XZQZDSRXX997874 c ON a.c301000 = c.c301000
             WHERE c.c301010 = #{enterpriseNumber}
     </select>
 
     <select id="queryCFAJByEnterpriseNumber" parameterType="String" resultType="com.zdxt.code.domain.Xzcfajjbxx026705">
-            SELECT a.c201000, a.c201002,b.c206011, b.c206013 , c.c201016 FROM XZCFAJJBXX026705 a
+            SELECT a.c201000,a.c201003,a.c201002,b.c206011, b.c206013,b.C206010, c.c201016 FROM XZCFAJJBXX026705 a
             LEFT JOIN xzcfajjdxx778518 b ON a.c201000 = b.c201000
             LEFT JOIN XZCFAJDSRXX594019 c  on a.c201000 = c.c201000
-            where c.c201016 = #{enterpriseNumber} order by  c.c201016 desc limit 10
+            where c.c201016 = #{enterpriseNumber} order by  b.c206013 desc limit 10
     </select>
 
     <select id="queryZFRY" parameterType="String" resultType="com.zdxt.code.domain.Zfryjdm2405301">