Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
632ec76dc7
  1. 2
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 2
      xm-core/src/main/java/com/xm/core/service/XmProductService.java
  3. 3
      xm-core/src/main/java/com/xm/core/service/XmProjectService.java
  4. 4
      xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
  5. 4
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java

2
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -336,7 +336,7 @@ public class XmTaskController {
xmTaskVo.setCdeptid(user.getDeptid());
xmTaskVo.setRate(BigDecimal.ZERO);
xmTaskVo.setRate(0);
if( !StringUtils.hasText(xmTaskVo.getMilestone()) ){
xmTaskVo.setMilestone("0");
}

2
xm-core/src/main/java/com/xm/core/service/XmProductService.java

@ -194,7 +194,7 @@ public class XmProductService extends BaseService {
node.setMenuId(newMenuIdMap.get(node.getMenuId()));
node.setExeUsernames(null);
node.setExeUserids(null);
node.setRate(BigDecimal.ZERO);
node.setRate(0);
node.setActEndTime(null);
node.setActStartTime(null);
node.setExecutorUserid(null);

3
xm-core/src/main/java/com/xm/core/service/XmProjectService.java

@ -142,10 +142,9 @@ public class XmProjectService extends BaseService {
node.setMenuId(null);
node.setMenuName(null);
node.setProductId(null);
node.setProductName(null);
node.setExeUsernames(null);
node.setExeUserids(null);
node.setRate(BigDecimal.ZERO);
node.setRate(0);
node.setActEndTime(null);
node.setActStartTime(null);
node.setExecutorUserid(null);

4
xm-core/src/main/java/com/xm/core/service/XmQuestionService.java

@ -84,14 +84,12 @@ public class XmQuestionService extends BaseService {
User currentUser=LoginUtils.getCurrentUserInfo();
XmQuestion xmQuestion = new XmQuestion();
xmQuestion.setId(xmQuestionVo.getId());
xmQuestion.setTaskId(xmQuestionVo.getTaskId());
xmQuestion.setTaskName(xmQuestionVo.getTaskName());
xmQuestion.setHandlerUserid(xmQuestionVo.getHandlerUserid());
xmQuestion.setHandlerUsername(xmQuestionVo.getHandlerUsername());
xmQuestion.setBugStatus(xmQuestionVo.getTardgetBugStatus());
xmQuestion.setLtime(new Date());
xmQuestion.setLremark(xmQuestionVo.getReceiptMessage());
xmQuestion.setRemarks(xmQuestionVo.getReceiptMessage());
this.updateSomeFieldByPk(xmQuestion);

4
xm-core/src/main/java/com/xm/core/service/XmTaskService.java

@ -189,7 +189,7 @@ public class XmTaskService extends BaseService {
xmTaskVo.setCreateUserid(user.getUserid());
xmTaskVo.setCreateUsername(user.getUsername());
xmTaskVo.setCreateTime(new Date());
xmTaskVo.setRate(BigDecimal.ZERO);
xmTaskVo.setRate(0);
xmTaskVo.setSortLevel(xmTaskVo.getSortLevel());
if(StringUtils.isEmpty(xmTaskVo.getMilestone())){
xmTaskVo.setMilestone("0");
@ -268,7 +268,7 @@ public class XmTaskService extends BaseService {
if(xmTaskDb.getBudgetWorkload()==null){
xmTaskDb.setBudgetWorkload(BigDecimal.ZERO);
}
xmTask2.setActWorkload(xmTaskDb.getBudgetWorkload().multiply(xmTask.getRate()).divide(BigDecimal.valueOf(100)));
xmTask2.setActWorkload(xmTaskDb.getBudgetWorkload().multiply(BigDecimal.valueOf(xmTask.getRate())).divide(BigDecimal.valueOf(100)));
this.updateSomeFieldByPk(xmTask);
if(StringUtils.hasText(xmTaskDb.getParentTaskid())){

Loading…
Cancel
Save