67761 法规清单导出,责任领域串数据问题修改。

This commit is contained in:
wangzhijiang
2023-04-03 20:42:39 +08:00
parent 44272e157f
commit a06b589fef
4 changed files with 23 additions and 13 deletions
@@ -101,6 +101,7 @@ public class SysDictItem implements Serializable {
private java.lang.String attributeType;
/**逻辑删除标识*/
/**value0可用,1逻辑删除**/
@TableLogic
public Integer delFlag;
@@ -4,16 +4,17 @@ package com.jero.modules.system.enums;
* 数据字典code枚举类
*/
public enum DicCodeEnum {
REGION("适用地区","0","region"),
REGION("适用地区","1493782108399820801","region"),
DUTY_TERRITORY("责任领域","1513417672023441409","duty_territory"),
;
String name;
String value;
String id;
String code;
private DicCodeEnum(String name, String value, String code) {
private DicCodeEnum(String name, String id, String code) {
this.name = name;
this.value = value;
this.id = id;
this.code = code;
}
@@ -25,13 +26,14 @@ public enum DicCodeEnum {
this.name = name;
}
public String getValue() {
return value;
public String getId() {
return id;
}
public void setValue(String value) {
this.value = value;
public void setId(String id) {
this.id = id;
}
public String getCode() {
return code;
}
@@ -40,10 +42,10 @@ public enum DicCodeEnum {
this.code = code;
}
public static String getTextByValue(String value) {
public static String getTextByCode(String code) {
DicCodeEnum[] values = values();
for (DicCodeEnum dicCodeEnum : values) {
if (dicCodeEnum.value.equals(value)) {
if (dicCodeEnum.code.equals(code)) {
return dicCodeEnum.name;
}
}
@@ -26,7 +26,7 @@ public interface SysDictItemMapper extends BaseMapper<SysDictItem> {
@Select("SELECT sys_dict_item.* FROM sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id WHERE DICT_CODE = #{dictCode} order by sys_dict_item.item_text asc")
public List<SysDictItem> selectItemsOrderBySortOrder(String dictCode);
@Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1")
@Select("SELECT sys_dict.dict_code,sys_dict_item.* from sys_dict_item LEFT JOIN sys_dict ON sys_dict_item.dict_id = sys_dict.id where status = 1 and sys_dict_item.del_flag = 0")
List<SysDictItem> selectItemsAll();
/**