weight

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

@@ -341,4 +341,12 @@ 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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.entity.TaPolicy;
 import com.huiju.estateagents.service.ITaPolicyService;
 import org.slf4j.Logger;
@@ -18,6 +19,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 购房政策表  前端控制器
@@ -52,7 +55,7 @@ public class TaPolicyController extends BaseController {
 		    IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq(null != cityId,"city_id",cityId);
-            queryWrapper.orderByDesc("create_date");
+            queryWrapper.orderByDesc("create_date","weight");
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -79,7 +82,7 @@ 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("create_date","weight");
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -99,6 +102,9 @@ public class TaPolicyController extends BaseController {
     public ResponseBean taPolicyAdd(@RequestBody TaPolicy taPolicy){
         ResponseBean responseBean = new ResponseBean();
         try {
+            if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
+                taPolicy.setPublishDate(LocalDateTime.now());
+            }
             if (iTaPolicyService.save(taPolicy)){
                 responseBean.addSuccess(taPolicy);
             }else {
@@ -143,6 +149,9 @@ public class TaPolicyController extends BaseController {
                                         @RequestBody TaPolicy taPolicy){
         ResponseBean responseBean = new ResponseBean();
         try {
+            if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
+                taPolicy.setPublishDate(LocalDateTime.now());
+            }
             if (iTaPolicyService.updateById(taPolicy)){
                 responseBean.addSuccess(taPolicy);
             }else {
@@ -155,6 +164,7 @@ public class TaPolicyController extends BaseController {
         return responseBean;
     }
 
+
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -89,5 +89,9 @@ public class TaPolicy implements Serializable {
      */
     private String cityName;
 
+    private Integer weight;
+
+    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");