Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
87f80093fd
  1. 7
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java
  2. 7
      xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java
  3. 3
      xm-core/src/main/java/com/xm/core/service/XmMenuPlanService.java
  4. 1
      xm-core/src/main/java/com/xm/core/service/XmMenuStateService.java

7
xm-core/src/main/java/com/xm/core/ctrl/XmMenuPlanController.java

@ -127,16 +127,11 @@ public class XmMenuPlanController {
Map<String,Object> 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){
if(xmMenuPlanService.countByWhere(xmMenuPlan)>0){
tips.setFailureMsg("编号重复,请修改编号再提交");
m.put("tips", tips);
return m;
}
}
xmMenuPlanService.insert(xmMenuPlan);
m.put("data",xmMenuPlan);
}catch (BizException e) {

7
xm-core/src/main/java/com/xm/core/ctrl/XmMenuStateController.java

@ -122,16 +122,11 @@ public class XmMenuStateController {
Map<String,Object> 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){
if(xmMenuStateService.countByWhere(xmMenuState)>0){
tips.setFailureMsg("编号重复,请修改编号再提交");
m.put("tips", tips);
return m;
}
}
xmMenuStateService.insert(xmMenuState);
m.put("data",xmMenuState);
}catch (BizException e) {

3
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 {
/**
* 计算bugtask测试案例等数据
* @param productId
* @param projectId
* @return
*/
public int loadTasksToXmMenuPlan(String projectId) {

1
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());

Loading…
Cancel
Save