From 796997ccae3c592d6335735699abddcad28bfc87 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Wed, 13 Apr 2022 13:45:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=8F=90=E7=A4=BA=E8=AF=AD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProjectTaskPlanningServiceImpl.java | 39 ++++++++++++++- .../controller/OnlCgformAreaController.java | 38 ++++++++++---- .../controller/OnlCgformTagController.java | 50 ++++++++++++++++--- .../modules/tag/entity/OnlCgformArea.java | 3 ++ .../jero/modules/tag/entity/OnlCgformTag.java | 3 ++ 5 files changed, 115 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java index 132d0fc48..ba61bb6cf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskPlanningServiceImpl.java @@ -6,7 +6,10 @@ import com.jero.modules.project.mapper.ProjectTaskPlanningMapper; import com.jero.modules.project.service.IProjectTaskPlanningService; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Map; /** * @Description: 法规/认证任务计划 (各阶段确认进度) 表 @@ -64,14 +67,46 @@ public class ProjectTaskPlanningServiceImpl extends ServiceImpl> list = new ArrayList<>(); + /* for (ProjectTaskPlanning plann : dateList) { + Map map = new HashMap<>(); + if ("file_name".equals(onlCgformField.getDbFieldName())) { + //跳转详情的标识 + map.put("click", "true"); + } + }*/ + + + + for(int i=dateList.size();i>0;i++){ + + } + return getById(projectId); } /** diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 9e9615344..5226d90a6 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -91,12 +91,11 @@ public class OnlCgformAreaController extends JeroController add(@Validated @RequestBody OnlCgformArea onlCgformArea, - @RequestParam(name="cut",required=true) String cut) { + public Result add(@Validated @RequestBody OnlCgformArea onlCgformArea) { int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); if (count > 0) { - //中英切换-属性类型+展示区域列 - if(CutEnum.CN.getValue().equals(cut)) { + //中英切换提示语 + if(CutEnum.CN.getValue().equals("cut")) { return Result.error("同一所属模块下,展示区域名称不能重复！"); }else{ return Result.error("Under the same module, the display area name cannot be duplicate!"); @@ -121,7 +120,12 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); if (count > 0) { - return Result.error("同一所属模块下,展示区域名称不能重复！"); + //中英切换提示语 + if(CutEnum.CN.getValue().equals("cut")) { + return Result.error("同一所属模块下,展示区域名称不能重复！"); + }else{ + return Result.error("Under the same module, the display area name cannot be duplicate!"); + } }else { onlCgformAreaService.editById(onlCgformArea); return Result.OK("编辑成功！"); @@ -138,11 +142,17 @@ public class OnlCgformAreaController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestParam(name="id",required=true) String id, + @RequestParam(name="cut",required=true) String cut) { OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); int count=onlCgformTagService.queryExitArea(onlCgformArea); if (count > 0) { - return Result.error("该“展示区域”有关联数据，无法删除！"); + //中英切换提示语 + if(CutEnum.CN.getValue().equals("cut")) { + return Result.error("该展示区域有关联数据，无法删除！"); + }else{ + return Result.error("This exhibition area has associated data and cannot be deleted!"); + } }else { onlCgformAreaService.deleteById(id); return Result.OK("删除成功!"); @@ -176,7 +186,12 @@ public class OnlCgformAreaController extends JeroController queryById(@RequestParam(name="id",required=true) String id) { OnlCgformArea onlCgformArea = onlCgformAreaService.queryById(id); if(onlCgformArea==null) { - return Result.error("未找到对应数据"); + //中英切换提示语 + if(CutEnum.CN.getValue().equals("cut")) { + return Result.error("未找到对应数据"); + }else{ + return Result.error("No corresponding data was found."); + } } return Result.OK(onlCgformArea); } @@ -216,7 +231,12 @@ public class OnlCgformAreaController extends JeroController selectShowAreaById(@RequestParam(name="id",required=true) String id) { OnlCgformArea onlCgformArea = (OnlCgformArea) onlCgformAreaService.selectShowAreaById(id); if(onlCgformArea==null) { - return Result.error("未找到对应数据"); + //中英切换提示语 + if(CutEnum.CN.getValue().equals("cut")) { + return Result.error("未找到对应数据"); + }else{ + return Result.error("No corresponding data was found."); + } } return Result.OK(onlCgformArea); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java index 0a8b42251..ce94c69dc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.constant.CommonConstant; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; @@ -125,7 +126,12 @@ public class OnlCgformTagController extends JeroController edit(@Validated @RequestBody OnlCgformTag onlCgformTag) { checkData(); if (FixedFieldEnum.FIXED_FIELD_ENUM.getValue().equals(onlCgformTag.getIsReadOnly()) || FixedFieldEnum.CONFIGURABLE_FIELD.getValue().equals(onlCgformTag.getIsReadOnly())) { - return Result.error("固定字段,不可修改"); + //中英切换提示语 + if(CutEnum.CN.getValue().equals("cut")) { + return Result.error("固定字段,不可修改"); + }else{ + return Result.error("Fixed field, which cannot be modified."); + } }else { QueryWrapper queryWrapper=new QueryWrapper<>(); //查询同一模块下,同名数据 @@ -179,7 +190,12 @@ public class OnlCgformTagController extends JeroController改变状态,数据库不删 @@ -287,15 +308,30 @@ public class OnlCgformTagController extends JeroController改变状态,数据库不删 - result.success("批量删除成功!"); + //中英切换提示语 + if(CutEnum.CN.getValue().equals("cut")) { + result.success("批量删除成功!"); + }else{ + result.success("Batch deletion succeeded!"); + } } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java index 2a7611c34..c8bf8f4ea 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/entity/OnlCgformArea.java @@ -74,4 +74,7 @@ public class OnlCgformArea implements Serializable { /**排序号*/ private java.lang.Integer sort; + + @TableField(exist = false) + private String cut; } 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 a6073f8f8..4efedb3e0 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 @@ -149,6 +149,9 @@ public class OnlCgformTag implements Serializable { /**数据库字段类型*/ private String dbType; + @TableField(exist = false) + private String cut; + public OnlCgformTag() { } }