From fda4e46956ddceaef7891e53915f79e635da1fd2 Mon Sep 17 00:00:00 2001
From: zer0Black <694429613@qq.com>
Date: Tue, 5 Apr 2022 12:54:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OnlCgformCollectionController.java        | 46 +------------------
 .../jero/modules/tag/entity/OnlCgformTag.java | 26 -----------
 2 files changed, 1 insertion(+), 71 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java
index bb494e516..d6affe4bb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/collection/controller/OnlCgformCollectionController.java
@@ -43,60 +43,17 @@ public class OnlCgformCollectionController extends JeroController<OnlCgformColle
 	/**
 	 * 分页列表查询
 	 *
-	 * @param onlCgformCollection
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
+	 * @param params
 	 * @return
 	 */
 	@AutoLog(value = "我的收藏-分页列表查询")
 	@ApiOperation(value="我的收藏-分页列表查询", notes="我的收藏-分页列表查询")
 	@PostMapping(value = "/page")
 	public Result<?> queryPageList(@RequestBody Map<String,Object> params){
-	/*
-	public Result<?> queryPageList(OnlCgformCollection onlCgformCollection,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<OnlCgformCollection> queryWrapper = QueryGenerator.initQueryWrapper(onlCgformCollection, req.getParameterMap());
-		Page<OnlCgformCollection> page = new Page<OnlCgformCollection>(pageNo, pageSize);
-		IPage<OnlCgformCollection> pageList = onlCgformCollectionService.page(page, queryWrapper);
-	*/
 		IPage<OnlCgformCollection> pageList = onlCgformCollectionService.queryPageList(params);
 		return Result.OK(pageList);
 	}
 
-	/**
-	 * 表头中英文切换
-	 *
-	 * @return
-	 */
-	/*
-	@AutoLog(value = "标签管理-表头中英文切换")
-	@ApiOperation(value="标签管理-表头中英文切换", notes="标签管理-表头中英文切换")
-	@GetMapping(value = "/getHeader")
-	public Result<List<Map<String, Object>>> getHeader(@RequestParam(name = "flag") String flag,
-													   @RequestParam(name = "cut") String cut) {
-		List<Map<String, Object>> list =onlCgformCollectionService.queryCondition(flag, cut);
-		return Result.OK(list);
-	}
-	 */
-
-	/**
-	 * 查询条件中英文切换
-	 *
-	 * @return
-	 */
-	/*
-	@AutoLog(value = "OCR识别转换记录表-查询条件中英文切换")
-	@ApiOperation(value="OCR识别转换记录表-查询条件中英文切换", notes="OCR识别转换记录表-查询条件中英文切换")
-	@GetMapping(value = "/queryCondition")
-	public Result<List<Map<String, Object>>> queryCondition(@RequestParam(name = "flag") String flag,
-															@RequestParam(name = "cut") String cut) {
-		List<Map<String, Object>> list = onlCgformCollectionService.queryCondition(flag, cut);
-		return Result.OK(list);
-	}
-	*/
 	/**
 	 * 列表查询
 	 *
@@ -178,7 +135,6 @@ public class OnlCgformCollectionController extends JeroController<OnlCgformColle
 		return Result.OK(onlCgformCollection);
 	}
 
-
 	/**
 	 * 表头中英文切换
 	 *
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java
index fa57b2203..a6073f8f8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java
@@ -33,23 +33,19 @@ public class OnlCgformTag implements Serializable {
     private java.lang.String id;
 
     /**创建人*/
-    @Dict(dictTable = "onl_cgform_field", dicText = "create_by", dicCode = "create_by")
     private java.lang.String createBy;
 
     /**创建日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    //@Dict(dictTable = "onl_cgform_field", dicText = "create_time", dicCode = "create_time")
     private java.util.Date createTime;
 
     /**更新人*/
