From a809b3280e818a37a26613ae7aeb51faebca288d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 28 Feb 2022 23:42:33 +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

---
 .../com/xm/core/ctrl/XmProjectGroupController.java  |  8 ++++++++
 .../java/com/xm/core/ctrl/XmTaskController.java     | 13 +++++++++----
 .../mapper/xm/core/dao/XmProjectGroupMapper.xml     |  3 ++-
 .../mybatis/mapper/xm/core/dao/XmTaskMapper.xml     |  7 +++++--
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
index 48826a06..4a92adf7 100644
--- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
+++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupController.java
@@ -193,6 +193,14 @@ public class XmProjectGroupController {
 		Map<String,Object> m = new HashMap<>(); 
 		RequestUtils.transformArray(xmProjectGroup, "ids");
 		PageUtils.startPage(xmProjectGroup);
+		User user=LoginUtils.getCurrentUserInfo();
+		String projectId= (String) xmProjectGroup.get("projectId");
+		String productId= (String) xmProjectGroup.get("productId");
+		String iterationId= (String) xmProjectGroup.get("iterationId");
+		if(!StringUtils.hasText(projectId) && !StringUtils.hasText(productId) && !StringUtils.hasText(iterationId)){
+			xmProjectGroup.put("branchId",user.getBranchId());
+			xmProjectGroup.put("orCrowBranchId",user.getBranchId());
+		}
 		List<Map<String,Object>>	xmProjectGroupList = xmProjectGroupService.selectListMapByWhere(xmProjectGroup);	//列出XmProjectGroup列表
 		PageUtils.responePage(m, xmProjectGroupList);
 		m.put("data",xmProjectGroupList);
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 781750fd..e974aed0 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
@@ -348,11 +348,16 @@ public class XmTaskController {
 				xmTaskVo.setMilestone("0");
 			} 
 			String projectPhaseId=xmTaskVo.getProjectPhaseId();
+			if(xmTaskVo.getBudgetCost()==null){
+				xmTaskVo.setBudgetCost(BigDecimal.ZERO);
+			}
 			this.xmTaskService.parentIdPathsCalcBeforeSave(xmTaskVo);
-			if(xmTaskVo.getLvl()<=1){
-				tips=xmTaskService.judgetPhaseBudget(projectPhaseId, xmTaskVo.getBudgetCost(),null,null,null,null);
-			}else{
-				tips=xmTaskService.judgetTaskBudget(xmTaskVo.getParentTaskid(), xmTaskVo.getBudgetCost(),null,null,null,null);
+			if(xmTaskVo.getBudgetCost()!=null  && xmTaskVo.getBudgetCost().compareTo(BigDecimal.ZERO)>0){
+				if(xmTaskVo.getLvl()<=1){
+					tips=xmTaskService.judgetPhaseBudget(projectPhaseId, xmTaskVo.getBudgetCost(),null,null,null,null);
+				}else{
+					tips=xmTaskService.judgetTaskBudget(xmTaskVo.getParentTaskid(), xmTaskVo.getBudgetCost(),null,null,null,null);
+				}
 			}
 			if(tips.isOk()) {
 				xmTaskVo = xmTaskService.addTask(xmTaskVo);
diff --git a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
index d6ea522b..a6ddae7e 100644
--- a/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
+++ b/xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmProjectGroupMapper.xml
@@ -11,7 +11,8 @@
                  ( #{item})
              </foreach>
          </if>
-        <if test="key != null and key !='' ">       </if>
+        <if test="key != null and key !='' ">    and res.group_name like concat('%',#{key},'%')   </if>
+		<if test="orCrowBranchId!=null and orCrowBranchId!=''"> and (res.branch_id=#{branchId} or res.crow_branch_id=#{orCrowBranchId})</if>
     </sql>
 	<delete id="deleteByProjectId" parameterType="com.xm.core.entity.XmProjectGroup">
 		delete from xm_project_group where project_id = #{projectId}
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 e8e3256d..d3361c01 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
@@ -263,8 +263,11 @@
 		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 ) ) as budget_workload_rate,
-		min( t.act_start_time ) AS act_start_time,
-		max( t.act_end_time ) AS act_end_time
+			sum( ifnull( t.budget_workload, 0 )) as budget_workload,
+			min( t.act_start_time ) AS act_start_time,
+			max( t.act_end_time ) AS act_end_time,
+			min( t.start_time ) AS start_time,
+			max( t.end_time ) AS end_time
 		FROM
 		xm_task t
 		WHERE