合并

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5</version>
+	<version>v3.5.1</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

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

@@ -142,9 +142,10 @@ public class HelpActivityController extends BaseController {
     public ResponseBean helpActivityEffectiveList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                          @RequestParam(value = "cityId", required = false) Integer cityId,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
                                          HttpServletRequest request) {
         Integer orgId = getOrgId(request);
-        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId);
+        ResponseBean helpActivityList = taHelpActivityService.helpActivityEffectiveList(pageNum, pageSize, cityId, orgId, buildingId);
         return helpActivityList;
     }
 

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

@@ -54,5 +54,5 @@ public interface HelpActivityMapper extends BaseMapper<HelpActivity> {
      * @param orgId
      * @return
      */
-    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId);
+    IPage<HelpActivity> helpActivityListEffectivePage(IPage<HelpActivity> pg, Integer cityId, Integer orgId, String buildingId);
 }

src/main/java/com/huiju/estateagents/service/IHelpActivityService.java

@@ -145,5 +145,5 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param orgId
      * @return
      */
-    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId);
+    ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId);
 }

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

@@ -221,10 +221,10 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId) {
+    public ResponseBean helpActivityEffectiveList(Integer pageNum, Integer pageSize, Integer cityId, Integer orgId, String buildingId) {
         ResponseBean responseBean = new ResponseBean<>();
         IPage<HelpActivity> pg = new Page<>(pageNum, pageSize);
-        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId);
+        IPage<HelpActivity> result = taHelpActivityMapper.helpActivityListEffectivePage(pg, cityId, orgId, buildingId);
         responseBean.addSuccess(result);
         return responseBean;
     }

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

@@ -98,6 +98,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
                 queryWrapper.eq("building_id", taBuilding.getBuildingId());
                 queryWrapper.eq("img_type", "banner");
                 queryWrapper.orderByAsc("create_date");
+
                 List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(queryWrapper);
                 taBuilding.setBuildingImg(buildingImg);
             }
@@ -322,9 +323,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         String imgStr = object.getString("img");
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
 
-//        building.setOpeningDate(DateUtils.date2LocalDateTime(object.getDate("openingDate")));
-//        building.setCreateDate(LocalDateTime.now());
-//        building.setStatus(0);
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
             insertImgBatch(buildingImgs, building.getBuildingId());
         }

src/main/resources/mapper/HelpActivityMapper.xml

@@ -111,6 +111,9 @@
             <if test="cityId != null and cityId != ''">
                 and ha.city_id = #{cityId}
             </if>
+            <if test="buildingId != null">
+                and building_id = #{buildingId}
+            </if>
             and ha.org_id=#{orgId}
             and ha.activity_status in (0, 1)
         </where>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -4,7 +4,7 @@
     <select id="buildingList" resultType="com.huiju.estateagents.entity.TaBuilding">
         SELECT * FROM ta_building
         <where>
-            status > -1
+            status > 0
             <if test="Name != null and Name != ''">
                 and  (ta_building.name like concat('%',#{Name,jdbcType=VARCHAR},'%') or ta_building.building_name like concat('%',#{Name,jdbcType=VARCHAR},'%'))
             </if>
@@ -30,7 +30,7 @@
                 and  ta_building.org_id = #{orgId}
             </if>
         </where>
-        ORDER BY create_date DESC
+        ORDER BY status ASC, create_date DESC
     </select>
 
     <select id="buildingListSelect" resultType="com.huiju.estateagents.entity.TaBuilding">

src/main/resources/mapper/TaPersonMapper.xml

@@ -418,7 +418,7 @@ FROM
         FROM
         (
             SELECT
-            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+            DATE_FORMAT( DATE_SUB( <if test="endDate != null">#{endDate}</if><if test="endDate == null">now()</if>, INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
             tempf.from_name as from_name,
             tempf.from_code as from_code
             FROM
@@ -438,7 +438,7 @@ FROM
         (
             SELECT
                 ifnull(COUNT(1), 0) as count,
-                tps.create_date as create_date,
+                DATE_FORMAT( tps.create_date, '%Y-%m-%d' ) as create_date,
                 tpfs.from_code as from_code,
                 tpfs.from_name as from_name
             FROM ta_person tps
@@ -449,14 +449,14 @@ FROM
             and tps.person_type IN ('customer','drift','estate agent')
             AND tps.create_date BETWEEN #{startDate} AND #{endDate}
 
-            GROUP BY tpfs.from_code
+            GROUP BY tpfs.from_code, DATE_FORMAT( tps.create_date, '%Y-%m-%d' )
         ) as user_count
         ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = user_count.from_code
         LEFT JOIN
         (
             SELECT
                 ifnull(COUNT(1), 0) as count,
-                tps.create_date as create_date,
+                DATE_FORMAT( tps.create_date, '%Y-%m-%d' ) as create_date,
                 tpfs.from_code as from_code,
                 tpfs.from_name as from_name
             FROM ta_person tps
@@ -467,7 +467,7 @@ FROM
                 and tps.person_type IN ('customer','drift','estate agent')
                 AND tps.create_date BETWEEN #{startDate} AND #{endDate}
                 and tps.phone is not null
-            GROUP BY tpfs.from_code
+            GROUP BY tpfs.from_code,DATE_FORMAT( tps.create_date, '%Y-%m-%d' )
         ) as registered_count
         ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = registered_count.from_code
         order by temp_date.date DESC