浏览代码

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

魏超 5 年前
父节点
当前提交
cfb8d203cd

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/TaPersonController.java 查看文件

112
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
112
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
113
         queryWrapper.eq("phone",phone);
113
         queryWrapper.eq("phone",phone);
114
         queryWrapper.eq("org_id",orgId);
114
         queryWrapper.eq("org_id",orgId);
115
+        queryWrapper.eq("isConsultant",true);
115
         List<TaUser> users = taUserService.list(queryWrapper);
116
         List<TaUser> users = taUserService.list(queryWrapper);
116
         if(users.size()>0){
117
         if(users.size()>0){
117
             TaUser user = users.get(0);
118
             TaUser user = users.get(0);
129
             taPersonService.updateById(person);
130
             taPersonService.updateById(person);
130
             responseBean.addSuccess(person);
131
             responseBean.addSuccess(person);
131
         }else {
132
         }else {
132
-            responseBean.addError("您不是置业顾问。");
133
+            responseBean.addError("手机号不存在。");
133
         }
134
         }
134
         return responseBean;
135
         return responseBean;
135
     }
136
     }
334
     }
335
     }
335
 
336
 
336
     /**
337
     /**
337
-     * 个人签到
338
+     * 个人getPersonId(request);
338
      * @param request
339
      * @param request
339
      * @return
340
      * @return
340
      */
341
      */

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java 查看文件

108
      * @param endDate
108
      * @param endDate
109
      * @return
109
      * @return
110
      */
110
      */
111
-    List<Map<String, Object>> selectNewsUserCount(@Param("org") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
111
+    List<Map<String, Object>> selectNewsUserCount(@Param("orgId") Integer orgId, @Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate);
112
 
112
 
113
     /**
113
     /**
114
      * 性别比例
114
      * 性别比例

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaNewsServiceImpl.java 查看文件

218
         taNewsQueryWrapper.eq("org_id",orgId);
218
         taNewsQueryWrapper.eq("org_id",orgId);
219
         taNewsQueryWrapper.eq("status", 1);
219
         taNewsQueryWrapper.eq("status", 1);
220
         taNewsQueryWrapper.eq("news_status", 0);
220
         taNewsQueryWrapper.eq("news_status", 0);
221
-        taNewsQueryWrapper.orderByDesc("create_date");
221
+        taNewsQueryWrapper.orderByDesc("weight","create_date");
222
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
222
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
223
         IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
223
         IPage<TaNews> pageEmpty = new Page<>(pageNum, pageSize);
224
         injectType(taNewsIPage.getRecords());
224
         injectType(taNewsIPage.getRecords());

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java 查看文件

380
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
380
         boolean yestodaySigned = null != taPersonSign && DateUtils.sameDay(LocalDateTime.now().minusDays(1), taPersonSign.getSignDate());
381
 
381
 
382
         if (todaySigned) {
382
         if (todaySigned) {
383
-            return ResponseBean.error("请不要重复签到", ResponseBean.ERROR_ILLEGAL_PARAMS);
383
+            return ResponseBean.error("请不要重复getPersonId(request);", ResponseBean.ERROR_ILLEGAL_PARAMS);
384
         }
384
         }
385
 
385
 
386
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;
386
         int durationDays = !yestodaySigned ? 1 : taPersonSign.getDurationDays() + 1;

+ 2
- 2
src/main/resources/mapper/TaPersonMapper.xml 查看文件

296
                         tp.create_date as create_date
296
                         tp.create_date as create_date
297
                     FROM
297
                     FROM
298
                       ta_person tp
298
                       ta_person tp
299
-                    where ifnull(tp.person_type, '') != #{personType}
299
+                    where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
300
                     and tp.phone is NOT NULL
300
                     and tp.phone is NOT NULL
301
                     <if test="startDate != null or endDate != null">
301
                     <if test="startDate != null or endDate != null">
302
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
302
                         AND tp.create_date BETWEEN #{startDate} and #{endDate}
334
                     tp.create_date as create_date
334
                     tp.create_date as create_date
335
                 FROM
335
                 FROM
336
                  ta_person tp
336
                  ta_person tp
337
-                where tp.org_id = #{org} AND ifnull(tp.person_type, '') != #{personType}
337
+                where ifnull(tp.person_type, '') != #{personType} and tp.org_id = #{orgId}
338
                 <if test="startDate != null or endDate != null">
338
                 <if test="startDate != null or endDate != null">
339
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
339
                     AND tp.create_date BETWEEN #{startDate} and #{endDate}
340
                 </if>
340
                 </if>

+ 1
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

158
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
158
         LEFT JOIN ta_person c on a.recommend_person = c.person_id
159
         <where>
159
         <where>
160
             a.status > 0
160
             a.status > 0
161
-            and realty_consultant is not null
161
+            and a.realty_consultant is not null
162
             <if test="orgId != null">
162
             <if test="orgId != null">
163
                 and a.org_id = #{orgId}
163
                 and a.org_id = #{orgId}
164
             </if>
164
             </if>