Browse Source

添加节点类型、标签等

master
陈裕财 4 years ago
parent
commit
d9e78514c4
  1. 1
      xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java
  2. 2
      xm-core/src/main/resources/mybatis/mapper/xm/core/dao/XmTaskWorkloadMapper.xml

1
xm-core/src/main/java/com/xm/core/ctrl/XmTaskWorkloadController.java

@ -486,6 +486,7 @@ public class XmTaskWorkloadController {
} }
if(canChanges.size()>0){ if(canChanges.size()>0){
xmTaskWorkloadMap.put("ids",canChanges.stream().map(i->i.getId()).collect(Collectors.toList()));
Set<String> fieldKey=xmTaskWorkloadMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet()); Set<String> fieldKey=xmTaskWorkloadMap.keySet().stream().filter(i-> fieldsMap.containsKey(i)).collect(Collectors.toSet());
fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTaskWorkloadMap.get(i) )).collect(Collectors.toSet()); fieldKey=fieldKey.stream().filter(i->!StringUtils.isEmpty(xmTaskWorkloadMap.get(i) )).collect(Collectors.toSet());

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

@ -88,7 +88,7 @@
<select id="listProjectWorkloadSetMonth" parameterType="HashMap" resultType="HashMap"> <select id="listProjectWorkloadSetMonth" parameterType="HashMap" resultType="HashMap">
select select
SUBSTRING(res.biz_date, 0,8) as biz_month,res.project_id,
SUBSTRING(res.biz_date, 1,7) as biz_month,res.project_id,
sum(ifnull(res.workload,0)) as workload, sum(ifnull(res.workload,0)) as workload,
sum(if(res.wstatus='0',ifnull(res.workload,0),0)) as to_confirm_workload, sum(if(res.wstatus='0',ifnull(res.workload,0),0)) as to_confirm_workload,
sum(if(res.wstatus='1',ifnull(res.workload,0),0)) as had_confirm_workload, sum(if(res.wstatus='1',ifnull(res.workload,0),0)) as had_confirm_workload,

Loading…
Cancel
Save