add:大区经理相关

sop-business/src/main/java/com/qmth/sop/business/entity/TBCrm.java

@@ -61,7 +61,7 @@ public class TBCrm extends BaseEntity implements Serializable {
     @NotNull(message = "产品id不能为空")
     private Long productId;
 
-    @ApiModelProperty(value = "区域经理id")
+    @ApiModelProperty(value = "大区经理id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long leadId;
 

sop-business/src/main/java/com/qmth/sop/business/entity/TBServiceRegion.java

@@ -25,7 +25,7 @@ public class TBServiceRegion extends BaseEntity implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long serviceId;
 
-    @ApiModelProperty(value = "区域经理id")
+    @ApiModelProperty(value = "大区经理id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long leadId;
 

sop-business/src/main/java/com/qmth/sop/business/service/TBServiceRegionService.java

@@ -43,4 +43,13 @@ public interface TBServiceRegionService extends IService<TBServiceRegion> {
      * @param serviceRegionId 删除服务区域规划
      */
     void removeServiceRegion(Long serviceRegionId);
+
+    /**
+     * 查询大区经理
+     *
+     * @param serviceUnitId 服务单元id
+     * @param crmNo         crmNo
+     * @return 符合条件的大区经理id
+     */
+    Long findRegionLeader(Long serviceUnitId, String crmNo);
 }

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBCrmServiceImpl.java

@@ -202,6 +202,7 @@ public class TBCrmServiceImpl extends ServiceImpl<TBCrmMapper, TBCrm> implements
         List<Long> crmIdList = Arrays.stream(crmIds).boxed().collect(Collectors.toList());
         List<TBCrm> tbCrmList = this.listByIds(crmIdList);
         tbCrmList.forEach(e -> e.setServiceId(serviceId));
+
         return this.updateBatchById(tbCrmList);
     }
 

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBServiceRegionServiceImpl.java

@@ -8,10 +8,7 @@ import com.qmth.sop.business.bean.dto.AreaDto;
 import com.qmth.sop.business.bean.params.ServiceRegionParam;
 import com.qmth.sop.business.bean.result.CrmServiceResult;
 import com.qmth.sop.business.bean.result.ServiceRegionResult;
-import com.qmth.sop.business.entity.SysUser;
-import com.qmth.sop.business.entity.TBService;
-import com.qmth.sop.business.entity.TBServiceRegion;
-import com.qmth.sop.business.entity.TBServiceRegionDetail;
+import com.qmth.sop.business.entity.*;
 import com.qmth.sop.business.mapper.TBServiceRegionMapper;
 import com.qmth.sop.business.service.*;
 import com.qmth.sop.common.base.BaseEntity;
@@ -186,4 +183,9 @@ public class TBServiceRegionServiceImpl extends ServiceImpl<TBServiceRegionMappe
         tbServiceRegion.setEnable(false);
         this.updateById(tbServiceRegion);
     }
+
+    @Override
+    public Long findRegionLeader(Long serviceUnitId, String crmNo) {
+        return null;
+    }
 }

sop-business/src/main/resources/db/log/caozixuan_update_log.sql

@@ -240,3 +240,9 @@ UPDATE sys_privilege SET related = '3017,2044,2045,2046' WHERE (id = '26');
 -- 2023-09-07
 ALTER TABLE t_b_crm
     ADD COLUMN status VARCHAR(20) NOT NULL COMMENT '派单状态(UN_PUBLISH(\"未发布\"),PUBLISH(\"已发布\"),FINISH(\"已完成\");)' AFTER update_time;
+
+-- 2023-09-08
+ALTER TABLE t_b_crm
+    CHANGE COLUMN lead_id lead_id BIGINT NULL DEFAULT NULL COMMENT '大区经理id' ;
+ALTER TABLE t_b_service_region
+    CHANGE COLUMN lead_id lead_id BIGINT NOT NULL COMMENT '大区经理id' ;

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

@@ -7,14 +7,12 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.sop.business.annotation.OperationLog;
 import com.qmth.sop.business.bean.result.DingElementResult;
 import com.qmth.sop.business.bean.result.TBCrmResult;
-import com.qmth.sop.business.entity.SysUser;
 import com.qmth.sop.business.entity.TBCrm;
 import com.qmth.sop.business.service.TBCrmService;
 import com.qmth.sop.common.contant.SystemConstant;
 import com.qmth.sop.common.enums.ProductTypeEnum;
 import com.qmth.sop.common.util.Result;
 import com.qmth.sop.common.util.ResultUtil;
-import com.qmth.sop.common.util.ServletUtil;
 import io.swagger.annotations.*;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;