Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

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

@@ -112,6 +112,7 @@ public class TaPersonController extends BaseController {
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone",phone);
         queryWrapper.eq("org_id",orgId);
+        queryWrapper.eq("isConsultant",true);
         List<TaUser> users = taUserService.list(queryWrapper);
         if(users.size()>0){
             TaUser user = users.get(0);
@@ -129,7 +130,7 @@ public class TaPersonController extends BaseController {
             taPersonService.updateById(person);
             responseBean.addSuccess(person);
         }else {
-            responseBean.addError("您不是置业顾问。");
+            responseBean.addError("手机号不存在。");
         }
         return responseBean;
     }
@@ -334,7 +335,7 @@ public class TaPersonController extends BaseController {
     }
 
     /**
-     * 个人签到
+     * 个人getPersonId(request);
      * @param request
      * @return
      */

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

@@ -108,7 +108,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param endDate
      * @return
      */
-    List<Map<String, Object>> selectNewsUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
+    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 性别比例

src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java

@@ -218,7 +218,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq("org_id",orgId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq("news_status", 0);
-        taNewsQueryWrapper.orderByDesc("create_date");
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
         IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
         injectType(taNewsIPage.getRecords());

src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -380,7 +380,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
 
         if (todaySigned) {
-            return ResponseBean.error("请不要重复签到", ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("请不要重复getPersonId(request);", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;

src/main/resources/mapper/TaPersonMapper.xml

@@ -296,7 +296,7 @@ FROM
                         tp.create_date as create_date
                     FROM
                       ta_person tp
-                    where ifnull(tp.person_type, '') != #{personType}
+                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
                     and tp.phone is NOT NULL
                     <if test="startDate != null or endDate != null">
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
@@ -334,7 +334,7 @@ FROM
                     tp.create_date as create_date
                 FROM
                  ta_person tp
-                where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
+                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
                 <if test="startDate != null or endDate != null">
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
                 </if>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -158,7 +158,7 @@ FROM
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
         <where>
             a.status > 0
-            and realty_consultant is not null
+            and a.realty_consultant is not null
             <if test="orgId != null">
                 and a.org_id = #{orgId}
             </if>