fix

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

@@ -120,7 +120,7 @@ public class ServiceAnalyseController {
     @RequestMapping(value = "/supplier/region", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "人力供应商覆盖大区", response = Map.class)})
     public Result region(@ApiParam(value = "服务单元", required = true) @RequestParam Long serviceUnitId,
-                         @ApiParam(value = "供应商", required = true) @RequestParam Long supplierId) {
+                         @ApiParam(value = "供应商", required = false) @RequestParam(required = false) Long supplierId) {
         List<Map<String, Object>> list = serviceAnalyseService.supplierRegion(serviceUnitId, supplierId);
         return ResultUtil.ok(list);
     }
@@ -135,7 +135,7 @@ public class ServiceAnalyseController {
                                @ApiParam(value = "供应商", required = true) @RequestParam Long supplierId,
                                @ApiParam(value = "大区", required = true) @RequestParam Long regionId) {
         Map<String, Object> map = new HashMap<>();
-        map.put("projectRoleQuota", serviceAnalyseService.findCrmAllocationSubTotal(serviceUnitId, regionId, supplierId));
+        map.put("projectRoleQuota", serviceAnalyseService.findCrmAllocationSubTotal(serviceUnitId, regionId, null));
         List<UserArchivesAllocationResult> crmAllocation = serviceAnalyseService.findCrmAllocation(serviceUnitId, regionId, supplierId);
         map.put("projectWait", crmAllocation.stream().filter(e -> e.getDistributed() < e.getQuota()).count());
         map.put("regionCities", crmAllocation.stream().collect(Collectors.groupingBy(UserArchivesAllocationResult::getCity)).size());

sop-business/src/main/resources/mapper/ServiceAnalyseMapper.xml

@@ -210,23 +210,23 @@
     </select>
     <select id="supplierRegion" resultType="java.util.Map">
         SELECT DISTINCT
-        r.id region_id,
+        cast(r.id as char) as region_id,
         r.region_name
         FROM
         t_b_crm c
         LEFT JOIN t_b_service_region r ON c.service_id = r.service_id
-        LEFT JOIN sys_user u ON u.id = c.region_coordinator_id
-        LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number
-        LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id
-        LEFT JOIN sys_supplier su ON su.id = us.supplier_id
+<!--        LEFT JOIN sys_user u ON u.id = c.region_coordinator_id-->
+<!--        LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number-->
+<!--        LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id-->
+<!--        LEFT JOIN sys_supplier su ON su.id = us.supplier_id-->
         <where>
             and r.id IS NOT NULL
             <if test="serviceUnitId != null and serviceUnitId != ''">
                 and c.service_id = #{serviceUnitId}
             </if>
-            <if test="supplierId != null and supplierId != ''">
-                and us.supplier_id = #{supplierId}
-            </if>
+<!--            <if test="supplierId != null and supplierId != ''">-->
+<!--                and us.supplier_id = #{supplierId}-->
+<!--            </if>-->
         </where>
     </select>
     <select id="findCrmAllocation"
@@ -271,7 +271,7 @@
         t_b_crm tbc
 
         LEFT JOIN t_b_service tbs ON tbc.service_id = tbs.id
-        LEFT JOIN t_b_service_region r ON tbc.service_id = r.service_id
+        LEFT JOIN t_b_service_region r ON tbs.id = r.service_id
         LEFT JOIN sys_user u ON u.id = tbc.region_coordinator_id
         LEFT JOIN t_b_user_archives ua ON u.mobile_number = ua.mobile_number
         LEFT JOIN t_b_user_archives_supplier us ON us.user_archives_id = ua.id