项目、资讯、活动 排序规则

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

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -278,7 +279,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (CollectionUtils.isNotEmpty(buildingProjectTypeArray)) {
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
-        return ResponseBean.success("");
+        return ResponseBean.success(building);
     }
 
     @Override
@@ -311,13 +312,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingImg> buildingImgs = JSONObject.parseArray(imgStr, TaBuildingImg.class);
 
         if (CollectionUtils.isNotEmpty(buildingImgs)) {
-            insertImgBatch(buildingImgs, building.getBuildingId());
+            buildingImgs = insertImgBatch(buildingImgs, building.getBuildingId());
         }
 
         String tagStr = object.getString("tag");
         List<TaBuildingTag> buildingTags = JSONObject.parseArray(tagStr, TaBuildingTag.class);
         if (CollectionUtils.isNotEmpty(buildingTags)) {
-            insertTagBatch(buildingTags, building.getBuildingId());
+            buildingTags = insertTagBatch(buildingTags, building.getBuildingId());
         }
 
         // 项目类型
@@ -326,7 +327,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingProjectTypeMapper.insertBuildingProjectTypeBatch(buildingProjectTypeArray, building.getBuildingId());
         }
 
-        return ResponseBean.success("");
+        return ResponseBean.success(building);
     }
 
     @Override
@@ -637,9 +638,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
 
-    int insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
-        int rows = 0;
-        for (TaBuildingImg img: imgs){
+    private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
+        return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();
             Images.setBuildingId(buildingId);
             Images.setImgType(img.getImgType());
@@ -647,21 +647,20 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             Images.setOrderNo(Integer.valueOf(img.getOrderNo()));
             Images.setStatus(1);
             Images.setCreateDate(LocalDateTime.now());
-            rows += taBuildingImgMapper.insert(Images);
-        }
+            taBuildingImgMapper.insert(Images);
 
-        return rows;
+            return Images;
+        }).collect(Collectors.toList());
     }
 
-    int insertTagBatch(List<TaBuildingTag> tags, String buildingId) {
-        int rows = 0;
-        for (TaBuildingTag tag:tags){
+    private List<TaBuildingTag> insertTagBatch(List<TaBuildingTag> tags, String buildingId) {
+        return tags.stream().map(tag -> {
             TaBuildingTag btag = new TaBuildingTag();
             btag.setBuildingId(buildingId);
             btag.setTagName(tag.getTagName());
-            rows += taBuildingTagMapper.insert(btag);
-        }
-        return rows;
+            taBuildingTagMapper.insert(btag);
+            return btag;
+        }).collect(Collectors.toList());
     }
 
     int insertApartmentImgBatch(List<TaBuildingImg> imgs, String buildingId, String apartmentId) {

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

@@ -72,6 +72,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq(newsStatus != null, "news_status", newsStatus);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);
 
@@ -126,6 +127,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
         taNews.setCreateDate(LocalDateTime.now());
         taNews.setStatus(1);
+        taNews.setNewsStatus(1);
         this.save(taNews);
         responseBean.addSuccess(taNews);
         return responseBean;

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -42,7 +42,7 @@
         <if test="time != null">
             and TO_DAYS(tbd.create_date) = TO_DAYS(#{time})
         </if>
-        ORDER BY tbd.create_date DESC
+        ORDER BY tbd.activity_status asc, tbd.create_date DESC
   </select>
 
     <select id="iBuildingDynamicSelectId" parameterType="string" resultType="com.huiju.estateagents.entity.TaBuildingDynamic">

src/main/resources/mapper/TaBuildingMapper.xml

@@ -23,7 +23,7 @@
             <if test="cityId != null and cityId != ''">
                 and  ta_building.city_id =#{cityId}
             </if>
-            <if test="isMain != null and isMain != ''">
+            <if test="isMain != null">
                 and  ta_building.is_main = #{isMain}
             </if>
             <if test="orgId != null">