标签修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java

@@ -85,33 +85,6 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
 			return Result.OK(list);
 		}
 	}*/
-	/**
-	 * 表头中英文切换
-	 *
-	 * @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 =onlCgformTagService.getHeader(flag,cut);
-		return Result.OK(list);
-	}*/
-
-	/**
-	 * 查询条件中英文切换
-	 *
-	 * @return
-	 */
-	/*@AutoLog(value = "标签管理-查询条件中英文切换")
-	@ApiOperation(value="标签管理-查询条件中英文切换", notes="标签管理-查询条件中英文切换")
-	@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 = onlCgformTagService.queryCondition(flag,cut);
-		return Result.OK(list);
-	}*/
 
 	/**
 	 * 列表查询

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformTag.java

@@ -148,8 +148,8 @@ public class OnlCgformTag implements Serializable {
     private java.lang.Integer isReadOnly;
 
     /**展示区域id*/
-    @Excel(name = "展示区域id", width = 15, dictTable = "onl_cgform_area", dicText = "area_id", dicCode = "id")
-    @Dict(dictTable = "onl_cgform_area", dicText = "area_id", dicCode = "id")
+    @Excel(name = "展示区域id", width = 15, dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id")
+    @Dict(dictTable = "onl_cgform_area", dicText = "show_area", dicCode = "id")
     @ApiModelProperty(value = "展示区域id")
     private java.lang.String showArea;
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/mapper/OnlCgformTagMapper.java

@@ -19,15 +19,15 @@ public interface OnlCgformTagMapper extends BaseMapper<OnlCgformTag> {
             "f.is_model,f.db_field_txt,f.db_field_en_name,\n" +
             "f.field_show_type,i.item_text,f.dict_id,f.db_length,\n" +
             "f.order_num,f.field_must_input,f.is_show_form,f.is_show_list,\n" +
-            "f.is_read_only,f.show_area as area_id,a.show_area,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" +
+            "f.is_read_only,f.show_area,a.show_area as show_area_name,f.is_query,f.is_show_laws_list,f.is_show_search,f.is_delete,\n" +
             "f.db_field_name,f.db_is_key,f.db_is_null,f.db_point_length,f.db_type,\n" +
             "i.en_name as field_show_type_en_name,a.en_name as show_area_en_name\n" +
             "from onl_cgform_field as f \n" +
             "left join sys_dict_item as i on f.field_show_type=i.item_value\n" +
             "left join onl_cgform_area as a on f.show_area=a.id\n" +
-            "order by f.create_time desc\n" +
-            "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\" \n" +
-            "and i.dict_id=1493098515761917954 order by f.create_time desc\n")
-    IPage<OnlCgformTag> queryPageList(IPage page,@Param("params") Map<String, Object> params);
+            "where f.cgform_head_id=\"48308196e7b04761b533dc31bc899707\"\n" +
+            "and i.dict_id=1493098515761917954 \n" +
+            "order by f.create_time desc ")
+    IPage<OnlCgformTag> queryPageList(IPage page,@Param("params") Map<String,Object> params);
 //IPage<Map<String,Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/IOnlCgformTagService.java

@@ -73,22 +73,13 @@ public interface IOnlCgformTagService extends IService<OnlCgformTag> {
 	 */
 	Integer queryExitData(OnlCgformTag onlCgformTag) ;
 
+	/**
+	 * 若区域下有标签字段 则无法删除
+	 *
+	 * @return
+	 */
 	Integer queryExitArea(OnlCgformArea onlCgformArea);
 
-	/**
-	 * 列表表头中英文切换
-	 * @param cut
-	 * @return
-	 */
-	//List<Map<String,Object>> getHeader(String flag, String cut);
-
-	/**
-	 * 查询条件中英文切换
-	 * @param
-	 * @return
-	 */
-	//List<Map<String,Object>> queryCondition(String flag,String cut);
-
 	//List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper);
 
 }

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java

@@ -1,6 +1,7 @@
 package com.jero.modules.tag.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -96,10 +97,10 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	}
 
 	@Override
