fix

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

@@ -9,6 +9,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import io.swagger.annotations.ApiOperation;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuildingReport;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.mapper.TaChannelMapper;
@@ -30,8 +31,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -82,6 +86,16 @@ public class TaChannelController extends BaseController {
             //使用分页插件
 		    IPage<TaChannel> pg = new Page<>(pageNum, pageSize);
             IPage<TaChannel> result = taChannelMapper.pageTaChannel(pg,orgId,channelId);
+            List<TaChannel> recommendCount = taChannelMapper.recommendCount(orgId, channelId);
+
+            result.getRecords().stream().forEach(e -> {
+                for(TaChannel channel : recommendCount){
+                    if (channel.getChannelId().equals(e.getChannelId())){
+                        e.setRecommendCount(channel.getRecommendCount());
+                    }
+                }
+            });
+
             HashMap hashMap  = new HashMap<>();
             hashMap.put("result",result);
             // 下拉列表的数据 all

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

@@ -671,17 +671,20 @@ public class TaPersonController extends BaseController {
                     return ResponseBean.error("渠道码错误", ResponseBean.ERROR_UNAVAILABLE);
                 }
 
-            }else {
-                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
-                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
-                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
-                if (taChannelPerson.size()>0){
-                    for(int i=0;i<taChannelPerson.size();i++){
-                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
-                    }
-                    taChannelPersonService.updateBatchById(taChannelPerson);
-                }
             }
+            //编辑个人信息暂时不修改经纪人类型
+//            else {
+//
+//                QueryWrapper<TaChannelPerson>channelPersonQueryWrapper = new QueryWrapper<>();
+//                channelPersonQueryWrapper.eq("person_id",person.getPersonId());
+//                List<TaChannelPerson> taChannelPerson = taChannelPersonService.list(channelPersonQueryWrapper);
+//                if (taChannelPerson.size()>0){
+//                    for(int i=0;i<taChannelPerson.size();i++){
+//                        taChannelPerson.get(i).setStatus(CommConstant.STATUS_DELETE);
+//                    }
+//                    taChannelPersonService.updateBatchById(taChannelPerson);
+//                }
+//            }
             person.setPersonType(personType);
             if (taPersonService.updateById(person)){
                 responseBean.addSuccess(person);

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

@@ -37,4 +37,6 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
      * @return
      */
     IPage<TaChannel> pageTaChannel(IPage<TaChannel> pg,@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
+
+    List<TaChannel> recommendCount(@Param("orgId")Integer orgId,@Param("channelId")Integer channelId);
 }

src/main/resources/mapper/TaChannelMapper.xml

@@ -32,14 +32,12 @@
         SELECT
         c.*,
         count(tp.person_id) AS brokerCount,
-        COUNT(rc.recommend_person) AS recommendCount,
         (SELECT COUNT(p.recommend_agent ) from ta_person p WHERE cp.person_id = p.recommend_agent) AS inviteCount,
         cp.person_id
         FROM
         ta_channel c
         LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
-        LEFT JOIN ta_person tp on cp.person_id = tp.person_id and tp.person_type = 'estate agent' and cp.status = 1
-        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.recommend_person and rc.verify_status = 1 and rc.`status` = 1
+        LEFT JOIN ta_person tp ON cp.person_id = tp.person_id 	AND tp.person_type = 'estate agent' 	AND cp.STATUS = 1
         <where>
             <if test="channelId != null and channelId != ''">
                 c.channel_id = #{channelId}
@@ -48,4 +46,22 @@
         </where>
         GROUP BY c.channel_id
     </select>
+
+    <select id="recommendCount" resultType="com.huiju.estateagents.entity.TaChannel">
+        SELECT
+            c.channel_id,
+            COUNT( rc.recommend_person ) AS recommendCount
+        FROM
+        ta_channel c
+        LEFT JOIN ta_channel_person cp ON c.channel_id = cp.channel_id
+        LEFT JOIN ta_recommend_customer rc ON cp.person_id = rc.recommend_person 	AND rc.verify_status = 1 	AND rc.`status` = 1
+        <where>
+            <if test="channelId != null and channelId != ''">
+                c.channel_id = #{channelId}
+            </if>
+            and c.org_id = #{orgId}
+        </where>
+        GROUP BY c.channel_id
+    </select>
+
 </mapper>