添加节点类型、标签等

xm-core/src/main/java/com/xm/core/ctrl/XmBranchStateController.java

@@ -4,6 +4,8 @@ import com.mdp.core.entity.Tips;
 import com.mdp.core.err.BizException;
 import com.mdp.core.utils.RequestUtils;
 import com.mdp.mybatis.PageUtils;
+import com.mdp.safe.client.entity.User;
+import com.mdp.safe.client.utils.LoginUtils;
 import com.xm.core.entity.XmBranchState;
 import com.xm.core.service.XmBranchStateService;
 import io.swagger.annotations.*;
@@ -134,6 +136,23 @@ public class XmBranchStateController {
 		return m;
 	}
 
+	@ApiOperation( value = "查询前后两周每日任务变化数量",notes="listXmBranchState,条件之间是 and关系,模糊查询写法如 {studentName:'%才哥%'}")
+
+	@ApiResponses({
+			@ApiResponse(code = 200,response= XmBranchState.class,message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'错误码'},pageInfo:{total:总记录数},data:[数据对象1,数据对象2,...]}")
+	})
+	@RequestMapping(value="/list/tasksSumDw",method=RequestMethod.GET)
+	public Map<String,Object> tasksSumDw(){
+		Map<String,Object> m = new HashMap<>();
+		User user= LoginUtils.getCurrentUserInfo();
+		List<Map<String,Object>>	xmBranchStateList = xmBranchStateService.tasksSumDw(user.getBranchId());	//列出XmBranchState列表
+		PageUtils.responePage(m, xmBranchStateList);
+		m.put("data",xmBranchStateList);
+		Tips tips=new Tips("查询成功");
+		m.put("tips", tips);
+		return m;
+	}
+
 	@ApiOperation( value = "从项目汇总表汇总数据到机构汇总表",notes="")
 	@ApiResponses({
 		@ApiResponse(code = 200, message = "{tips:{isOk:true/false,msg:'成功/失败原因',tipscode:'失败时错误码'}}")

xm-core/src/main/java/com/xm/core/service/XmBranchStateService.java

@@ -23,6 +23,10 @@ public class XmBranchStateService extends BaseService {
 		return this.selectList("listPortalAllXmBranchSumState",xmBranchState);
     }
 
+    public List<Map<String, Object>> tasksSumDw(String branchId) {
+	    return super.selectList("tasksSumDw",branchId);
+    }
+
     /** 请在此类添加自定义函数 */
 
 }

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

@@ -265,6 +265,10 @@ public class XmTaskService extends BaseService {
 		XmTask xmTask2=new XmTask();
 		xmTask2.setId(xmTask.getId());
 		xmTask2.setRate(xmTask.getRate());
+		if(xmTaskDb.getBudgetWorkload()==null){
+			xmTaskDb.setBudgetWorkload(BigDecimal.ZERO);
+		}
+		xmTask2.setActWorkload(xmTaskDb.getBudgetWorkload().multiply(xmTask.getRate()).divide(BigDecimal.valueOf(100)));
 		this.updateSomeFieldByPk(xmTask);
 
 		if(StringUtils.hasText(xmTaskDb.getParentTaskid())){

xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmBranchStateMapper.xml

@@ -70,6 +70,10 @@
 		 {call load_project_state_to_xm_branch_state(#{branchId,mode=IN})}
 	</update>
 
+	<select id="tasksSumDw" parameterType="String" resultType="HashMap">
+		select  from xm_task t where t.branch_id=#{branchId}
+
+	</select>
 	<!--结束 自定义sql函数区域-->