WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

标签-修改

Browse Source
This commit is contained in:
xiejunyu
2022-03-04 10:50:00 +08:00
parent fefce57021
commit c5d97f0f9d
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+4 -3
View File
@@ -335,7 +335,7 @@ public class SysDictController {
return result; return result;
} }
/** /**
* 查询选项内容--数据字典名称 * 查询被删除的列表
* @return * @return
*/ */
@GetMapping(value = "/deleteList") @GetMapping(value = "/deleteList")
@@ -602,9 +602,10 @@ public class SysDictController {
} }
/** /**
* 查询被删除的列表 * 查询选项内容
* @return *
*/ */
@GetMapping(value = "/queryDictName") @GetMapping(value = "/queryDictName")
public Result<List<SysDict>> queryDictName(SysDict sysDict) { public Result<List<SysDict>> queryDictName(SysDict sysDict) {
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysDict.java
+1 -1
View File
@@ -106,7 +106,7 @@ public class SysDict implements Serializable {
/** /**
* 表单控件类型 * 表单控件类型
*/ */
@Excel(name = "标签类型 1下拉选择 2树形结构", width = 15) @Excel(name = "标签类型 1下拉选择 2树形结构", width = 15,dicCode = "attribute_type")
@ApiModelProperty(value = "标签类型 1下拉选择 2树形结构") @ApiModelProperty(value = "标签类型 1下拉选择 2树形结构")
@Dict(dicCode = "attribute_type") @Dict(dicCode = "attribute_type")
private java.lang.String attributeType; private java.lang.String attributeType;
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictServiceImpl.java
+1 -1
View File
@@ -198,7 +198,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
@Override @Override
public List<SysDict> queryDictName(SysDict sysDict) { public List<SysDict> queryDictName(SysDict sysDict) {
QueryWrapper<SysDict> QueryWrapper = new QueryWrapper<>(); QueryWrapper<SysDict> QueryWrapper = new QueryWrapper<>();
QueryWrapper.select("id", "dict_name").eq("is_tag_dict",1); QueryWrapper.select("id", "dict_name","attribute_type").eq("is_tag_dict",1);
return list(QueryWrapper); return list(QueryWrapper);
} }
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+3 -1
View File
@@ -64,7 +64,8 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
QueryWrapper<OnlCgformTag> queryWrapper = QueryGenerator.initQueryWrapper(onlCgformTag, req.getParameterMap()); QueryWrapper<OnlCgformTag> queryWrapper = QueryGenerator.initQueryWrapper(onlCgformTag, req.getParameterMap());
Page<OnlCgformTag> page = new Page<OnlCgformTag>(pageNo, pageSize); Page<OnlCgformTag> page = new Page<OnlCgformTag>(pageNo, pageSize);
if(StringUtils.isNotBlank("create_time")) { if(StringUtils.isNotBlank("create_time")) {
queryWrapper.orderByDesc("create_time"); queryWrapper.orderByDesc("create_time").eq("is_show_list",1)
.eq("cgform_head_id","48308196e7b04761b533dc31bc899707");//筛选文档库数据
} }
IPage<OnlCgformTag> pageList = onlCgformTagService.page(page, queryWrapper); IPage<OnlCgformTag> pageList = onlCgformTagService.page(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);
@@ -125,6 +126,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
} else { } else {
onlCgformTag.setCreateTime(new Date()); onlCgformTag.setCreateTime(new Date());
onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0); onlCgformTag.setIsDelete(CommonConstant.DEL_FLAG_0);
onlCgformTag.setCgformHeadId("48308196e7b04761b533dc31bc899707");//设置文档库-表id
onlCgformTagService.add(onlCgformTag); onlCgformTagService.add(onlCgformTag);
} }
return Result.OK("添加成功！"); return Result.OK("添加成功！");
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java
+10 -5
View File
@@ -62,6 +62,12 @@ public class OnlCgformTag implements Serializable {
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private java.lang.String sysOrgCode; private java.lang.String sysOrgCode;
/**文档库-表id*/
@Excel(name = "文档库-表id", width = 15,dictTable = "onl_cgform_field", dicText = "cgform_head_id", dicCode = "cgform_head_id")
@Dict(dictTable = "onl_cgform_field", dicText = "cgform_head_id", dicCode = "cgform_head_id")
@ApiModelProperty(value = "文档库-表id")
private java.lang.String cgformHeadId;
/**所属模块(1文档库,0文档拆分)*/ /**所属模块(1文档库,0文档拆分)*/
@Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module") @Excel(name = "所属模块(1文档库,0文档拆分", width = 15, dicCode = "module")
@Dict(dicCode = "module") @Dict(dicCode = "module")
@@ -87,12 +93,11 @@ public class OnlCgformTag implements Serializable {
@ApiModelProperty(value = "表单控件类型") @ApiModelProperty(value = "表单控件类型")
private java.lang.String fieldShowType; private java.lang.String fieldShowType;
/**字典名称*/ /**字典id*/
@TableField(exist = false) @Excel(name = "字典id", width = 15, dictTable = "sys_dict", dicText = "id", dicCode = "id")
@Excel(name = "字典名称", width = 15, dictTable = "sys_dict", dicText = "dict_name", dicCode = "dict_name") @Dict(dictTable = "sys_dict", dicText = "id", dicCode = "id")
@Dict(dictTable = "sys_dict", dicText = "dict_name", dicCode = "dict_name")
@ApiModelProperty(value = "字典名称") @ApiModelProperty(value = "字典名称")
private java.lang.String dictName; private java.lang.String dictId;
/**数据库字段长度*/ /**数据库字段长度*/
@Excel(name = "数据库字段长度", width = 15,dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length") @Excel(name = "数据库字段长度", width = 15,dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length")