Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/huiju/estateagents/common/CommConstant.java
#	src/main/java/com/huiju/estateagents/controller/TaPolicyController.java
#	src/main/java/com/huiju/estateagents/entity/TaPolicy.java

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -341,11 +341,11 @@ public class CommConstant {
     public static final Integer RECOMMENDED = 2;
     // ------- 客户推荐报备状态 end -------
 
-
     // ------- 政策发布状态 start -------
     // 已发布
     public static final Integer IS_PUBLISH = 1;
     // 未发布
     public static final Integer NOT_PUBLISH = 0;
     // ------- 政策发布状态 end -------
+
 }

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TaPolicy;
+import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.entity.TdCity;
-import com.huiju.estateagents.service.ITaPolicyService;
 import com.huiju.estateagents.service.ITdCityService;
+import com.huiju.estateagents.service.ITaPolicyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,7 +90,8 @@ public class TaPolicyController extends BaseController {
             IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("city_id",cityId);
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.orderByDesc("weight", "create_date");
+            queryWrapper.eq("status", 1);
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -122,6 +123,7 @@ public class TaPolicyController extends BaseController {
 
             taPolicy.setStatus(1);
             taPolicy.setCreateDate(LocalDateTime.now());
+
             if (iTaPolicyService.save(taPolicy)){
                 responseBean.addSuccess(taPolicy);
             }else {
@@ -170,6 +172,7 @@ public class TaPolicyController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
 
+
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
                 String personId = JWTUtils.getSubject(request);

src/main/java/com/huiju/estateagents/entity/TaPolicy.java

@@ -99,5 +99,4 @@ public class TaPolicy implements Serializable {
      */
     private Integer publishStatus;
 
-
 }

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

@@ -167,6 +167,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
+        taRecommendCustomer.setReportDate(LocalDateTime.now());
 
         // 时间格式 yyyy-MM-dd
         String at = params.getString("appointmentTime");
@@ -244,6 +245,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
         taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
+        taRecommendCustomer.setReportDate(LocalDateTime.now());
 
         // 时间格式 yyyy-MM-dd
         String at = params.getString("appointmentTime");