执法端，监督端-新增其他原因字段

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java

@@ -321,4 +321,9 @@ public class EnforcementRegistrationBo extends BaseEntity {
      */
     private Integer warnType;
 
+    /**
+     * 其他原因
+     */
+    private String otherReasons;
+
 }

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java

@@ -410,4 +410,8 @@ public class EnforcementRegistrationVo implements Serializable {
 
     private List<ZdxtFileVo> fileList;
 
+    /**
+     *  其他原因
+     */
+    private String otherReasons;
 }

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml

@@ -315,6 +315,7 @@
             <if test="lawEnforceCategory != null and lawEnforceCategory!=''"> law_enforce_category = #{lawEnforceCategory},</if>
             <if test="entrustDeptId != null and entrustDeptId!=''"> entrust_dept_id=#{entrustDeptId},</if>
             <if test="entrustDeptName != null and entrustDeptName!=''"> entrust_dept_name=#{entrustDeptName},</if>
+            <if test="otherReasons != null  and otherReasons != ''"> other_reasons = #{otherReasons},</if>
         </trim>
         where id = #{id}
     </update>
@@ -383,6 +384,7 @@
             <if test="lawEnforceCategory != null and lawEnforceCategory!=''"> law_enforce_category,</if>
             <if test="entrustDeptId != null and entrustDeptId!=''"> entrust_dept_id,</if>
             <if test="entrustDeptName != null and entrustDeptName!=''"> entrust_dept_name,</if>
+            <if test="otherReasons != null  and otherReasons != ''"> other_reasons,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null  and id != ''">#{id},</if>
@@ -437,6 +439,7 @@
             <if test="lawEnforceCategory != null and lawEnforceCategory!=''"> #{lawEnforceCategory},</if>
             <if test="entrustDeptId != null and entrustDeptId!=''"> #{entrustDeptId},</if>
             <if test="entrustDeptName != null and entrustDeptName!=''"> #{entrustDeptName},</if>
+            <if test="otherReasons != null  and otherReasons != ''"> #{otherReasons},</if>
         </trim>
     </insert>
 

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationEINOFTReportMapper.xml

@@ -41,7 +41,7 @@
             <where>
                 <include refid="einoftWhereCondition"/>
             </where>
-            GROUP BY er.enterprise_number
+            GROUP BY er.enterprise_number, er.enterprise_name, er.district, er.street
         ) t
         <where>
             <if test="bo.num != null and bo.num != ''">

zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml

@@ -152,7 +152,8 @@
             er.is_evaluate, er.law_id, er.law_text,
             er.has_union, er.has_auto, er.union_no, er.law_enforce_category,
             er.entrust_dept_id, er.entrust_dept_name,
-            er.enterprise_address, er.district, er.street, er.zone, er.is_real_union
+            er.enterprise_address, er.district, er.street, er.zone, er.is_real_union,
+            er.other_reasons
         FROM enforcement_registration er
         LEFT JOIN sys_dict_data area
             ON area.dict_type = 'address_type'
@@ -351,7 +352,9 @@
                 <include refid="reportWhereCondition"/>
                 AND enterprise_number IS NOT NULL AND enterprise_number != ''
             </where>
-            GROUP BY enterprise_number
+            GROUP BY enterprise_number, enterprise_name, district, street,
+                bureau_dept_name, law_enforcer, law_enforcer_two,
+                law_enforcement_item_text, enforcement_time
             ORDER BY enforcement_time DESC
         ) t
         <where>
@@ -453,7 +456,9 @@
                     ${dataFilter}
                 </if>
             </where>
-            GROUP BY er.enterprise_number
+            GROUP BY er.enterprise_number, er.enterprise_name, er.district, er.street,
+                er.bureau_dept_id, er.bureau_dept_name, er.law_enforcer, er.law_enforcer_two,
+                er.law_enforcement_item_text
         ) t
         LEFT JOIN sys_dict_data area
             ON area.dict_type = 'address_type'

zdxt-modules/zdxt-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java

@@ -1,6 +1,7 @@
 package org.dromara.system.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -81,7 +82,7 @@ public class SysDictDataController extends BaseController {
         }
         return R.ok(data);
     }
-
+    @SaIgnore
     @GetMapping(value = "/dictType")
     public R<List<SysDictDataVo>> dictTypes(String dictType) {
         List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);

zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java

@@ -101,7 +101,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
-    @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
+    //@Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
     @Override
     public List<SysDictDataVo> selectDictDataByType(String dictType) {
         List<SysDictDataVo> dictDatas = dictDataMapper.selectDictDataByType(dictType);