胡轶钦 5 years ago
parent
commit
4a7a87aeff

+ 8
- 0
src/main/java/com/huiju/estateagents/common/CommConstant.java View File

341
     public static final Integer RECOMMENDED = 2;
341
     public static final Integer RECOMMENDED = 2;
342
     // ------- 客户推荐报备状态 end -------
342
     // ------- 客户推荐报备状态 end -------
343
 
343
 
344
+
345
+    // ------- 政策发布状态 start -------
346
+    // 已发布
347
+    public static final Integer IS_PUBLISH = 1;
348
+    // 未发布
349
+    public static final Integer NOT_PUBLISH = 0;
350
+    // ------- 政策发布状态 end -------
351
+
344
 }
352
 }

+ 12
- 2
src/main/java/com/huiju/estateagents/controller/TaPolicyController.java View File

4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.estateagents.base.ResponseBean;
6
 import com.huiju.estateagents.base.ResponseBean;
7
+import com.huiju.estateagents.common.CommConstant;
7
 import com.huiju.estateagents.entity.TaPolicy;
8
 import com.huiju.estateagents.entity.TaPolicy;
8
 import com.huiju.estateagents.service.ITaPolicyService;
9
 import com.huiju.estateagents.service.ITaPolicyService;
9
 import org.slf4j.Logger;
10
 import org.slf4j.Logger;
18
 import org.springframework.web.bind.annotation.RestController;
19
 import org.springframework.web.bind.annotation.RestController;
19
 import com.huiju.estateagents.base.BaseController;
20
 import com.huiju.estateagents.base.BaseController;
20
 
21
 
22
+import java.time.LocalDateTime;
23
+
21
 /**
24
 /**
22
  * <p>
25
  * <p>
23
     * 购房政策表  前端控制器
26
     * 购房政策表  前端控制器
52
 		    IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
55
 		    IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
53
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
56
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
54
             queryWrapper.eq(null != cityId,"city_id",cityId);
57
             queryWrapper.eq(null != cityId,"city_id",cityId);
55
-            queryWrapper.orderByDesc("create_date");
58
+            queryWrapper.orderByDesc("create_date","weight");
56
 
59
 
57
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
60
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
58
             responseBean.addSuccess(result);
61
             responseBean.addSuccess(result);
79
             IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
82
             IPage<TaPolicy> pg = new Page<>(pageNum, pageSize);
80
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
83
             QueryWrapper<TaPolicy> queryWrapper = new QueryWrapper<>();
81
             queryWrapper.eq("city_id",cityId);
84
             queryWrapper.eq("city_id",cityId);
82
-            queryWrapper.orderByDesc("create_date");
85
+            queryWrapper.orderByDesc("create_date","weight");
83
 
86
 
84
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
87
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
85
             responseBean.addSuccess(result);
88
             responseBean.addSuccess(result);
99
     public ResponseBean taPolicyAdd(@RequestBody TaPolicy taPolicy){
102
     public ResponseBean taPolicyAdd(@RequestBody TaPolicy taPolicy){
100
         ResponseBean responseBean = new ResponseBean();
103
         ResponseBean responseBean = new ResponseBean();
101
         try {
104
         try {
105
+            if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
106
+                taPolicy.setPublishDate(LocalDateTime.now());
107
+            }
102
             if (iTaPolicyService.save(taPolicy)){
108
             if (iTaPolicyService.save(taPolicy)){
103
                 responseBean.addSuccess(taPolicy);
109
                 responseBean.addSuccess(taPolicy);
104
             }else {
110
             }else {
143
                                         @RequestBody TaPolicy taPolicy){
149
                                         @RequestBody TaPolicy taPolicy){
144
         ResponseBean responseBean = new ResponseBean();
150
         ResponseBean responseBean = new ResponseBean();
145
         try {
151
         try {
152
+            if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
153
+                taPolicy.setPublishDate(LocalDateTime.now());
154
+            }
146
             if (iTaPolicyService.updateById(taPolicy)){
155
             if (iTaPolicyService.updateById(taPolicy)){
147
                 responseBean.addSuccess(taPolicy);
156
                 responseBean.addSuccess(taPolicy);
148
             }else {
157
             }else {
155
         return responseBean;
164
         return responseBean;
156
     }
165
     }
157
 
166
 
167
+
158
     /**
168
     /**
159
      * 根据id查询对象
169
      * 根据id查询对象
160
      * @param id  实体ID
170
      * @param id  实体ID

+ 4
- 0
src/main/java/com/huiju/estateagents/entity/TaPolicy.java View File

89
      */
89
      */
90
     private String cityName;
90
     private String cityName;
91
 
91
 
92
+    private Integer weight;
93
+
94
+    private Integer publishStatus;
95
+
92
 
96
 
93
 }
97
 }

+ 2
- 0
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java View File

167
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
167
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
168
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
168
         taRecommendCustomer.setReportRecommendStatus(CommConstant.RECOMMENDED);
169
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
169
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
170
+        taRecommendCustomer.setReportDate(LocalDateTime.now());
170
 
171
 
171
         // 时间格式 yyyy-MM-dd
172
         // 时间格式 yyyy-MM-dd
172
         String at = params.getString("appointmentTime");
173
         String at = params.getString("appointmentTime");
244
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
245
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
245
         taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
246
         taRecommendCustomer.setReportRecommendStatus(CommConstant.REPORTED);
246
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
247
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
248
+        taRecommendCustomer.setReportDate(LocalDateTime.now());
247
 
249
 
248
         // 时间格式 yyyy-MM-dd
250
         // 时间格式 yyyy-MM-dd
249
         String at = params.getString("appointmentTime");
251
         String at = params.getString("appointmentTime");