Merge remote-tracking branch 'origin/dev_v1.0.0' into dev_v1.0.0

sop-api/src/main/java/com/qmth/sop/server/api/ServiceAnalyseController.java

@@ -46,7 +46,7 @@ public class ServiceAnalyseController {
 
 
     //服务单元列表
-   
+    
     @ApiOperation(value = "服务单元列表接口")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "服务单元列表", response = TBService.class)})
@@ -66,7 +66,7 @@ public class ServiceAnalyseController {
      * ⑥以上指标都不需提供【数据下钻】；
      */
 
-   
+    
     @ApiOperation(value = "服务单元概览接口")
     @RequestMapping(value = "/overview", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "服务单元概览", response = Map.class)})
@@ -82,7 +82,7 @@ public class ServiceAnalyseController {
      * ③供应商：点击供应商，显示当前供应商在该服务单元下的派单项目明细；明细表需要增加“服务单元”、“供应商”字段；
      */
 
-   
+    
     @ApiOperation(value = "人力供应商项目数量分布及占比")
     @RequestMapping(value = "/supplier", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "人力供应商项目数量分布及占比", response = Map.class)})
@@ -96,7 +96,7 @@ public class ServiceAnalyseController {
      * ③供应商：点击供应商，显示当前供应商在该服务单元下的派单项目明细；明细表需要增加“服务单元”、“供应商”字段；
      */
 
-   
+    
     @ApiOperation(value = "派单明细")
     @RequestMapping(value = "/supplier/detail", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "派单明细", response = TBCrmResult.class)})
@@ -116,7 +116,7 @@ public class ServiceAnalyseController {
      * ③覆盖大区：统计当前服务单元下该供应商区域协调人负责的项目覆盖的大区数量及明细；
      */
 
-   
+    
     @ApiOperation(value = "人力供应商项目角色人员分布")
     @RequestMapping(value = "/supplier/role", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "人力供应商项目角色人员分布", response = Map.class)})
@@ -130,7 +130,7 @@ public class ServiceAnalyseController {
     /**
      * * ③覆盖大区：统计当前服务单元下该供应商区域协调人负责的项目覆盖的大区数量及明细；
      */
-   
+    
     @ApiOperation(value = "人力供应商覆盖大区")
     @RequestMapping(value = "/supplier/region", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "人力供应商覆盖大区", response = Map.class)})
@@ -143,7 +143,7 @@ public class ServiceAnalyseController {
     /**
      * 统计当前服务单元下该供应商区域协调人负责的项目覆盖的大区明细；
      */
-   
+    
     @ApiOperation(value = "人力供应商覆盖大区明细")
     @RequestMapping(value = "/supplier/region/detail", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "人力供应商覆盖大区", response = Map.class)})
@@ -154,14 +154,14 @@ public class ServiceAnalyseController {
         map.put("projectRoleQuota", serviceAnalyseService.findCrmAllocationSubTotal(serviceUnitId,province,supplierId));
         List<UserArchivesAllocationResult> crmAllocation = serviceAnalyseService.findCrmAllocation(serviceUnitId, province, supplierId);
         map.put("projectWait", crmAllocation.stream().filter(e->e.getDistributed()<e.getQuota()).count());
-        map.put("regionCities", crmAllocation.stream().collect(Collectors.groupingBy(UserArchivesAllocationResult::getCity, Collectors.counting())));
+        map.put("regionCities", crmAllocation.stream().collect(Collectors.groupingBy(UserArchivesAllocationResult::getCity)).size());
         return ResultUtil.ok(map);
     }
 
     /**
      * 7.项目调配完成进度=（差额为0的派单总数÷派单总数）×100%；不提供【数据下钻】
      */
-   
+    
     @ApiOperation(value = "项目调配完成进度")
     @RequestMapping(value = "/project/allocation", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "项目调配完成进度", response = Long.class) })
@@ -173,7 +173,7 @@ public class ServiceAnalyseController {
     /**
      * 8.人员配额完成进度=（已分配人员数量÷总配额）×100%；不提供【数据下钻】
      */
-   
+    
     @ApiOperation(value = "人员配额完成进度")
     @RequestMapping(value = "/personnel/quota", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "人员配额完成进度", response = Long.class)})
@@ -187,7 +187,7 @@ public class ServiceAnalyseController {
     /**
      * 9.设备供应商设备使用占比：当前服务单元下各设备供应商提供已出库尚未出库的设备的数量及占比；
      */
-   
+    
     @ApiOperation(value = "设备供应商设备使用占比")
     @RequestMapping(value = "/device/use", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "设备供应商设备使用占比", response = Map.class)})
@@ -202,7 +202,7 @@ public class ServiceAnalyseController {
      * 10.大区服务人数分布及对比：
      *①当前服务单元下各大区在服务人员的数量分布及对比。单个柱形图可按供应商占比分颜色展示占比。
      */
-   
+    
     @ApiOperation(value = "大区服务人数分布及对比")
     @RequestMapping(value = "/region/personnel", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "大区服务人数分布及对比", response = Map.class)})