* bug fix

src/main/java/com/huiju/estateagents/controller/TaRaiseController.java

@@ -10,11 +10,10 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRaise;
+import com.huiju.estateagents.entity.TaRaiseInvite;
 import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.service.ITaRaiseService;
-import com.huiju.estateagents.service.ITaSalesBatchService;
-import com.huiju.estateagents.service.ITaSaveService;
-import com.huiju.estateagents.service.ITdCityService;
+import com.huiju.estateagents.service.*;
+import com.huiju.estateagents.service.impl.TaRaiseInviteServiceImpl;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,7 +21,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Array;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,6 +49,9 @@ public class TaRaiseController extends BaseController {
     @Autowired
     public ITaSalesBatchService iTaSalesBatchService;
 
+    @Autowired
+    private TaRaiseInviteServiceImpl iTaRaiseInviteService;
+
     /**
      * 获取认筹列表
      *
@@ -139,22 +143,36 @@ public class TaRaiseController extends BaseController {
 
             // 获取销售批次状态
             TaSalesBatch taSalesBatch = new TaSalesBatch();
-            if (taRaise.getSalesBatchId() != null){
+            if (taRaise.getSalesBatchId() != null) {
                 QueryWrapper<TaSalesBatch> taSalesBatchQueryWrapper = new QueryWrapper<>();
                 taSalesBatchQueryWrapper.eq("sales_batch_id", taRaise.getSalesBatchId());
                 taSalesBatch = iTaSalesBatchService.getOne(taSalesBatchQueryWrapper);
             }
 
-            // 为邀请制，添加认筹被邀请清单
-            if(CommConstant.STATUS_NORMAL == taRaise.getIsInvite()){
-
-            }
-
             taRaise.setOrgId(orgId);
-            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null );
+            taRaise.setRaisePrice(taRaise.getRaisePrice() != null ? taRaise.getRaisePrice() : null);
             taRaise.setStatus(taSalesBatch.getStatus());
             taRaise.setCreateDate(LocalDateTime.now());
             if (iTaRaiseService.save(taRaise)) {
+
+                // 为邀请制，添加认筹被邀请清单
+                if (CommConstant.STATUS_NORMAL == taRaise.getIsInvite()) {
+                    TaRaiseInvite taRaiseInvite = new TaRaiseInvite();
+                    taRaiseInvite.setOrgId(orgId);
+                    taRaiseInvite.setRaiseId(taRaise.getRaiseId());
+                    taRaiseInvite.setBuildingId(taRaise.getBuildingId());
+                    taRaiseInvite.setSalesBatchId(taSalesBatch.getSalesBatchId());
+                    taRaiseInvite.setCreateDate(LocalDateTime.now());
+                    List<TaRaiseInvite> taRaiseInviteList = new ArrayList<>();
+                    String[] inviteTelArr = StringUtils.isEmpty(taRaise.getInviteTel()) ?
+                            new String[]{} : taRaise.getInviteTel().replace("，", ",").split(",");
+                    for (String inviteTel : inviteTelArr) {
+                        taRaiseInvite.setInviteTel(inviteTel);
+                        taRaiseInviteList.add(taRaiseInvite);
+                    }
+                    iTaRaiseInviteService.saveBatch(taRaiseInviteList);
+                }
+
                 responseBean.addSuccess(taRaise);
             } else {
                 responseBean.addError("fail");

src/main/java/com/huiju/estateagents/entity/TaRaiseInvite.java

@@ -39,12 +39,12 @@ public class TaRaiseInvite implements Serializable {
     /**
      * 认筹id
      */
-    private String raiseId;
+    private Integer raiseId;
 
     /**
      * 销售批次id
      */
-    private String salesBatchId;
+    private Integer salesBatchId;
 
     /**
      * 项目id

src/main/java/com/huiju/estateagents/mapper/TaRaiseInviteMapper.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
 
 import com.huiju.estateagents.entity.TaRaiseInvite;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author fxf
  * @since 2020-03-30
  */
+@Mapper
 public interface TaRaiseInviteMapper extends BaseMapper<TaRaiseInvite> {
 
 }

src/main/resources/mapper/TaOrgMapper.xml

@@ -14,10 +14,10 @@
             left join ta_channel_proxy t4 on t3.channel_id = t4.channel_id
         <where>
             <if test = "orgName != null and orgName != ''">
-                t.`name` = #{orgName}
+                t.`name` like concat('%',#{orgName},'%')
             </if>
             <if test = "miniAppName != null and miniAppName != ''">
-                AND t2.`name` = #{miniAppName}
+                AND t2.`name` like concat('%',#{miniAppName},'%')
             </if>
         </where>
         ORDER BY