From 632ec76dc73b11c3abcf4b4ab569eff4412d395e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 28 Mar 2022 02:48:13 +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 --- xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java | 2 +- .../src/main/java/com/xm/core/service/XmProductService.java | 2 +- .../src/main/java/com/xm/core/service/XmProjectService.java | 3 +-- .../src/main/java/com/xm/core/service/XmQuestionService.java | 4 +--- xm-core/src/main/java/com/xm/core/service/XmTaskService.java | 4 ++-- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index 4985014d..ffd37787 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/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"); } diff --git a/xm-core/src/main/java/com/xm/core/service/XmProductService.java b/xm-core/src/main/java/com/xm/core/service/XmProductService.java index 5968824d..dc177bc8 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProductService.java +++ b/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); diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index da295768..7528c987 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/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); diff --git a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java b/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java index c6011735..1000133b 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmQuestionService.java +++ b/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); diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index 84490017..250f66cc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/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())){