Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
6f5eebbe8e
  1. 4
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java
  2. 3
      xm-core/src/main/java/com/xm/core/service/XmMenuService.java
  3. 4
      xm-core/src/main/java/com/xm/core/service/XmQuestionService.java
  4. 3
      xm-core/src/main/java/com/xm/core/service/XmTaskService.java
  5. 3
      xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java

4
xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@ -286,7 +286,7 @@ public class XmTaskController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
xmTask.put("branchId",user.getBranchId()); xmTask.put("branchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAttDist(xmTask); List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAttDist(xmTask);
return ResponseHelper.ok("成功",datas);
return ResponseHelper.ok("ok","成功",datas);
} }
@RequestMapping(value="/getXmTaskAgeDist",method=RequestMethod.GET) @RequestMapping(value="/getXmTaskAgeDist",method=RequestMethod.GET)
@ -294,7 +294,7 @@ public class XmTaskController {
User user=LoginUtils.getCurrentUserInfo(); User user=LoginUtils.getCurrentUserInfo();
xmTask.put("branchId",user.getBranchId()); xmTask.put("branchId",user.getBranchId());
List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(xmTask); List<Map<String,Object>> datas= this.xmTaskService.getXmTaskAgeDist(xmTask);
return ResponseHelper.ok("成功",datas);
return ResponseHelper.ok("ok","成功",datas);
} }

3
xm-core/src/main/java/com/xm/core/service/XmMenuService.java

@ -302,9 +302,6 @@ public class XmMenuService extends BaseService {
xmMenuStateService.sumParents(parentMenu); xmMenuStateService.sumParents(parentMenu);
} }
public void editSomeFields(Map<String, Object> xmMenuMap) {
super.update("editSomeFields",xmMenuMap);
}
public List<XmMenu> selectListByIdsWithsChildrenCnt(List<String> ids) { public List<XmMenu> selectListByIdsWithsChildrenCnt(List<String> ids) {
return super.selectList("selectListByIdsWithsChildrenCnt",ids); return super.selectList("selectListByIdsWithsChildrenCnt",ids);

4
xm-core/src/main/java/com/xm/core/service/XmQuestionService.java

@ -197,9 +197,7 @@ public class XmQuestionService extends BaseService {
} }
this.update("updateProcessApprova", flowVars); this.update("updateProcessApprova", flowVars);
} }
public void editSomeFields(Map<String, Object> xmMenuMap) {
super.update("editSomeFields",xmMenuMap);
}
public List<Map<String, Object>> getXmQuestionAttDist(Map<String, Object> xmQuestion) { public List<Map<String, Object>> getXmQuestionAttDist(Map<String, Object> xmQuestion) {
return super.selectList("getXmQuestionAttDist",xmQuestion); return super.selectList("getXmQuestionAttDist",xmQuestion);

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

@ -722,9 +722,6 @@ public class XmTaskService extends BaseService {
super.update("updateActCostAndActWorkloadAfterSettle",map("id",taskId,"taskState",toTaskState)); super.update("updateActCostAndActWorkloadAfterSettle",map("id",taskId,"taskState",toTaskState));
} }
public void editSomeFields(Map<String, Object> xmTaskMap) {
super.update("editSomeFields",xmTaskMap);
}
public void calcWorkloadByRecord(String id) { public void calcWorkloadByRecord(String id) {
if(!StringUtils.hasText(id)){ if(!StringUtils.hasText(id)){
return; return;

3
xm-core/src/main/java/com/xm/core/service/XmTaskWorkloadService.java

@ -50,9 +50,6 @@ public class XmTaskWorkloadService extends BaseService {
} }
public void editSomeFields(Map<String, Object> xmTaskWorkloadMap) {
super.update("editSomeFields",xmTaskWorkloadMap);
}
public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmTaskWorkload) { public List<Map<String, Object>> listProjectWorkloadSetDay(Map<String, Object> xmTaskWorkload) {
return super.selectList("listProjectWorkloadSetDay",xmTaskWorkload); return super.selectList("listProjectWorkloadSetDay",xmTaskWorkload);

Loading…
Cancel
Save