diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java index 4bbf5c42..8dcb685b 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/bo/EnforcementRegistrationBo.java +++ b/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; + } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java index 300c15f1..ff8b03a6 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/vo/EnforcementRegistrationVo.java +++ b/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 fileList; + /** + * 其他原因 + */ + private String otherReasons; } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml index 46ada94d..8cf23ae8 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/EnforcementRegistrationMapper.xml @@ -315,6 +315,7 @@ law_enforce_category = #{lawEnforceCategory}, entrust_dept_id=#{entrustDeptId}, entrust_dept_name=#{entrustDeptName}, + other_reasons = #{otherReasons}, where id = #{id} @@ -383,6 +384,7 @@ law_enforce_category, entrust_dept_id, entrust_dept_name, + other_reasons, #{id}, @@ -437,6 +439,7 @@ #{lawEnforceCategory}, #{entrustDeptId}, #{entrustDeptName}, + #{otherReasons}, diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationEINOFTReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationEINOFTReportMapper.xml index fd4a2887..b958a7e3 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationEINOFTReportMapper.xml +++ b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationEINOFTReportMapper.xml @@ -41,7 +41,7 @@ - GROUP BY er.enterprise_number + GROUP BY er.enterprise_number, er.enterprise_name, er.district, er.street ) t diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml b/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml index 69767b8a..97cd3a58 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/report/EnforcementRegistrationReportMapper.xml +++ b/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 @@ AND enterprise_number IS NOT NULL AND enterprise_number != '' - 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 @@ -453,7 +456,9 @@ ${dataFilter} - 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' diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index 6eb63879..e79e54e0 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/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> dictTypes(String dictType) { List data = dictTypeService.selectDictDataByType(dictType); diff --git a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index a7bc0694..1189f87f 100644 --- a/zdxt-modules/zdxt-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/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 selectDictDataByType(String dictType) { List dictDatas = dictDataMapper.selectDictDataByType(dictType);