链接分配协销

src/main/java/com/caimei365/user/controller/ClubApi.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -525,4 +526,15 @@ public ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager,Intege
         return clubService.recordLinkage(clubId);
     }
 
+    @ApiOperation("可分配协销列表")
+    @GetMapping("/chose/list")
+    public ResponseJson<List<ServiceProviderVo>> choseSales() {
+        return clubService.choseSales();
+    }
+
+    @ApiOperation("分配协销")
+    @PostMapping("/chose/sales")
+    public ResponseJson choseSales(Integer clubId,Integer spId) {
+        return clubService.changeSales(clubId,spId);
+    }
 }

src/main/java/com/caimei365/user/mapper/ClubMapper.java

@@ -276,9 +276,10 @@ public interface ClubMapper {
 
     String findQuestionMan(String questionManId);
 
-    List<RemarksVo> getRemarksListByKey(@Param("keyWord") String keyWord, @Param("serviceProviderId") Integer serviceProviderId,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,@Param("pinceSensitve") Integer pinceSensitve,@Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied, @Param("con")List<String> con,Integer status,Integer newDeal);
+    List<RemarksVo> getRemarksListByKey(@Param("keyWord") String keyWord, @Param("serviceProviderId") Integer serviceProviderId, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("pinceSensitve") Integer pinceSensitve, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId, @Param("followup") Integer followup, @Param("satisfied") Integer satisfied, @Param("con") List<String> con, Integer status, Integer newDeal);
+
+    List<VisitorRemarkVo> getVisitorListByKey(@Param("serviceProviderId") Integer serviceProviderId, @Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, Integer pinceSensitve, @Param("followup") Integer followup, @Param("satisfied") Integer satisfied, @Param("con") List<String> con, Integer status);
 
-    List<VisitorRemarkVo> getVisitorListByKey(@Param("serviceProviderId") Integer serviceProviderId, @Param("keyWord") String keyWord,@Param("startAddTime")String startAddTime,@Param("endAddTime")String endAddTime,Integer pinceSensitve,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("con")List<String> con,Integer status);
     //, @Param("questionManId") String questionManId
     List<VisitorRemarkVo> getVisitRecordListByKey(@Param("keyWord") String keyWord);
 
@@ -290,9 +291,9 @@ public interface ClubMapper {
 
     ConsultVo findConsultById(String string);
 
-    List<RemarksVo> findAllRemarks(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve, @Param("con")List<String> con,Integer status,Integer newDeal);
+    List<RemarksVo> findAllRemarks(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId, @Param("followup") Integer followup, @Param("satisfied") Integer satisfied, @Param("pinceSensitve") Integer pinceSensitve, @Param("con") List<String> con, Integer status, Integer newDeal);
 
-    List<VisitorRemarkVo> getAllVisitRemark(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId,@Param("followup") Integer followup,@Param("satisfied") Integer satisfied,@Param("pinceSensitve") Integer pinceSensitve,@Param("con")List<String> con,Integer status);
+    List<VisitorRemarkVo> getAllVisitRemark(@Param("keyWord") String keyWord, @Param("startAddTime") String startAddTime, @Param("endAddTime") String endAddTime, @Param("leaderId") Integer leaderId, @Param("groupId") Integer groupId, @Param("followup") Integer followup, @Param("satisfied") Integer satisfied, @Param("pinceSensitve") Integer pinceSensitve, @Param("con") List<String> con, Integer status);
 
     Integer findLeaderId(Integer serviceProviderId);
 
@@ -301,4 +302,18 @@ public interface ClubMapper {
     ClubVo recordClubage(Integer clubId);
 
     String serviceProviderNameage(Integer serviceProviderId);
+
+    List<ServiceProviderVo> findSales();
+
+    Integer findOldSpId(Integer clubId);
+
+    void insertChangeRecord(ClubChangeSpVo clubChangeSpVo);
+
+    void updateClubSpId(@Param("clubId") Integer clubId, @Param("spId") Integer spId);
+
+    List<Integer> findOldSpIds(Integer clubId);
+
+    void updateRemarksSp(@Param("clubId") Integer clubId, @Param("oldSpId") Integer oldSpId, @Param("spId") Integer spId, @Param("status") Integer status);
+
+    void updateReportSp(@Param("clubId") Integer clubId, @Param("oldSpId") Integer oldSpId, @Param("spId") Integer spId);
 }

src/main/java/com/caimei365/user/model/vo/ClubChangeSpVo.java

@@ -0,0 +1,34 @@
+package com.caimei365.user.model.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ClubChangeSpVo implements Serializable {
+    private Integer clubChangeSpRecordID;// 会所更换创客Id
+    private Integer clubID;   // 会所ID
+    private Integer oldSpID;  // 旧的创客ID
+    private Integer newSpID;  // 新的创客ID
+    private String checkStatus;// 审核状态(-1：已拒绝，0：待审核，1：已通过)
+    private Date checkTime; // 审核时间
+    private Date applyTime; // 申请时间
+    private String checkMark;//审核备注
+    private Integer checkUserID;//审核人
+
+    // 会所表中
+    private String address;   // 会所地址
+    private String clubName;  // 会所名称
+    private String clubStatus; // 会所状态(1：待审查资料，90：已上线，91：已冻结，92：待审核，2：电话预约，20：待确认，21：待拜访，3：已预约，30：待员工推荐，)
+    private String contractMobile;//会所联系手机
+    private Date addTime;// 添加时间
+    private Date auditTime;//审核时间
+    // 创客表中
+    private String linkMan;  // 申请创客姓名(创客联系名字)
+    private String spName;    // 定点创客姓名(创客名字)
+
+    // 用户表
+    private String userName;// 用户名
+    private String userLevelID;//用户级别ID（1：普通会员，2：	银卡会员，3：金卡会员，4：白金卡会员，5：钻石卡会员）
+}

src/main/java/com/caimei365/user/model/vo/ClubVo.java

@@ -138,8 +138,8 @@ public class ClubVo implements Serializable {
      */
     private Integer serviceProviderId;
 
-    /*
-    *是否分配协销 0.待分配 1.已分配
+    /**
+     * 是否分配协销 0.待分配 1.已分配
      */
     private Integer spType;
 

src/main/java/com/caimei365/user/service/ClubService.java

@@ -273,4 +273,8 @@ public interface ClubService {
     ResponseJson<PaginationVo<ReportVo>> visitorReportRemarks(Integer manager, Integer serviceProviderId, String keyWord, int pageNum, int pageSize);
 
     ResponseJson deleteReport(Integer reportId);
+
+    ResponseJson<List<ServiceProviderVo>> choseSales();
+
+    ResponseJson changeSales(Integer clubId, Integer spId);
 }

src/main/java/com/caimei365/user/service/impl/ClubServiceImpl.java

@@ -101,14 +101,12 @@ public class ClubServiceImpl implements ClubService {
     }
 
 
-
-
     @Override
     public ResponseJson<Map<String, Object>> recordLinkage(Integer clubId) {
         // 机构信息
         ClubVo club = clubMapper.recordClubage(clubId);
-        String saleName="";
-        if(!"".equals(club.getMainProduct()) && club.getMainProduct()!=null){
+        String saleName = "";
+        if (!"".equals(club.getMainProduct()) && club.getMainProduct() != null) {
             if (club.getMainProduct().contains("/")) {
                 List<String> list = Arrays.asList(club.getMainProduct().split("/"));
                 club.setMainProducts(list);
@@ -117,8 +115,8 @@ public class ClubServiceImpl implements ClubService {
             }
 
         }
-        if(club.getSpType()==1){
-            saleName= clubMapper.serviceProviderNameage(club.getServiceProviderId());
+        if (club.getSpType() == 1) {
+            saleName = clubMapper.serviceProviderNameage(club.getServiceProviderId());
         }
 
         if (club == null) {
@@ -132,16 +130,15 @@ public class ClubServiceImpl implements ClubService {
             club.setProvinceId(province.getProvinceId());
             club.setProvincialAddress(province.getName() + "" + city.getName() + "" + town.getName());
         }
-        log.info("销售人名称"+saleName);
-        log.info("销售人id"+club.getServiceProviderId());
+        log.info("销售人名称" + saleName);
+        log.info("销售人id" + club.getServiceProviderId());
         Map<String, Object> map = new HashMap(2);
         map.put("club", club);
-        map.put("saleName",saleName);
+        map.put("saleName", saleName);
         return ResponseJson.success(map);
     }
 
 
-
     /**
      * 修改机构资料
      *
@@ -514,59 +511,58 @@ public class ClubServiceImpl implements ClubService {
     }
 
     @Override
-    public  ResponseJson<PaginationVo<ProductItemVo>> getproductList(String keyWord,int pageNum,  int pageSize){
+    public ResponseJson<PaginationVo<ProductItemVo>> getproductList(String keyWord, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<ProductItemVo> productList=clubReportMapper.productList(keyWord);
+        List<ProductItemVo> productList = clubReportMapper.productList(keyWord);
         return ResponseJson.success(new PaginationVo<>(productList));
     }
 
     @Override
-    public ResponseJson<PaginationVo<ReportVo>> ClubReportList(Integer serviceProviderId,Integer clubId,String keyWord, int pageNum, int pageSize) {
+    public ResponseJson<PaginationVo<ReportVo>> ClubReportList(Integer serviceProviderId, Integer clubId, String keyWord, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<ReportVo>reportList=clubReportMapper.reportList(serviceProviderId,clubId,keyWord);
-        reportList.forEach(r ->{
-            r.setQuestionMan(clubReportMapper.questionManNameage(null,"",serviceProviderId));
+        List<ReportVo> reportList = clubReportMapper.reportList(serviceProviderId, clubId, keyWord);
+        reportList.forEach(r -> {
+            r.setQuestionMan(clubReportMapper.questionManNameage(null, "", serviceProviderId));
         });
         return ResponseJson.success(new PaginationVo<>(reportList));
     }
 
     @Override
-    public ResponseJson<PaginationVo<ReportVo>> visitorReportList(String questionManId,String keyWord, int pageNum,  int pageSize) {
+    public ResponseJson<PaginationVo<ReportVo>> visitorReportList(String questionManId, String keyWord, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<ReportVo>reportList=clubReportMapper.visitorReportList(questionManId,keyWord);
-        reportList.forEach(r ->{
-            r.setQuestionMan(clubReportMapper.questionManNameage(null,questionManId,null));
+        List<ReportVo> reportList = clubReportMapper.visitorReportList(questionManId, keyWord);
+        reportList.forEach(r -> {
+            r.setQuestionMan(clubReportMapper.questionManNameage(null, questionManId, null));
         });
         return ResponseJson.success(new PaginationVo<>(reportList));
     }
 
 
-
     @Override
     public ResponseJson<ReportVo> reportDetailsList(Integer reportId) {
-       ReportVo reportVo=clubReportMapper.reportDetailsList(reportId);
-        reportVo.setQuestionMan(clubReportMapper.questionManNameage(reportId,"",null));
+        ReportVo reportVo = clubReportMapper.reportDetailsList(reportId);
+        reportVo.setQuestionMan(clubReportMapper.questionManNameage(reportId, "", null));
         return ResponseJson.success(reportVo);
     }
 
     @Override
     public ResponseJson<ReportVo> visitorReportsList(Integer reportId) {
-        ReportVo reportVo=clubReportMapper.visitorReportsList(reportId);
-        reportVo.setQuestionMan(clubReportMapper.questionManNameage(reportId,"",null));
+        ReportVo reportVo = clubReportMapper.visitorReportsList(reportId);
+        reportVo.setQuestionMan(clubReportMapper.questionManNameage(reportId, "", null));
         return ResponseJson.success(reportVo);
     }
 
-        @Override
+    @Override
     public ResponseJson saveClubReport(ReportVo reportVo) {
         reportVo.setReportName(clubReportMapper.roeprtNa(reportVo.getServiceProviderId()));
         reportVo.setServiceProviderId(reportVo.getServiceProviderId());
         clubReportMapper.addClubReport(reportVo);
-           return ResponseJson.success("保存成功");
+        return ResponseJson.success("保存成功");
     }
 
     @Override
     public ResponseJson addVisitorReport(ReportVo reportVo) {
-       Integer serviceProviderId= clubReportMapper.visitorMan(reportVo.getQuestionManId());
+        Integer serviceProviderId = clubReportMapper.visitorMan(reportVo.getQuestionManId());
         reportVo.setReportName(clubReportMapper.roeprtNa(serviceProviderId));
         reportVo.setServiceProviderId(serviceProviderId);
         clubReportMapper.addVisitorReport(reportVo);
@@ -574,37 +570,67 @@ public class ClubServiceImpl implements ClubService {
     }
 
     @Override
-    public ResponseJson disassociation(Integer remarksId){
+    public ResponseJson disassociation(Integer remarksId) {
         clubReportMapper.disassociation(remarksId);
         return ResponseJson.success("取消成功");
     }
 
     @Override
-    public ResponseJson visitorDisassociation(Integer remarksId){
+    public ResponseJson visitorDisassociation(Integer remarksId) {
         clubReportMapper.visitorDisassociation(remarksId);
         return ResponseJson.success("取消成功");
     }
 
     @Override
-    public ResponseJson deleteReport(Integer reportId){
+    public ResponseJson deleteReport(Integer reportId) {
         clubReportMapper.deleteReport(reportId);
         return ResponseJson.success("删除成功");
     }
 
     @Override
-    public ResponseJson<PaginationVo<RemarkVo>>associated(Integer manager,Integer serviceProviderId,Integer reportId,String keyWord, String startAddTime,
-                                                          String endAddTime,
-                                                          String consult,
-                                                          Integer leaderId,
-                                                          String clubType,
-                                                          Integer pinceSensitve,
-                                                          Integer satisfied,
-                                                          Integer followup,
-                                                          String extra,
-                                                          Integer groupId,Integer newDeal,Integer status, int pageNum,  int pageSize) {
+    public ResponseJson<List<ServiceProviderVo>> choseSales() {
+        return ResponseJson.success(clubMapper.findSales());
+    }
+
+    @Override
+    public ResponseJson changeSales(Integer clubId, Integer spId) {
+        //创建审核记录
+        Integer oldSpId = clubMapper.findOldSpId(clubId);
+        ClubChangeSpVo clubChangeSpVo = new ClubChangeSpVo();
+        clubChangeSpVo.setClubID(clubId);
+        clubChangeSpVo.setApplyTime(new Date());
+        clubChangeSpVo.setCheckTime(new Date());
+        clubChangeSpVo.setCheckStatus("1");
+        clubChangeSpVo.setNewSpID(spId);
+        clubChangeSpVo.setOldSpID(oldSpId);
+        clubMapper.insertChangeRecord(clubChangeSpVo);
+        //更换club表协销Id
+        clubMapper.updateClubSpId(clubId, spId);
+        //后台更换协销逻辑移植
+        List<Integer> oldSpIds = clubMapper.findOldSpIds(clubId);
+        if(null!=oldSpIds&&oldSpIds.size()>0){
+            clubMapper.updateRemarksSp(clubId, oldSpId, spId,0);
+            clubMapper.updateReportSp(clubId, oldSpId, spId);
+        }else{
+            clubMapper.updateRemarksSp(clubId, oldSpId, spId,1);
+        }
+        return ResponseJson.success();
+    }
+
+    @Override
+    public ResponseJson<PaginationVo<RemarkVo>> associated(Integer manager, Integer serviceProviderId, Integer reportId, String keyWord, String startAddTime,
+                                                           String endAddTime,
+                                                           String consult,
+                                                           Integer leaderId,
+                                                           String clubType,
+                                                           Integer pinceSensitve,
+                                                           Integer satisfied,
+                                                           Integer followup,
+                                                           String extra,
+                                                           Integer groupId, Integer newDeal, Integer status, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<RemarksVo>reportList=null;
-        Integer teamId= clubReportMapper.reportLeaderId(serviceProviderId);
+        List<RemarksVo> reportList = null;
+        Integer teamId = clubReportMapper.reportLeaderId(serviceProviderId);
         List<String> conss = new ArrayList<>();
         if (StringUtils.isNotBlank(consult)) {
             if (consult.contains(",")) {
@@ -617,19 +643,19 @@ public class ClubServiceImpl implements ClubService {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
             List<String> finalConss = conss;
-            reportList = clubReportMapper.associated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss,newDeal,status);
+            reportList = clubReportMapper.associated(teamId, serviceProviderId, reportId, keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss, newDeal, status);
         } else if (null != teamId && teamId > 0) {
             log.info("方法2 协销组长");
             List<String> finalConss1 = conss;
-            reportList =clubReportMapper.associated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss1,newDeal,status);
+            reportList = clubReportMapper.associated(teamId, serviceProviderId, reportId, keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss1, newDeal, status);
         } else {
             log.info("方法3 协销");
             List<String> finalConss2 = conss;
-            reportList = clubReportMapper.associated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss2,newDeal,status);
+            reportList = clubReportMapper.associated(teamId, serviceProviderId, reportId, keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss2, newDeal, status);
         }
         ArrayList<RemarkVo> remarkVos = new ArrayList<>();
         RemarkVo remarkVo = new RemarkVo();
-        reportList.forEach(remarksVo->{
+        reportList.forEach(remarksVo -> {
             List<Map<String, String>> strings = new ArrayList<>();
             String rk = null == remarksVo.getRemarks() ? "" : remarksVo.getRemarks();
             if (rk.contains(",")) {
@@ -679,23 +705,23 @@ public class ClubServiceImpl implements ClubService {
             pageVo.setHasNextPage(false);
             pageVo.setTotalRecord(0);
         }
-        return  ResponseJson.success(pageVo);
+        return ResponseJson.success(pageVo);
     }
 
     @Override
-    public ResponseJson<PaginationVo<RemarkVo>>visitorAssociated(Integer manager,Integer serviceProviderId,Integer reportId,String keyWord, String startAddTime,
-                                                                 String endAddTime,
-                                                                 String consult,
-                                                                 Integer leaderId,
-                                                                 String clubType,
-                                                                 Integer pinceSensitve,
-                                                                 Integer satisfied,
-                                                                 Integer followup,
-                                                                 String extra,
-                                                                 Integer groupId,Integer status,int pageNum,  int pageSize) {
+    public ResponseJson<PaginationVo<RemarkVo>> visitorAssociated(Integer manager, Integer serviceProviderId, Integer reportId, String keyWord, String startAddTime,
+                                                                  String endAddTime,
+                                                                  String consult,
+                                                                  Integer leaderId,
+                                                                  String clubType,
+                                                                  Integer pinceSensitve,
+                                                                  Integer satisfied,
+                                                                  Integer followup,
+                                                                  String extra,
+                                                                  Integer groupId, Integer status, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<RemarksVo>reportList=null;
-        Integer teamId= clubReportMapper.reportLeaderId(serviceProviderId);
+        List<RemarksVo> reportList = null;
+        Integer teamId = clubReportMapper.reportLeaderId(serviceProviderId);
         List<String> conss = new ArrayList<>();
         if (StringUtils.isNotBlank(consult)) {
             if (consult.contains(",")) {
@@ -708,19 +734,19 @@ public class ClubServiceImpl implements ClubService {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
             List<String> finalConss = conss;
-            reportList = clubReportMapper.visitorAssociated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss,status);
+            reportList = clubReportMapper.visitorAssociated(teamId, serviceProviderId, reportId, keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss, status);
         } else if (null != teamId && teamId > 0) {
             log.info("方法2 协销组长");
             List<String> finalConss1 = conss;
-            reportList = clubReportMapper.visitorAssociated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss1,status);
+            reportList = clubReportMapper.visitorAssociated(teamId, serviceProviderId, reportId, keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss1, status);
         } else {
             log.info("方法3 协销");
             List<String> finalConss2 = conss;
-            reportList = clubReportMapper.visitorAssociated(teamId,serviceProviderId,reportId,keyWord,startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve,finalConss2,status);
+            reportList = clubReportMapper.visitorAssociated(teamId, serviceProviderId, reportId, keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss2, status);
         }
         ArrayList<RemarkVo> remarkVos = new ArrayList<>();
         RemarkVo remarkVo = new RemarkVo();
-        reportList.forEach(remarksVo->{
+        reportList.forEach(remarksVo -> {
             List<Map<String, String>> strings = new ArrayList<>();
             String rk = null == remarksVo.getRemarks() ? "" : remarksVo.getRemarks();
             if (rk.contains(",")) {
@@ -782,7 +808,7 @@ public class ClubServiceImpl implements ClubService {
             pageVo.setHasNextPage(false);
             pageVo.setTotalRecord(0);
         }
-        return  ResponseJson.success(pageVo);
+        return ResponseJson.success(pageVo);
 //        return ResponseJson.success(new PaginationVo<>(reportList));
     }
 
@@ -799,7 +825,7 @@ public class ClubServiceImpl implements ClubService {
                                                                Integer satisfied,
                                                                Integer followup,
                                                                String extra,
-                                                               Integer groupId,Integer status,Integer newDeal,
+                                                               Integer groupId, Integer status, Integer newDeal,
                                                                int pageNum, int pageSize) {
         if (null == serviceProviderId) {
             return ResponseJson.error("参数异常，协销id不能为空", null);
@@ -820,15 +846,15 @@ public class ClubServiceImpl implements ClubService {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
             List<String> finalConss = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss,status,newDeal));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, leaderId, groupId, followup, satisfied, pinceSensitve, finalConss, status, newDeal));
         } else if (null != findLeader && findLeader > 0) {
             log.info("方法2 协销组长");
             List<String> finalConss1 = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, serviceProviderId, groupId, followup, satisfied, pinceSensitve, finalConss1,status,newDeal));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.findAllRemarks(keyWord, startAddTime, endAddTime, serviceProviderId, groupId, followup, satisfied, pinceSensitve, finalConss1, status, newDeal));
         } else {
             log.info("方法3 协销");
             List<String> finalConss2 = conss;
-            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId, startAddTime, endAddTime, pinceSensitve, leaderId, groupId, followup, satisfied, finalConss2,status,newDeal));
+            pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getRemarksListByKey(keyWord, serviceProviderId, startAddTime, endAddTime, pinceSensitve, leaderId, groupId, followup, satisfied, finalConss2, status, newDeal));
         }
 
 //        if (null != manager && 1 == manager) {
@@ -910,10 +936,10 @@ public class ClubServiceImpl implements ClubService {
 
         PaginationVo<RemarkVo> pageVo = new PaginationVo<>(remarkVos);
         if (null != remarkVos && remarkVos.size() > 0) {
-            pageVo.setTotalRecord((int)pageInfo.getTotal());
+            pageVo.setTotalRecord((int) pageInfo.getTotal());
             if (pageInfo.getSize() >= pageSize) {
                 pageVo.setTotalPage((int) Math.ceil(MathUtil.div(pageInfo.getTotal(), pageSize).doubleValue()));
-                log.info(">>>>>>>>>>>>>>>>>>>>"+MathUtil.div(pageInfo.getTotal(), pageSize).doubleValue());
+                log.info(">>>>>>>>>>>>>>>>>>>>" + MathUtil.div(pageInfo.getTotal(), pageSize).doubleValue());
                 pageVo.setHasNextPage(true);
             } else {
                 pageVo.setTotalPage(1);
@@ -924,7 +950,7 @@ public class ClubServiceImpl implements ClubService {
             pageVo.setHasNextPage(false);
             pageVo.setTotalRecord(0);
         }
-          return ResponseJson.success(pageVo);
+        return ResponseJson.success(pageVo);
     }
 
     @Override
@@ -937,110 +963,108 @@ public class ClubServiceImpl implements ClubService {
         List<RemarksFileVo> fileList = clubMapper.getRemarksFileList(remarksId);
         fileList.forEach(file -> file.setFileUrl(OssUtil.getOssUrl(file.getOssName())));
         List<Map<String, String>> strings = new ArrayList<>();
-        if(remarksVo!=null){
-        String rk = null == remarksVo.getRemarks() ? "" : remarksVo.getRemarks();
-        if (rk.contains(",")) {
-            String[] split = rk.split(",");
-            for (String remark : split) {
+        if (remarksVo != null) {
+            String rk = null == remarksVo.getRemarks() ? "" : remarksVo.getRemarks();
+            if (rk.contains(",")) {
+                String[] split = rk.split(",");
+                for (String remark : split) {
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("label", remark);
+                    strings.add(map);
+                }
+            } else {
                 HashMap<String, String> map = new HashMap<>();
-                map.put("label", remark);
+                map.put("label", rk);
                 strings.add(map);
             }
-        } else {
-            HashMap<String, String> map = new HashMap<>();
-            map.put("label", rk);
-            strings.add(map);
-        }
 
-        RemarkVo remarkVo = new RemarkVo();
-        remarkVo.setClubId(remarksVo.getClubId());
-        remarkVo.setUserId(remarksVo.getUserId());
-        remarkVo.setRemarksId(remarksVo.getRemarksId());
-        remarkVo.setQuestionMan(remarksVo.getQuestionMan());
-        remarkVo.setRemarks(strings);
-        remarkVo.setFileList(fileList);
-        remarkVo.setImageList(imageList);
-        remarkVo.setAddTime(remarksVo.getAddTime());
-        remarkVo.setConsult(remarksVo.getConsult());
-        remarkVo.setClubType(remarksVo.getClubType());
-        remarkVo.setPinceSensitve(remarksVo.getPinceSensitve());
-        remarkVo.setSatisfied(remarksVo.getSatisfied());
-        remarkVo.setFollowup(remarksVo.getFollowup());
-        remarkVo.setExtra(remarksVo.getExtra());
-        remarkVo.setMainImage(remarksVo.getMainImage());
-        remarkVo.setReportText(remarksVo.getReportText());
-        remarkVo.setProductName(remarksVo.getProductName());
-        remarkVo.setShopName(remarksVo.getShopName());
-        remarkVo.setStatus(remarksVo.getStatus());
-        remarkVo.setAuditText(remarksVo.getAuditText());
-        remarkVo.setNewDeal(remarksVo.getNewDeal());
-        remarkVo.setProductId(remarksVo.getProductId());
-        remarkVo.setReportId(remarksVo.getReportId());
-        if (StringUtils.isNotBlank(remarksVo.getConsult())) {
-            if (remarkVo.getConsult().contains(",")) {
-                List<String> cons = Arrays.asList(remarkVo.getConsult().split(","));
-                String Cons = "";
-                for (String con : cons) {
-                    Cons += clubMapper.findConsultById(con).getClassName() + ",";
+            RemarkVo remarkVo = new RemarkVo();
+            remarkVo.setClubId(remarksVo.getClubId());
+            remarkVo.setUserId(remarksVo.getUserId());
+            remarkVo.setRemarksId(remarksVo.getRemarksId());
+            remarkVo.setQuestionMan(remarksVo.getQuestionMan());
+            remarkVo.setRemarks(strings);
+            remarkVo.setFileList(fileList);
+            remarkVo.setImageList(imageList);
+            remarkVo.setAddTime(remarksVo.getAddTime());
+            remarkVo.setConsult(remarksVo.getConsult());
+            remarkVo.setClubType(remarksVo.getClubType());
+            remarkVo.setPinceSensitve(remarksVo.getPinceSensitve());
+            remarkVo.setSatisfied(remarksVo.getSatisfied());
+            remarkVo.setFollowup(remarksVo.getFollowup());
+            remarkVo.setExtra(remarksVo.getExtra());
+            remarkVo.setMainImage(remarksVo.getMainImage());
+            remarkVo.setReportText(remarksVo.getReportText());
+            remarkVo.setProductName(remarksVo.getProductName());
+            remarkVo.setShopName(remarksVo.getShopName());
+            remarkVo.setStatus(remarksVo.getStatus());
+            remarkVo.setAuditText(remarksVo.getAuditText());
+            remarkVo.setNewDeal(remarksVo.getNewDeal());
+            remarkVo.setProductId(remarksVo.getProductId());
+            remarkVo.setReportId(remarksVo.getReportId());
+            if (StringUtils.isNotBlank(remarksVo.getConsult())) {
+                if (remarkVo.getConsult().contains(",")) {
+                    List<String> cons = Arrays.asList(remarkVo.getConsult().split(","));
+                    String Cons = "";
+                    for (String con : cons) {
+                        Cons += clubMapper.findConsultById(con).getClassName() + ",";
+                    }
+                    Cons = Cons.substring(0, Cons.length() - 1);
+                    remarkVo.setConsultBack(Cons);
+                } else {
+                    remarkVo.setConsultBack(clubMapper.findConsultById(remarkVo.getConsult()).getClassName());
                 }
-                Cons = Cons.substring(0, Cons.length() - 1);
-                remarkVo.setConsultBack(Cons);
-            } else {
-                remarkVo.setConsultBack(clubMapper.findConsultById(remarkVo.getConsult()).getClassName());
             }
+            return ResponseJson.success(remarkVo);
         }
-        return ResponseJson.success(remarkVo);
-        }
-        return ResponseJson.error("remarksVo为空remarksId："+remarksId);
+        return ResponseJson.error("remarksVo为空remarksId：" + remarksId);
     }
 
     @Override
-   public ResponseJson<PaginationVo<ReportVo>> visitorReportRemarks(Integer manager,Integer serviceProviderId,String keyWord,int pageNum, int pageSize){
-        Integer teamId= clubReportMapper.reportLeaderId(serviceProviderId);
+    public ResponseJson<PaginationVo<ReportVo>> visitorReportRemarks(Integer manager, Integer serviceProviderId, String keyWord, int pageNum, int pageSize) {
+        Integer teamId = clubReportMapper.reportLeaderId(serviceProviderId);
         List<ReportVo> pageInfo = null;
         PageHelper.startPage(pageNum, pageSize);
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
-            pageInfo = clubReportMapper.visitoReportRemark(teamId,serviceProviderId,keyWord);
+            pageInfo = clubReportMapper.visitoReportRemark(teamId, serviceProviderId, keyWord);
         } else if (null != teamId && teamId > 0) {
             log.info("方法2 协销组长");
 
-            pageInfo = clubReportMapper.visitorReportRemarks(teamId,serviceProviderId,keyWord);
+            pageInfo = clubReportMapper.visitorReportRemarks(teamId, serviceProviderId, keyWord);
         } else {
             log.info("方法3 协销");
-            pageInfo = clubReportMapper.visitorReportRemarks(teamId,serviceProviderId,keyWord);
+            pageInfo = clubReportMapper.visitorReportRemarks(teamId, serviceProviderId, keyWord);
         }
-        pageInfo.forEach(r ->{
-            r.setQuestionMan(clubReportMapper.questionManNameage(r.getReportId(),"",null));
+        pageInfo.forEach(r -> {
+            r.setQuestionMan(clubReportMapper.questionManNameage(r.getReportId(), "", null));
         });
         return ResponseJson.success(new PaginationVo<>(pageInfo));
     }
 
 
     @Override
-    public ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager,Integer serviceProviderId,String keyWord,int pageNum, int pageSize){
-        Integer teamId= clubReportMapper.reportLeaderId(serviceProviderId);
+    public ResponseJson<PaginationVo<ReportVo>> reportRemarks(Integer manager, Integer serviceProviderId, String keyWord, int pageNum, int pageSize) {
+        Integer teamId = clubReportMapper.reportLeaderId(serviceProviderId);
         List<ReportVo> pageInfo = null;
         PageHelper.startPage(pageNum, pageSize);
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             log.info("方法1 管理员");
-            pageInfo = clubReportMapper.repotRemark(teamId,null,keyWord,manager);
+            pageInfo = clubReportMapper.repotRemark(teamId, null, keyWord, manager);
         } else if (null != teamId && teamId > 0) {
             log.info("方法2 协销组长");
 
-            pageInfo = clubReportMapper.reportRemarks(teamId,serviceProviderId,keyWord,manager);
+            pageInfo = clubReportMapper.reportRemarks(teamId, serviceProviderId, keyWord, manager);
         } else {
             log.info("方法3 协销");
-            pageInfo = clubReportMapper.reportRemarks(teamId,serviceProviderId,keyWord,manager);
+            pageInfo = clubReportMapper.reportRemarks(teamId, serviceProviderId, keyWord, manager);
         }
         return ResponseJson.success(new PaginationVo<>(pageInfo));
     }
 
 
-
-
     @Override
     public ResponseJson deleteClubRemarks(Integer remarksId) {
         if (null == remarksId) {
@@ -1345,65 +1369,65 @@ public class ClubServiceImpl implements ClubService {
         List<RemarksFileVo> fileList = clubMapper.getVisitRemarksFileList(remarksId);
         fileList.forEach(file -> file.setFileUrl(OssUtil.getOssUrl(file.getOssName())));
         List<Map<String, String>> strings = new ArrayList<>();
-        if(visitRemarksVo!=null){
-        String rk = null == visitRemarksVo.getRemarks() ? "" : visitRemarksVo.getRemarks();
-        if (rk.contains(",")) {
-            String[] split = rk.split(",");
-            for (String remark : split) {
+        if (visitRemarksVo != null) {
+            String rk = null == visitRemarksVo.getRemarks() ? "" : visitRemarksVo.getRemarks();
+            if (rk.contains(",")) {
+                String[] split = rk.split(",");
+                for (String remark : split) {
+                    HashMap<String, String> map = new HashMap<>();
+                    map.put("label", remark);
+                    strings.add(map);
+                }
+            } else {
                 HashMap<String, String> map = new HashMap<>();
-                map.put("label", remark);
+                map.put("label", rk);
                 strings.add(map);
             }
-        } else {
-            HashMap<String, String> map = new HashMap<>();
-            map.put("label", rk);
-            strings.add(map);
-        }
-
-        VisitRemarkVo visit = new VisitRemarkVo();
-        visit.setConsult(visitRemarksVo.getConsult());
-        visit.setQuestionMan(visitRemarksVo.getQuestionMan());
-        visit.setQuestionManId(visitRemarksVo.getQuestionManId());
-        visit.setRemarksId(visitRemarksVo.getRemarksId());
-        visit.setRemarks(strings);
-        visit.setAddDate(visitRemarksVo.getAddDate());
-        visit.setImageList(imageList);
-        visit.setFileList(fileList);
-        visit.setClubType(visitRemarksVo.getClubType());
-        visit.setFollowup(visitRemarksVo.getFollowup());
-        visit.setSatisfied(visitRemarksVo.getSatisfied());
-        visit.setPinceSensitve(visitRemarksVo.getPinceSensitve());
-        visit.setExtra(visitRemarksVo.getExtra());
-
-        visit.setMainImage(visitRemarksVo.getMainImage());
-        visit.setReportText(visitRemarksVo.getReportText());
-        visit.setProductName(visitRemarksVo.getProductName());
-        visit.setShopName(visitRemarksVo.getShopName());
-        visit.setStatus(visitRemarksVo.getStatus());
-        visit.setAuditText(visitRemarksVo.getAuditText());
-        visit.setProductId(visitRemarksVo.getProductId());
-        visit.setReportId(visitRemarksVo.getReportId());
-
-        if (StringUtils.isNotBlank(visitRemarksVo.getConsult())) {
-            if (visitRemarksVo.getConsult().contains(",")) {
-                List<String> cons = Arrays.asList(visitRemarksVo.getConsult().split(","));
-                String Cons = "";
-                for (String con : cons) {
-                    Cons += clubMapper.findConsultById(con).getClassName() + ",";
+
+            VisitRemarkVo visit = new VisitRemarkVo();
+            visit.setConsult(visitRemarksVo.getConsult());
+            visit.setQuestionMan(visitRemarksVo.getQuestionMan());
+            visit.setQuestionManId(visitRemarksVo.getQuestionManId());
+            visit.setRemarksId(visitRemarksVo.getRemarksId());
+            visit.setRemarks(strings);
+            visit.setAddDate(visitRemarksVo.getAddDate());
+            visit.setImageList(imageList);
+            visit.setFileList(fileList);
+            visit.setClubType(visitRemarksVo.getClubType());
+            visit.setFollowup(visitRemarksVo.getFollowup());
+            visit.setSatisfied(visitRemarksVo.getSatisfied());
+            visit.setPinceSensitve(visitRemarksVo.getPinceSensitve());
+            visit.setExtra(visitRemarksVo.getExtra());
+
+            visit.setMainImage(visitRemarksVo.getMainImage());
+            visit.setReportText(visitRemarksVo.getReportText());
+            visit.setProductName(visitRemarksVo.getProductName());
+            visit.setShopName(visitRemarksVo.getShopName());
+            visit.setStatus(visitRemarksVo.getStatus());
+            visit.setAuditText(visitRemarksVo.getAuditText());
+            visit.setProductId(visitRemarksVo.getProductId());
+            visit.setReportId(visitRemarksVo.getReportId());
+
+            if (StringUtils.isNotBlank(visitRemarksVo.getConsult())) {
+                if (visitRemarksVo.getConsult().contains(",")) {
+                    List<String> cons = Arrays.asList(visitRemarksVo.getConsult().split(","));
+                    String Cons = "";
+                    for (String con : cons) {
+                        Cons += clubMapper.findConsultById(con).getClassName() + ",";
+                    }
+                    Cons = Cons.substring(0, Cons.length() - 1);
+                    visit.setConsultBack(Cons);
+                } else {
+                    visit.setConsultBack(clubMapper.findConsultById(visitRemarksVo.getConsult()).getClassName());
                 }
-                Cons = Cons.substring(0, Cons.length() - 1);
-                visit.setConsultBack(Cons);
-            } else {
-                visit.setConsultBack(clubMapper.findConsultById(visitRemarksVo.getConsult()).getClassName());
             }
+            return ResponseJson.success(visit);
         }
-        return ResponseJson.success(visit);
-        }
-        return ResponseJson.error("visitRemarksVo为空remarksId："+remarksId);
+        return ResponseJson.error("visitRemarksVo为空remarksId：" + remarksId);
     }
 
     @Override
-    public ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, Integer pinceSensitve, Integer satisfied, Integer followup, String extra,Integer status, int pageNum, int pageSize) {
+    public ResponseJson<PaginationVo<VisitRemarkVo>> getVisitorRecordList(String questionManId, String keyWord, Integer serviceProviderId, String startAddTime, String endAddTime, String consult, Integer leaderId, Integer groupId, Integer manager, String clubType, Integer pinceSensitve, Integer satisfied, Integer followup, String extra, Integer status, int pageNum, int pageSize) {
         PageInfo<VisitorRemarkVo> remarksList = null;
         List<String> conss = new ArrayList<>();
         if (StringUtils.isNotBlank(consult)) {
@@ -1417,13 +1441,13 @@ public class ClubServiceImpl implements ClubService {
         if (null != manager && 1 == manager) {
             //主管查所有注册客户咨询记录
             List<String> finalConss = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss,status));
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss, status));
         } else if (null != findLeader && findLeader > 0) {
             List<String> finalConss1 = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss1,status));
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getAllVisitRemark(keyWord, startAddTime, endAddTime, leaderId, groupId, pinceSensitve, satisfied, followup, finalConss1, status));
         } else {
             List<String> finalConss2 = conss;
-            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getVisitorListByKey(serviceProviderId, keyWord, startAddTime, endAddTime, pinceSensitve, satisfied, followup, finalConss2,status));
+            remarksList = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> clubMapper.getVisitorListByKey(serviceProviderId, keyWord, startAddTime, endAddTime, pinceSensitve, satisfied, followup, finalConss2, status));
         }
         ArrayList<VisitRemarkVo> remarkVos = new ArrayList<>();
         remarksList.getList().forEach(r -> {
@@ -1528,7 +1552,7 @@ public class ClubServiceImpl implements ClubService {
         }
         //根据咨询人查cm_visitor_remarks赋值clubid，concactTime
         clubMapper.updateVisit(questionManId, clubId);
-        clubMapper.updateReport(questionManId,clubId);
+        clubMapper.updateReport(questionManId, clubId);
         //cm_visitor_remarks搬运到cm_club_remarks，cm_visitor_remarks_file搬运到cm_club_remarks_file
         List<VisitorRemarkVo> visits = clubMapper.findConcactVisit(questionManId);
         visits.forEach(v -> {
@@ -1601,5 +1625,4 @@ public class ClubServiceImpl implements ClubService {
     }
 
 
-
 }

src/main/resources/mapper/ClubMapper.xml

@@ -3,8 +3,10 @@
 <mapper namespace="com.caimei365.user.mapper.ClubMapper">
     <insert id="insertRemarks" parameterType="com.caimei365.user.model.po.ClubRemarksPo" keyProperty="remarksId"
             useGeneratedKeys="true">
-        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan,consultType,clubType,pinceSensitve,satisfied,followup,extra,productID,reportID)
-        values (#{clubId}, #{serviceProviderId}, #{remarks}, now(), #{questionMan},#{consult}, #{clubType}, #{pinceSensitve}, #{satisfied}, #{followup}, #{extra},#{productID},#{reportID})
+        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, consultType, clubType,
+                                    pinceSensitve, satisfied, followup, extra, productID, reportID)
+        values (#{clubId}, #{serviceProviderId}, #{remarks}, now(), #{questionMan}, #{consult}, #{clubType},
+                #{pinceSensitve}, #{satisfied}, #{followup}, #{extra}, #{productID}, #{reportID})
     </insert>
     <insert id="insertRemarksImage">
         insert into cm_club_remarks_file(remarksId, fileType, imageUrl)
@@ -19,8 +21,10 @@
         values (#{questionManId}, #{serviceProviderId}, #{remarks}, now(), #{questionMan}, #{concactTime})
     </insert>
     <insert id="insertVisitorRemark" keyProperty="remarksId" useGeneratedKeys="true">
-        insert into cm_visitor_remarks(questionMan, questionManId, serviceProviderId, remarks, addTime,consultType,clubType,pinceSensitve,satisfied,followup,extra,reportID,productID)
-        values (#{questionMan}, #{questionManId}, #{serviceProviderId}, #{remarks}, now(),#{consult}, #{clubType}, #{pinceSensitve}, #{satisfied}, #{followup}, #{extra},#{reportId},#{productId})
+        insert into cm_visitor_remarks(questionMan, questionManId, serviceProviderId, remarks, addTime, consultType,
+                                       clubType, pinceSensitve, satisfied, followup, extra, reportID, productID)
+        values (#{questionMan}, #{questionManId}, #{serviceProviderId}, #{remarks}, now(), #{consult}, #{clubType},
+                #{pinceSensitve}, #{satisfied}, #{followup}, #{extra}, #{reportId}, #{productId})
     </insert>
     <insert id="insertVisitorRemarksImage">
         insert into cm_visitor_remarks_file(remarksId, fileType, imageUrl)
@@ -32,8 +36,28 @@
     </insert>
     <insert id="concactVisit" parameterType="com.caimei365.user.model.vo.RemarksVo" keyProperty="remarksId"
             useGeneratedKeys="true">
-        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, concactTime,consultType,clubType,pinceSensitve,satisfied,followup,extra,productID,reportID)
-        values (#{clubId}, #{serviceProviderId}, #{remarks}, #{addTime}, #{questionMan}, now(),#{consult}, #{clubType}, #{pinceSensitve}, #{satisfied}, #{followup}, #{extra},#{productId},#{reportId})
+        insert into cm_club_remarks(clubId, serviceProviderId, remarks, addTime, questionMan, concactTime, consultType,
+                                    clubType, pinceSensitve, satisfied, followup, extra, productID, reportID)
+        values (#{clubId}, #{serviceProviderId}, #{remarks}, #{addTime}, #{questionMan}, now(), #{consult}, #{clubType},
+                #{pinceSensitve}, #{satisfied}, #{followup}, #{extra}, #{productId}, #{reportId})
+    </insert>
+    <insert id="insertChangeRecord">
+        INSERT INTO clubchangesprecord(clubID,
+                                       oldSpID,
+                                       newSpID,
+                                       applyTime,
+                                       checkTime,
+                                       checkStatus,
+                                       checkMark,
+                                       checkUserID)
+        VALUES (#{clubID},
+                #{oldSpID},
+                #{newSpID},
+                #{applyTime},
+                #{checkTime},
+                #{checkStatus},
+                #{checkMark},
+                #{checkUserID})
     </insert>
     <update id="updateClubUserByUpdateInfo">
         update user set
@@ -140,7 +164,7 @@
                addTime,
                status,
                lastCheckOrderDate,
-               newDeal as newDeal
+               newDeal                   as newDeal
 
         from club
         where clubID = #{clubId}
@@ -180,8 +204,7 @@
           AND beansType IN (1, 2, 3, 4, 8, 12)
           AND delFlag = 0
           AND userId = #{userId}
-        ORDER BY ADDTIME DESC
-        LIMIT 1
+        ORDER BY ADDTIME DESC LIMIT 1
     </select>
 
     <select id="findByBeansType" resultType="integer">
@@ -200,9 +223,9 @@
     </update>
     <update id="updateRemarks">
         update cm_club_remarks
-        set remarks     = #{remarks},
-            questionMan = #{questionMan},
-            consultType = #{consult},
+        set remarks      = #{remarks},
+            questionMan  = #{questionMan},
+            consultType  = #{consult},
             clubType=#{clubType},
             pinceSensitve=#{pinceSensitve},
             satisfied=#{satisfied},
@@ -210,7 +233,7 @@
             extra=#{extra},
             productID=#{productID},
             reportID=#{reportID}
-         where id = #{remarksId}
+        where id = #{remarksId}
     </update>
     <update id="updateQuestionMan">
         update cm_visitor_remarks
@@ -220,8 +243,8 @@
     </update>
     <update id="updateVisitorRemark">
         update cm_visitor_remarks
-        set remarks = #{remarks},
-            consultType = #{consult},
+        set remarks      = #{remarks},
+            consultType  = #{consult},
             clubType=#{clubType},
             pinceSensitve=#{pinceSensitve},
             satisfied=#{satisfied},
@@ -240,11 +263,32 @@
 
     <update id="updateReport">
         update cm_club_report
-        set clubId  = #{clubId},
+        set clubId       = #{clubId},
             questionManId=null
         where questionManId = #{questionManId}
     </update>
-
+    <update id="updateClubSpId">
+        update club
+        set spID=#{spId},
+            scanFlag=2
+        where clubID = #{clubId}
+    </update>
+    <update id="updateRemarksSp">
+        UPDATE `cm_club_remarks`
+        SET
+        <if test="status == 1">
+            oldserviceProviderId = #{oldSpId},
+        </if>
+        serviceProviderId=#{spId}
+        WHERE clubId = #{clubId}
+        AND serviceProviderId = #{oldSpId}
+    </update>
+    <update id="updateReportSp">
+        UPDATE cm_club_report
+        SET serviceProviderId=#{spId}
+        WHERE clubId = #{clubId}
+          AND serviceProviderId = #{oldSpId}
+    </update>
     <select id="findAllBeansHistory" resultType="com.caimei365.user.model.vo.BeansHistoryVo">
         SELECT
         type,
@@ -275,17 +319,20 @@
     <select id="findCountCoupon" resultType="integer">
         SELECT COUNT(a.id)
         FROM cm_coupon_club a
-        LEFT JOIN cm_coupon cc ON a.couponId = cc.id
+                 LEFT JOIN cm_coupon cc ON a.couponId = cc.id
         WHERE cc.delFlag = 0
           AND a.delFlag = 0
           AND a.userId = #{userId}
           AND a.status = 1
-          AND (cc.couponType IN (0,1,3)
+          AND (cc.couponType IN (0, 1, 3)
             OR (cc.couponType = 2 AND a.userId = #{userId})
             OR ((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ >= ]]> startDate AND couponType = 4))
           and NOW() <![CDATA[ > ]]> startDate
-          and NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,
-                                       date_add(if((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and (SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,(SELECT registerTime FROM user WHERE userID = #{userId}),startDate),interval receivePeriod day)
+          and NOW() <![CDATA[ < ]]> if(receiveFlag = 1, endDate,
+                         date_add(if((SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ > ]]> startDate and
+                                     (SELECT registerTime FROM user WHERE userID = #{userId}) <![CDATA[ < ]]> endDate,
+                                     (SELECT registerTime FROM user WHERE userID = #{userId}), startDate),
+                                  interval receivePeriod day)
             )
           AND cc.status != 2
     </select>
@@ -307,17 +354,34 @@
         order by addTime desc
     </select>
     <select id="getRemarks" resultType="com.caimei365.user.model.vo.RemarksVo">
-        SELECT DISTINCT
-         ccr.id AS remarksId, ccr.remarks, ccr.questionMan, ccr.addTime, ccr.clubId, c.userID,IFNULL(ccr.consultType,'')AS consult,
-         ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,p.`mainImage` AS mainImage,p.name AS productName,s.name AS shopName,
-         cmc.`reportText` as reportText,cmc.`status` as status,cmc.`auditText` as auditText,c.newDeal as newDeal,p.productId as productId,cmc.ID as reportId
+        SELECT DISTINCT ccr.id                      AS remarksId,
+                        ccr.remarks,
+                        ccr.questionMan,
+                        ccr.addTime,
+                        ccr.clubId,
+                        c.userID,
+                        IFNULL(ccr.consultType, '') AS consult,
+                        ccr.clubType,
+                        ccr.pinceSensitve,
+                        ccr.satisfied,
+                        ccr.followup,
+                        ccr.extra,
+                        p.`mainImage`               AS mainImage,
+                        p.name                      AS productName,
+                        s.name                      AS shopName,
+                        cmc.`reportText`            as reportText,
+                        cmc.`status`                as status,
+                        cmc.`auditText`             as auditText,
+                        c.newDeal                   as newDeal,
+                        p.productId                 as productId,
+                        cmc.ID                      as reportId
         FROM cm_club_remarks ccr
-        LEFT JOIN club c ON ccr.clubId = c.clubId
-        LEFT JOIN product p ON p.productID = ccr.productID
-        LEFT JOIN cm_club_report cmc ON cmc.ID = ccr.reportID
-        LEFT JOIN shop s ON s.shopID = p.shopID
+                 LEFT JOIN club c ON ccr.clubId = c.clubId
+                 LEFT JOIN product p ON p.productID = ccr.productID
+                 LEFT JOIN cm_club_report cmc ON cmc.ID = ccr.reportID
+                 LEFT JOIN shop s ON s.shopID = p.shopID
         where ccr.id = #{remarksId}
-        AND ccr.remarks IS NOT NULL
+          AND ccr.remarks IS NOT NULL
     </select>
     <select id="getRemarksImageList" resultType="java.lang.String">
         select imageUrl
@@ -358,15 +422,19 @@
     <select id="getUserCouponCount" resultType="java.lang.Integer">
         SELECT COUNT(a.id)
         FROM cm_coupon_club a
-        LEFT JOIN cm_coupon cc ON a.couponId = cc.id
+                 LEFT JOIN cm_coupon cc ON a.couponId = cc.id
         WHERE cc.delFlag = 0
           AND a.delFlag = 0
           AND a.status = 1
           AND cc.status != 2
           AND a.userId = #{userId}
-          AND if(cc.vipFlag = 1,
-            NOW() BETWEEN cc.startDate AND cc.endDate,
-            NOW() <![CDATA[ < ]]> IF(cc.usePeriod IS NULL,cc.endDate,DATE_ADD(a.createDate,INTERVAL cc.usePeriod DAY)))
+          AND if(cc.vipFlag = 1
+            , NOW() BETWEEN cc.startDate
+          AND cc.endDate
+            , NOW() <![CDATA[ < ]]> IF(cc.usePeriod IS NULL
+            , cc.endDate
+            , DATE_ADD(a.createDate
+            , INTERVAL cc.usePeriod DAY)))
     </select>
     <select id="getUserAdvertiseList" resultType="com.caimei365.user.model.vo.AdvertiseVo">
         SELECT image, link, title
@@ -398,7 +466,7 @@
         ORDER BY informationID DESC
     </select>
     <select id="getVisitorList" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
-        SELECT questionManId, serviceProviderId, addTime as addDate, questionMan,consultType as consult
+        SELECT questionManId, serviceProviderId, addTime as addDate, questionMan, consultType as consult
         FROM cm_visitor_remarks
         WHERE serviceProviderId = #{serviceProviderId}
           and clubId is null
@@ -406,17 +474,32 @@
         ORDER BY addTime DESC
     </select>
     <select id="getVisitRemark" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
-        select DISTINCT ccr.id as remarksId, ccr.questionManId, ccr.remarks, ccr.questionMan, ccr.addTime as addDate,IFNULL(ccr.consultType,'') as consult,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
-               p.`mainImage` AS mainImage,p.name AS productName,s.name AS shopName,
-               cmc.`reportText` as reportText,cmc.`status` as status,cmc.`auditText` as auditText,p.productId as productId,cmc.ID as reportId
+        select DISTINCT ccr.id                      as remarksId,
+                        ccr.questionManId,
+                        ccr.remarks,
+                        ccr.questionMan,
+                        ccr.addTime                 as addDate,
+                        IFNULL(ccr.consultType, '') as consult,
+                        ccr.clubType,
+                        ccr.pinceSensitve,
+                        ccr.satisfied,
+                        ccr.followup,
+                        ccr.extra,
+                        p.`mainImage`               AS mainImage,
+                        p.name                      AS productName,
+                        s.name                      AS shopName,
+                        cmc.`reportText`            as reportText,
+                        cmc.`status`                as status,
+                        cmc.`auditText`             as auditText,
+                        p.productId                 as productId,
+                        cmc.ID                      as reportId
         from cm_visitor_remarks ccr
-         LEFT JOIN club c ON ccr.clubId = c.clubId
-         LEFT JOIN product p ON p.productID = ccr.productID
-         LEFT JOIN cm_club_report cmc ON cmc.ID = ccr.reportID
-         LEFT JOIN shop s ON s.shopID = p.shopID
+                 LEFT JOIN club c ON ccr.clubId = c.clubId
+                 LEFT JOIN product p ON p.productID = ccr.productID
+                 LEFT JOIN cm_club_report cmc ON cmc.ID = ccr.reportID
+                 LEFT JOIN shop s ON s.shopID = p.shopID
         where ccr.id = #{remarksId}
-          AND ccr.remarks IS NOT NULL
-#           and cmc.clubId is null
+          AND ccr.remarks IS NOT NULL #           and cmc.clubId is null
 
     </select>
     <select id="getVisitRemarksImageList" resultType="java.lang.String">
@@ -445,11 +528,11 @@
         ORDER BY ADDTIME DESC
     </select>
     <select id="findConcactVisit" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
-        select id      as remarksId,
+        select id          as remarksId,
                questionManId,
                serviceProviderId,
                remarks,
-               addTime as addDate,
+               addTime     as addDate,
                questionMan,
                clubId,
                consultType as consult,
@@ -476,10 +559,12 @@
         SELECT DISTINCT
         ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') as consult, c.Name as clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
+        followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS recordName,c.newDeal as newDeal,cmc.status as status
-#         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
+        recordName,c.newDeal as newDeal,cmc.status as status
+        # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN club c ON c.clubId=ccr.clubId
@@ -489,9 +574,9 @@
         where ccr.serviceProviderId=#{serviceProviderId}
 
         <if test="keyWord != null and keyWord != ''">
-           AND (ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
-           OR c.Name LIKE CONCAT('%', #{keyWord}, '%')
-           OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%'))
+            AND (ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
+            OR c.Name LIKE CONCAT('%', #{keyWord}, '%')
+            OR ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%'))
         </if>
         <if test="leaderId != null and leaderId>0">
             and csr.leaderId = #{leaderId}
@@ -513,7 +598,7 @@
             and ccr.satisfied LIKE concat('%',#{satisfied},'%')
         </if>
         <if test="status!=null and status!=0">
-           and cmc.status=#{status}
+            and cmc.status=#{status}
         </if>
         <if test="newDeal !=null and newDeal!=0">
             and c.newDeal =#{newDeal}
@@ -522,16 +607,17 @@
             and ccr.followup LIKE concat('%',#{followup},'%')
         </if>
         <if test="con != null and con.size > 0">
-           and
-              <foreach collection="con" item="item" index="index"  open="(" close=")" separator="OR">
-                  ccr.consultType LIKE CONCAT('%',#{item},'%')
-             </foreach>
+            and
+            <foreach collection="con" item="item" index="index" open="(" close=")" separator="OR">
+                ccr.consultType LIKE CONCAT('%',#{item},'%')
+            </foreach>
         </if>
         order by addTime desc
     </select>
     <select id="getVisitorListByKey" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
         SELECT DISTINCT
-        ccr.id as remarksId, ccr.questionManId, ccr.remarks, ccr.addTime as addDate, ccr.questionMan,IFNULL(ccr.consultType,'') as consult,
+        ccr.id as remarksId, ccr.questionManId, ccr.remarks, ccr.addTime as addDate,
+        ccr.questionMan,IFNULL(ccr.consultType,'') as consult,
         ccr.serviceProviderId,ccr.clubType,ccr.pinceSensitve,ccr.satisfied,ccr.followup,ccr.extra,
         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName,
         (select name from serviceprovider s where s.serviceProviderID = csr.leaderId) as leaderName,cmc.status as status
@@ -544,8 +630,8 @@
         and ccr.remarks IS NOT NULL
         and ccr.clubId is null
         <if test="keyWord != null and keyWord != ''">
-          and (ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
-          or ccr.remarks LIKE CONCAT('%', #{keyWord}, '%'))
+            and (ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
+            or ccr.remarks LIKE CONCAT('%', #{keyWord}, '%'))
         </if>
         <if test="startAddTime !='' and startAddTime != null">
             and ccr.addTime <![CDATA[  >=  ]]> #{startAddTime}
@@ -567,7 +653,7 @@
         </if>
         <if test="con != null and con.size > 0">
             and
-            <foreach collection="con" item="item" index="index"  open="(" close=")" separator="OR">
+            <foreach collection="con" item="item" index="index" open="(" close=")" separator="OR">
                 ccr.consultType LIKE CONCAT('%',#{item},'%')
             </foreach>
         </if>
@@ -575,7 +661,8 @@
     </select>
     <select id="getVisitRecordListByKey" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
         select DISTINCT
-        ccr.id as remarksId, ccr.questionManId, ccr.remarks, ccr.addTime as addDate, ccr.questionMan,IFNULL(ccr.consultType,'') as consult,
+        ccr.id as remarksId, ccr.questionManId, ccr.remarks, ccr.addTime as addDate,
+        ccr.questionMan,IFNULL(ccr.consultType,'') as consult,
         ccr.serviceProviderId,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName,
         (select name from serviceprovider s where s.serviceProviderID = csr.leaderId) as leaderName
@@ -586,8 +673,8 @@
         where ccr.remarks IS NOT NULL
         and ccr.clubId is null
         <if test="keyWord != null and keyWord != ''">
-           and ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
-           OR ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
+            and ccr.questionMan LIKE CONCAT('%', #{keyWord}, '%')
+            OR ccr.remarks LIKE CONCAT('%', #{keyWord}, '%')
         </if>
         ORDER BY ccr.ADDTIME DESC
     </select>
@@ -599,17 +686,21 @@
         ORDER BY sortNumber ASC
     </select>
     <select id="findAllTeams" resultType="com.caimei365.user.model.vo.TeamLederVo">
-        select csr.id as teamId, csr.leaderId,IF(csm.serviceproviderId IS NULL,2,1) as manager, csr.createdTime, s.name as leaderName
+        select csr.id                                  as teamId,
+               csr.leaderId,
+               IF(csm.serviceproviderId IS NULL, 2, 1) as manager,
+               csr.createdTime,
+               s.name                                  as leaderName
         from cm_serviceteam_role csr
-        left join serviceprovider s on csr.leaderId = s.serviceProviderID
-        LEFT JOIN cm_serviceteam_manager csm ON csr.leaderId = csm.serviceproviderId
+                 left join serviceprovider s on csr.leaderId = s.serviceProviderID
+                 LEFT JOIN cm_serviceteam_manager csm ON csr.leaderId = csm.serviceproviderId
         where csr.delflag = 0
     </select>
     <select id="findGroups" resultType="com.caimei365.user.model.vo.TeamGroupVo">
         select serviceProviderId as groupId, name as groupName
         from serviceprovider s
-        left join cm_serviceteam_group csg on s.serviceProviderID = csg.serviceId
-        left join cm_serviceteam_role csr on csr.id = csg.teamId
+                 left join cm_serviceteam_group csg on s.serviceProviderID = csg.serviceId
+                 left join cm_serviceteam_role csr on csr.id = csg.teamId
         where csr.leaderId = #{leaderId}
     </select>
     <select id="findConsultById" resultType="com.caimei365.user.model.vo.ConsultVo">
@@ -622,12 +713,14 @@
     </select>
     <select id="findAllRemarks" resultType="com.caimei365.user.model.vo.RemarksVo">
         SELECT DISTINCT
-               ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime,ccr.questionMan,ccr.serviceProviderId as serviceProviderId,
         csr.leaderId AS leaderId,IFNULL(ccr.consultType,'') as consult, c.Name as clubName,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
+        followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID= csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS recordName,c.newDeal as newDeal,cmc.status as status
-#         (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderID) AS
+        recordName,c.newDeal as newDeal,cmc.status as status
+        # (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.oldserviceProviderId) AS oldName
         FROM cm_club_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN club c ON c.clubId=ccr.clubId
@@ -644,7 +737,7 @@
                 and csr.leaderId = #{leaderId}
             </if>
             <if test="status!=null and status!=0">
-               and cmc.status=#{status}
+                and cmc.status=#{status}
             </if>
             <if test="groupId != null and groupId>0">
                 and ccr.serviceProviderId = #{groupId}
@@ -681,10 +774,13 @@
     </select>
     <select id="getAllVisitRemark" resultType="com.caimei365.user.model.vo.VisitorRemarkVo">
         SELECT DISTINCT
-        ccr.id AS remarksId, ccr.remarks,ccr.addTime as addDate,ccr.questionMan,IFNULL(ccr.consultType,'') as consult,ccr.serviceProviderId,ccr.questionManId,
-        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS followup,ccr.extra AS extra,
+        ccr.id AS remarksId, ccr.remarks,ccr.addTime as addDate,ccr.questionMan,IFNULL(ccr.consultType,'') as
+        consult,ccr.serviceProviderId,ccr.questionManId,
+        ccr.clubType AS clubType,ccr.pinceSensitve AS pinceSensitve,ccr.satisfied AS satisfied,ccr.followup AS
+        followup,ccr.extra AS extra,
         (SELECT NAME FROM serviceprovider s WHERE s.serviceProviderID = csr.leaderId) AS leaderName,
-        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS recordName,cmc.status as status
+        (SELECT linkMan FROM serviceprovider s WHERE s.serviceProviderID = ccr.serviceProviderId) AS
+        recordName,cmc.status as status
         FROM cm_visitor_remarks ccr
         LEFT JOIN serviceprovider s ON ccr.serviceProviderId = s.serviceProviderID
         LEFT JOIN cm_serviceTeam_group csg ON ccr.serviceProviderId = csg.serviceId
@@ -719,9 +815,9 @@
             <if test="followup != '' and followup !=null">
                 and ccr.followup LIKE concat('%',#{followup},'%')
             </if>
-             <if test="status!=null and status!=0">
+            <if test="status!=null and status!=0">
                 and cmc.status=#{status}
-             </if>
+            </if>
             <if test="con != null and con.size > 0">
                 and
                 <foreach collection="con" item="item" index="index" open="(" close=")" separator="OR">
@@ -732,60 +828,78 @@
         ORDER BY ccr.addtime DESC
     </select>
     <select id="findLeaderId" resultType="java.lang.Integer">
-        SELECT leaderId FROM cm_serviceteam_role csr
-        LEFT JOIN serviceprovider s ON s.serviceProviderId=csr.leaderId
+        SELECT leaderId
+        FROM cm_serviceteam_role csr
+                 LEFT JOIN serviceprovider s ON s.serviceProviderId = csr.leaderId
         WHERE s.serviceProviderID = #{serviceProviderId}
     </select>
     <select id="getCmRemarksList" resultType="com.caimei365.user.model.vo.CmRemarksVo">
-        SELECT remarks FROM cm_remarks csr
-        WHERE remarks like concat('%',#{remarks},'%')
+        SELECT remarks
+        FROM cm_remarks csr
+        WHERE remarks like concat('%', #{remarks}, '%')
         order by addtime DESC
     </select>
 
     <select id="recordClubage" resultType="com.caimei365.user.model.vo.ClubVo">
-        select c.clubID                    as clubId,
-              c.userID                    as userId,
+        select c.clubID                                  as clubId,
+               c.userID                                  as userId,
                c.name,
-               c.sname                     as shortName,
+               c.sname                                   as shortName,
                c.contractMobile,
                c.contractEmail,
                c.contractPhone,
                c.linkMan,
-               c.provinceID                as proviceId,
-               c.cityID                    as cityId,
-               c.townID                    as townId,
+               c.provinceID                              as proviceId,
+               c.cityID                                  as cityId,
+               c.townID                                  as townId,
                c.address,
-               c.headpic                   as shopPhoto,
-               c.businessLicenseImage      as businessLicense,
+               c.headpic                                 as shopPhoto,
+               c.businessLicenseImage                    as businessLicense,
                c.socialCreditCode,
                c.firstClubType,
                c.secondClubType,
                c.department,
-               c.medicalPracticeLicenseImg as medicalPracticeLicense,
-               c.mainpro                   as mainProduct,
+               c.medicalPracticeLicenseImg               as medicalPracticeLicense,
+               c.mainpro                                 as mainProduct,
                c.fax,
-               c.info                      as profile,
-               c.spID                      as serviceProviderId,
+               c.info                                    as profile,
+               c.spID                                    as serviceProviderId,
                c.addTime,
                c.status,
                c.lastCheckOrderDate,
-               c.newDeal as newDeal,
-               IF(c.spid IS NOT NULL,1,0) AS spType,
+               c.newDeal                                 as newDeal,
+               IF(c.spid IS NULL or c.spId = 1342, 0, 1) AS spType,
                r.describe,
-               u.userIdentity as userIdentity
+               u.userIdentity                            as userIdentity
 
         from club c
-        LEFT JOIN record_link r ON r.`clubId`=c.`clubID`
-        left join user u on u.clubId = c.clubId
+                 LEFT JOIN record_link r ON r.`clubId` = c.`clubID`
+                 left join user u on u.clubId = c.clubId
         where c.clubID = #{clubId}
-        ORDER BY r.id DESC
-        LIMIT 1
+        ORDER BY r.id DESC LIMIT 1
 
     </select>
 
     <select id="serviceProviderNameage" resultType="java.lang.String">
-        select linkMan from `serviceprovider`
-        where serviceProviderID=#{serviceproviderId}
+        select linkMan
+        from `serviceprovider`
+        where serviceProviderID = #{serviceproviderId}
+    </select>
+    <select id="findSales" resultType="com.caimei365.user.model.vo.ServiceProviderVo">
+        select serviceProviderId, name
+        from serviceprovider
+        where status = 90
+    </select>
+    <select id="findOldSpId" resultType="java.lang.Integer">
+        select spID
+        from club
+        where clubID = #{clubId}
+    </select>
+    <select id="findOldSpIds" resultType="java.lang.Integer">
+        select oldserviceProviderId
+        FROM cm_club_remarks
+        WHERE clubId = #{clubID}
+          AND oldserviceProviderId IS NOT NULL
     </select>
 
 </mapper>