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

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -43,7 +43,7 @@ public class JudglActivityTimeJob extends BaseController {
     /**
      * 开启定时任务，每天12：30执行
      */
-    @Scheduled(cron = "* 0/5 ** * * ?")
+    @Scheduled(cron = "* 0/5 * * * ?")
     private void configureTasks() {
 
         //未开始活动更新为已开始

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

@@ -203,7 +203,7 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         TaShareRecord record = taShareRecordMapper.selectOne(queryWrapper);
     
         if (record != null){
-            map.put("record",record);
+            map.put("taShareRecord",record);
             QueryWrapper<TaShareChildRecord> taShareChildRecordQueryWrapper = new QueryWrapper<>();
             taShareChildRecordQueryWrapper.eq("group_activity_id",taShareRecord.getGroupActivityId());
             taShareChildRecordQueryWrapper.eq("org_id",orgId);
@@ -231,7 +231,7 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         taShareRecord.setCreateTime(LocalDateTime.now());
         taShareRecord.setStatus(1);
         taShareRecordMapper.insert(taShareRecord);
-        map.put("record",taShareRecord);
+        map.put("taShareRecord",taShareRecord);
         map.put("shareChildRecordList",new ArrayList<>());
         return ResponseBean.success(map);
     }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -62,11 +62,9 @@
 			FROM
 				ta_help_activity a
 				WHERE
-                  org_id =#{orgId}
-                <if test="buildingId  == null ">
+                  a.org_id =#{orgId}
                   and  a.is_main = 1
                   and  a.city_id = #{cityID}
-                </if>
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
@@ -81,11 +79,9 @@
 				FROM
 					ta_share_activity s
 					WHERE
-                        org_id =#{orgId}
-                <if test="buildingId  == null ">
+                        s.org_id =#{orgId}
                     and  s.sort = 1
                     and  s.city_id = #{cityID}
-                </if>
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -99,7 +99,7 @@
         update ta_building_dynamic t
         set activity_status = 0
         where
-        t.activity_status = 1 and NOW() between  t.create_date and  t.end_date
+        t.activity_status = 1 and NOW() between  t.start_date and  t.end_date
     </update>
 
     <update id="updateProcessingActivity">

src/main/resources/mapper/TaPersonMapper.xml

@@ -536,11 +536,11 @@ FROM
            UPDATE ta_person a
         INNER JOIN (
             SELECT
-                t.*, s.pinyin AS province
+                t.*, s.name AS province
             FROM
                 td_city t
             INNER JOIN td_city s ON t.parentid = s.id
-        ) b ON a.city = b.pinyin
+        ) b ON a.city like CONCAT(b.shortname, '%')
         AND a.province = b.province
         set a.city = b.id
         where a.city IS NOT NULL