fix:

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

@@ -3,12 +3,15 @@ package com.qmth.sop.server.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.constant.ApiConstant;
-import com.qmth.sop.common.annotation.OperationLog;
 import com.qmth.sop.business.bean.result.DingElementResult;
+import com.qmth.sop.business.bean.result.ServiceRegionDetailResult;
 import com.qmth.sop.business.bean.result.TBCrmResult;
 import com.qmth.sop.business.entity.TBCrm;
 import com.qmth.sop.business.service.TBCrmService;
+import com.qmth.sop.business.service.TBServiceRegionDetailService;
+import com.qmth.sop.common.annotation.OperationLog;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.LogTypeEnum;
 import com.qmth.sop.common.enums.ProductTypeEnum;
@@ -22,6 +25,8 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * 派单信息表 控制器
@@ -40,6 +45,8 @@ public class TBCrmController {
 
     @Resource
     TBCrmService tBCrmService;
+    @Resource
+    TBServiceRegionDetailService tbServiceRegionDetailService;
 
 
     @ApiOperation(value = "派单信息表查询接口")
@@ -115,4 +122,30 @@ public class TBCrmController {
                                @ApiParam(value = "crm单号") @RequestParam(required = false) String crmNo) {
         return ResultUtil.ok(tBCrmService.findCrmProjectBySopNoOrCrmNo(sopNo, crmNo));
     }
+
+    @ApiOperation(value = "派单数据刷新（测试用）")
+    @RequestMapping(value = "/crm_update", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    @Aac(auth = false)
+    public void updateData() {
+        List<TBCrm> tbCrmList = tBCrmService.list();
+        for (TBCrm tbCrm : tbCrmList) {
+            Long serviceId = tbCrm.getServiceId();
+            String crmNo = tbCrm.getCrmNo();
+            Long leadId = tbCrm.getLeadId();
+
+            if (serviceId != null && serviceId > 0) {
+                ServiceRegionDetailResult result = tbServiceRegionDetailService.findRegionDetail(serviceId, crmNo);
+                if (Objects.nonNull(result)) {
+                    if (!Objects.equals(result.getLeadId(), leadId)) {
+                        System.out.println("大区经理不匹配 : " + crmNo);
+                    }
+                    tbCrm.setRegionId(result.getServiceRegionId());
+                    tbCrm.setRegionDetailId(result.getServiceRegionDetailId());
+                    tbCrm.setLeadId(result.getLeadId());
+                }
+            }
+            tBCrmService.updateById(tbCrm);
+        }
+    }
 }

sop-business/src/main/java/com/qmth/sop/business/bean/result/UserArchivesAllocationResult.java

@@ -48,6 +48,10 @@ public class UserArchivesAllocationResult {
     @ApiModelProperty("县")
     private String area;
 
+    @ApiModelProperty("服务区域规划id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long regionId;
+
     @ApiModelProperty("档位等级id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long levelId;
@@ -199,6 +203,14 @@ public class UserArchivesAllocationResult {
         this.levelId = levelId;
     }
 
+    public Long getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Long regionId) {
+        this.regionId = regionId;
+    }
+
     public String getLevel() {
         return level;
     }

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

@@ -34,6 +34,7 @@
                  IF(IFNULL(assistantQ.quota, 0) - IFNULL(assistantR.reality, 0) < 0, 0, IFNULL(assistantQ.quota, 0) - IFNULL(assistantR.reality, 0)) AS assistantUnDistributed,
                  tbc.status AS crmStatus,
                  tbs.service_lead_id AS serviceUnitLeaderId,
+                 tbc.region_id AS regionId,
                  tbc.lead_id AS regionManagerId,
                  rm.real_name AS regionManagerName,
                  pu.real_name AS publishUserName,