添加节点类型、标签等

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

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

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}

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