From 87f80093fdc779522548e96fdc1ebb5aa6ea7da9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 24 Feb 2022 00:01:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/ctrl/XmMenuPlanController.java | 13 ++++--------- .../com/xm/core/ctrl/XmMenuStateController.java | 13 ++++--------- .../java/com/xm/core/service/XmMenuPlanService.java | 3 +-- .../com/xm/core/service/XmMenuStateService.java | 1 - 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java index 86cf8e85..52e5551d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java @@ -127,15 +127,10 @@ public class XmMenuPlanController { Map m = new HashMap<>(); Tips tips=new Tips("成功新增一条数据"); try{ - if(StringUtils.isEmpty(xmMenuPlan.getId())) { - xmMenuPlan.setId(xmMenuPlanService.createKey("id")); - }else{ - XmMenuPlan xmMenuPlanQuery = new XmMenuPlan(xmMenuPlan.getId()); - if(xmMenuPlanService.countByWhere(xmMenuPlanQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; - } + if(xmMenuPlanService.countByWhere(xmMenuPlan)>0){ + tips.setFailureMsg("编号重复，请修改编号再提交"); + m.put("tips", tips); + return m; } xmMenuPlanService.insert(xmMenuPlan); m.put("data",xmMenuPlan); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java index 1f213b2e..da9413c9 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java @@ -122,15 +122,10 @@ public class XmMenuStateController { Map m = new HashMap<>(); Tips tips=new Tips("成功新增一条数据"); try{ - if(StringUtils.isEmpty(xmMenuState.getId())) { - xmMenuState.setId(xmMenuStateService.createKey("id")); - }else{ - XmMenuState xmMenuStateQuery = new XmMenuState(xmMenuState.getId()); - if(xmMenuStateService.countByWhere(xmMenuStateQuery)>0){ - tips.setFailureMsg("编号重复，请修改编号再提交"); - m.put("tips", tips); - return m; - } + if(xmMenuStateService.countByWhere(xmMenuState)>0){ + tips.setFailureMsg("编号重复，请修改编号再提交"); + m.put("tips", tips); + return m; } xmMenuStateService.insert(xmMenuState); m.put("data",xmMenuState); diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java index 7094113c..1d20ef2d 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java @@ -59,7 +59,6 @@ public class XmMenuPlanService extends BaseService { plan.setProjectId(projectId); plan.setMenuId(xmMenu.getMenuId()); plan.setMenuName(xmMenu.getMenuName()); - plan.setId(this.createKey("id")); plan.setPlanStartTime(new Date()); plan.setCtime(new Date()); plan.setLtime(new Date()); @@ -76,7 +75,7 @@ public class XmMenuPlanService extends BaseService { /** * 计算bug、task、测试案例、等数据 - * @param productId + * @param projectId * @return */ public int loadTasksToXmMenuPlan(String projectId) { diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java index 6f0342f3..f330e0b5 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java @@ -64,7 +64,6 @@ public class XmMenuStateService extends BaseService { state.setProductId(productId); state.setMenuId(xmMenu.getMenuId()); state.setMenuName(xmMenu.getMenuName()); - state.setId(this.createKey("id")); state.setPlanStartTime(new Date()); state.setCtime(new Date()); state.setLtime(new Date());