-    @Dict(dictTable = "onl_cgform_field", dicText = "update_by", dicCode = "update_by")
     private java.lang.String updateBy;
 
     /**更新日期*/
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-    //@Dict(dictTable = "onl_cgform_field", dicText = "update_time", dicCode = "update_time")
     private java.util.Date updateTime;
 
     /**所属部门*/
@@ -57,7 +53,6 @@ public class OnlCgformTag implements Serializable {
     private java.lang.String sysOrgCode;
 
     /**文档库-表id*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "cgform_head_id", dicCode = "cgform_head_id")
     private java.lang.String cgformHeadId;
 
     /**所属模块(1文档库,0文档拆分)*/
@@ -65,11 +60,9 @@ public class OnlCgformTag implements Serializable {
     private java.lang.String isModel;
 
     /**属性名称*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "db_field_txt", dicCode = "db_field_txt")
     private java.lang.String dbFieldTxt;
 
     /**字段英文名称描述*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "db_field_en_name", dicCode = "db_field_en_name")
     private java.lang.String dbFieldEnName;
 
     /**属性类型*/
@@ -86,43 +79,33 @@ public class OnlCgformTag implements Serializable {
     private java.lang.String fieldShowTypeEnName;
 
     /**字典id*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "dict_id", dicCode = "dict_id")
     private java.lang.String dictId;
 
     /**字典Code*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "dict_field", dicCode = "dict_field")
     private java.lang.String dictField;
 
     /**字典表*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "dict_table", dicCode = "dict_table")
     private java.lang.String dictTable;
 
     /**字典Text*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "dict_text", dicCode = "dict_text")
     private java.lang.String dictText;
 
     /**数据库字段长度*/
-  //  @Dict(dictTable = "onl_cgform_field", dicText = "db_length", dicCode = "db_length")
     private java.lang.Integer dbLength;
 
     /**排序*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "order_num", dicCode = "order_num")
     private java.lang.Integer orderNum;
 
     /**字段是否必填0否 1是*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "field_must_input", dicCode = "field_must_input")
     private java.lang.String fieldMustInput;
 
     /**表单是否显示0否 1是*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "is_show_form", dicCode = "is_show_form")
     private java.lang.Integer isShowForm;
 
     /**列表是否显示0否 1是*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "is_show_list", dicCode = "is_show_list")
     private java.lang.Integer isShowList;
 
     /**是否是只读（2字段固定，内部可配1固定字段 0非固定字段）*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "is_read_only", dicCode = "is_read_only")
     private java.lang.Integer isReadOnly;
 
     /**展示区域id*/
@@ -140,39 +123,30 @@ public class OnlCgformTag implements Serializable {
     private java.lang.String showAreaEnName;
 
     /**是否查询条件0否 1是*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "is_query", dicCode = "is_query")
     private java.lang.Integer isQuery;
 
     /**法规清单是否展示0否 1是*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "is_show_laws_list", dicCode = "is_show_laws_list")
     private java.lang.Integer isShowLawsList;
 
     /**搜索中心是否展示0否 1是*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "is_show_search", dicCode = "is_show_search")
     private java.lang.Integer isShowSearch;
 
     /**逻辑删除标识 0未删 1已删*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "is_delete", dicCode = "is_delete")
     private Integer isDelete;
 
     /**字段名字*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "db_field_name", dicCode = "db_field_name")
     private String dbFieldName;
 
     /**是否主键 0否 1是*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "db_is_key", dicCode = "db_is_key")
     private Integer dbIsKey;
 
     /**是否允许为空 0否 1是*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "db_is_null", dicCode = "db_is_null")
     private Integer dbIsNull;
 
     /**小数点*/
-   // @Dict(dictTable = "onl_cgform_field", dicText = "db_point_length", dicCode = "db_point_length")
     private Integer dbPointLength;
 
     /**数据库字段类型*/
-    //@Dict(dictTable = "onl_cgform_field", dicText = "db_type", dicCode = "db_type")
     private String dbType;
 
     public OnlCgformTag() {