Quellcode durchsuchen

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

魏超 vor 5 Jahren
Ursprung
Commit
07e2df8165

+ 1
- 1
src/main/resources/mapper/TaPersonVisitRecordMapper.xml Datei anzeigen

438
         FROM
438
         FROM
439
         ta_person_visit_record tp
439
         ta_person_visit_record tp
440
         where tp.org_id = #{orgId} AND
440
         where tp.org_id = #{orgId} AND
441
-        tp.event  = 'index'
441
+        tp.event  = 'start'
442
         AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
442
         AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
443
     </select>
443
     </select>
444
 
444
 

+ 7
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Datei anzeigen

309
             <if test="belongStatus == 0">
309
             <if test="belongStatus == 0">
310
                 and (t.building_id = ''  OR t.building_id is null )
310
                 and (t.building_id = ''  OR t.building_id is null )
311
             </if>
311
             </if>
312
+            <if test="belongStatus == 1">
313
+                and t.building_id is not null
314
+            </if>
312
         </where>
315
         </where>
313
         order by t.create_date desc
316
         order by t.create_date desc
314
     </select>
317
     </select>
581
         t.create_date,
584
         t.create_date,
582
         concat( t.country, t.province ) AS province,
585
         concat( t.country, t.province ) AS province,
583
         t.intention,
586
         t.intention,
584
-        IF(t.building_id = null or t.building_id = '','否','是') AS belongStatus,
587
+        IF(t.building_id is null or t.building_id = '','否','是') AS belongStatus,
585
         IFNULL( t2.building_name, '暂无' ) AS buildingName,
588
         IFNULL( t2.building_name, '暂无' ) AS buildingName,
586
         t5.scene_alias as sceneType,
589
         t5.scene_alias as sceneType,
587
         ifnull( t3.nickname, t3.NAME ) AS sharePersonName ,
590
         ifnull( t3.nickname, t3.NAME ) AS sharePersonName ,
631
         <if test="belongStatus == 0">
634
         <if test="belongStatus == 0">
632
             and (t.building_id = ''  OR t.building_id is null )
635
             and (t.building_id = ''  OR t.building_id is null )
633
         </if>
636
         </if>
637
+        <if test="belongStatus == 1">
638
+            and t.building_id is not null
639
+        </if>
634
         order by t.create_date desc
640
         order by t.create_date desc
635
     </select>
641
     </select>
636
     <!--    limit #{pageCode}, #{pageSize}-->
642
     <!--    limit #{pageCode}, #{pageSize}-->