From 60bd61993b51fd8958d5324b20a934734d7dcd1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 21 Feb 2022 10:43:21 +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/service/XmTaskService.java | 2 +- .../mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml | 2 +- .../main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 464d095a..2fac2aef 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 @@ -200,7 +200,7 @@ public class XmTaskService extends BaseService { if(checkExistsChildren(xmTask.getId())) { throw new BizException("有子任务，不允许删除"); } - if(checkExistsExecuser(xmTask.getId())>0) { + if(!"1".equals(xmTask.getNtype()) && checkExistsExecuser(xmTask.getId())>0) { throw new BizException("有未结算的执行人，不允许删除该任务"); } this.deleteByPk(xmTask); diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml index ba6b2fd4..bf9f2994 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectPhaseMapper.xml @@ -105,7 +105,7 @@ sum(t.phase_act_workload) as phase_act_workload, sum(t.act_inner_user_at) as act_inner_user_at, sum(t.act_out_user_at) as act_out_user_at, - sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0))/100/ifnull(sum(ifnull(t.task_budget_workload,0.000001)),999999) as act_rate, + sum(ifnull(t.act_rate,0)*ifnull(t.task_budget_workload,0))/ifnull(sum(ifnull(t.task_budget_workload,0.000001)),999999) as act_rate, sum(t.task_budget_workload) as task_budget_workload, sum(t.task_budget_at) as task_budget_at FROM xm_project_phase t diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml index ac1133f3..7009860c 100644 --- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml +++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskMapper.xml @@ -192,7 +192,7 @@ sum( ifnull( t.budget_workload, 0 ) ) AS budget_workload, sum( ifnull( t.act_cost, 0 ) ) AS act_cost, sum( ifnull( t.act_workload, 0 ) ) AS act_workload, - sum( ifnull( t.budget_workload, 0 ) * ifnull( t.rate, 0 ) )/100 / sum( ifnull( t.budget_workload, 0.00001 ) ) AS rate, + sum( ifnull( t.budget_workload, 0 ) * ifnull( t.rate, 0 ) ) / sum( ifnull( t.budget_workload, 0.00001 ) ) AS rate, min( t.start_time ) AS start_time, max( t.end_time ) AS end_time, min( t.act_start_time ) AS act_start_time,