-	public IPage<OnlCgformTag> queryPageList(Map<String, Object> params) {
+	public IPage<OnlCgformTag> queryPageList(Map<String,Object> params) {
 		Integer pageNo = Integer.parseInt(params.get("pageNo").toString());
 		Integer pageSize = Integer.parseInt(params.get("pageSize").toString());
-		IPage page = new Page(pageNo, pageSize);
+		IPage<OnlCgformTag> page = new Page(pageNo, pageSize);
 
 		//中英切换-属性类型+展示区域列
 		if (CutEnum.CN.getValue().equals(params.get("cut").toString())) {
@@ -149,114 +150,22 @@ public class OnlCgformTagServiceImpl extends ServiceImpl<OnlCgformTagMapper, Onl
 	 */
 	@Override
 	public Integer queryExitArea(OnlCgformArea onlCgformArea) {
-		LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
+		QueryWrapper<OnlCgformTag> queryWrapper = new QueryWrapper<>();
 		if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) {
-			queryWrapper.eq(OnlCgformTag::getShowArea,onlCgformArea.getId());
+			queryWrapper.select("show_area").eq("show_area",onlCgformArea.getId());
 		}
 		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
 		return count;
-	}
-	/**
-	 * 列表表头中英文切换
-	 *
-	 * @return
-	 */
-	/*@Override
-	public List<Map<String,Object>> getHeader(String flag, String cut) {
-		List<Map<String,Object>> list = new ArrayList<>();
-		Map<String,Object> map1 = new HashMap<>();
-		Map<String,Object> map2 = new HashMap<>();
-		Map<String,Object> map3 = new HashMap<>();
-		Map<String,Object> map4 = new HashMap<>();
-		Map<String,Object> map5 = new HashMap<>();
-		Map<String,Object> map6 = new HashMap<>();
-		if (ModuleEnum.ONL_CGFORM_TAG.getValue().equals(flag)) {
-			System.out.println("走的flag=3");
-			if (CutEnum.CN.getValue().equals(cut)) {
-				System.out.println("走的cut=cn");
-				//中文名称
-				map1.put("db_field_name", "db_field_txt");//字段
-				map1.put("db_field_txt", "中文名称");//字段中文名
-				list.add(map1);
-				//英文名称
-				map2.put("db_field_name", "db_field_en_name");//字段
-				map2.put("db_field_txt", "英文名称");//字段中文名
-				list.add(map2);
-				//属性类型
-				map3.put("db_field_name", "field_show_type");//字段
-				map3.put("db_field_txt", "属性类型");//字段中文名
-				list.add(map3);
-				//字段长度
-				map4.put("db_field_name", "db_length");//字段
-				map4.put("db_field_txt", "字段长度");//字段中文名
-				list.add(map4);
-				//展示顺序
-				map5.put("db_field_name", "order_num");//字段
-				map5.put("db_field_txt", "展示顺序");//字段中文名
-				list.add(map5);
-				//展示区域
-				map6.put("db_field_name", "show_area");//字段
-				map6.put("db_field_txt", "展示区域");//字段中文名
-				list.add(map6);
-			} else {
-				System.out.println("走的cut=en");
-				//中文名称
-				map1.put("db_field_name", "db_field_txt");//字段
-				map1.put("db_field_txt", "chinese name");//字段英文名
-				list.add(map1);
-				//英文名称
-				map2.put("db_field_name", "db_field_en_name");//字段
-				map2.put("db_field_txt", "english name");//字段英文名
-				list.add(map2);
-				//属性类型
-				map3.put("db_field_name", "field_show_type");//字段
-				map3.put("db_field_txt", "attribute type");//字段英文名
-				list.add(map3);
-				//字段长度
-				map4.put("db_field_name", "db_length");//字段
-				map4.put("db_field_txt", "field length");//字段英文名
-				list.add(map4);
-				//展示顺序
-				map5.put("db_field_name", "order_num");//字段
-				map5.put("db_field_txt", "display order");//字段英文名
-				list.add(map5);
-				//展示区域
-				map6.put("db_field_name", "show_area");//字段
-				map6.put("db_field_txt", "display area");//字段英文名
-				list.add(map6);
-			}
-		}
-		return list;
-	}
-*/
-	/**
-	 * 查询条件中英文切换
-	 *
-	 * @return
-	 */
-	/*@Override
-	public List<Map<String,Object>> queryCondition(String flag, String cut) {
-		List<Map<String,Object>> list = new ArrayList<>();
-		Map<String,Object> map1 = new HashMap<>();
-		Map<String,Object> map2 = new HashMap<>();
-		if (CutEnum.CN.getValue().equals(cut)) {
-			//	map2= (Map<String, Object>) onlCgformAreaService.queryShowArea(cut,onlCgformArea);
-			map1.put("db_field_name", "show_area");//字段
-			map1.put("db_field_txt", "展示区域");//字段中文名
-			map1.put("value", String.valueOf(map2));
-			map1.put("field_show_type", "1");
-			list.add(map1);
 
-		} else {
-			//map2= (Map<String, Object>) onlCgformAreaService.queryShowArea(cut,onlCgformArea);
-			map1.put("db_field_name", "show_area");//字段
-			map1.put("db_field_txt", "display area");//字段英文名
-			map1.put("value", String.valueOf(map2));
-			map1.put("field_show_type", "1");
-			list.add(map1);
+
+
+		/*LambdaQueryWrapper<OnlCgformTag> queryWrapper = new LambdaQueryWrapper<>();
+		if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) {
+			queryWrapper.select("show_area",).eq(OnlCgformTag::getShowArea,onlCgformArea.getId());
 		}
-		return list;
-	}*/
+		Integer count = onlCgformTagMapper.selectCount(queryWrapper);
+		return count;*/
+	}
 
 /*	@Override
 	public List<Map<String, Object>> selectPageInfo(Page page, Wrapper<OnlCgformTag> queryWrapper) {