bugfix

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

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

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

@@ -6,6 +6,9 @@ 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.common.JWTUtils;
+import com.huiju.estateagents.entity.TdCity;
+import com.huiju.estateagents.service.ITdCityService;
 import com.huiju.estateagents.service.ITaPolicyService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -19,6 +22,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 
 /**
@@ -38,6 +42,9 @@ public class TaPolicyController extends BaseController {
     @Autowired
     public ITaPolicyService iTaPolicyService;
 
+    @Autowired
+    private ITdCityService iTdCityService;
+
 
     /**
      * 分页查询列表
@@ -55,9 +62,9 @@ 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.eq("publish_status",CommConstant.IS_PUBLISH);
-            queryWrapper.gt("status",CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("create_date","weight");
+            queryWrapper.orderByDesc("weight", "create_date");
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -84,7 +91,9 @@ 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","weight");
+            queryWrapper.eq("publish_status",CommConstant.IS_PUBLISH);
+            queryWrapper.orderByDesc("weight", "create_date");
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
@@ -101,12 +110,22 @@ public class TaPolicyController extends BaseController {
      * @return
      */
     @RequestMapping(value="/admin/taPolicy",method= RequestMethod.POST)
-    public ResponseBean taPolicyAdd(@RequestBody TaPolicy taPolicy){
+    public ResponseBean taPolicyAdd(@RequestBody TaPolicy taPolicy, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
+                String personId = JWTUtils.getSubject(request);
+                taPolicy.setPublishUser(personId);
             }
+
+            TdCity tdCity = iTdCityService.getById(taPolicy.getCityId());
+            taPolicy.setCityName(tdCity.getName());
+
+            taPolicy.setStatus(1);
+            taPolicy.setCreateDate(LocalDateTime.now());
+
             if (iTaPolicyService.save(taPolicy)){
                 responseBean.addSuccess(taPolicy);
             }else {
@@ -128,7 +147,9 @@ public class TaPolicyController extends BaseController {
     public ResponseBean taPolicyDelete(@PathVariable Integer id){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaPolicyService.removeById(id)){
+            TaPolicy policy=iTaPolicyService.getById(id);
+            policy.setStatus(CommConstant.STATUS_DELETE);
+            if(iTaPolicyService.updateById(policy)){
                 responseBean.addSuccess("success");
             }else {
                 responseBean.addError("fail");
@@ -148,12 +169,21 @@ public class TaPolicyController extends BaseController {
      */
     @RequestMapping(value="/admin/taPolicy/{id}",method= RequestMethod.PUT)
     public ResponseBean taPolicyUpdate(@PathVariable Integer id,
-                                        @RequestBody TaPolicy taPolicy){
+                                        @RequestBody TaPolicy taPolicy,
+                                       HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+
+
             if(taPolicy.getPublishStatus().equals(CommConstant.IS_PUBLISH)){
                 taPolicy.setPublishDate(LocalDateTime.now());
+                String personId = JWTUtils.getSubject(request);
+                taPolicy.setPublishUser(personId);
             }
+
+            TdCity tdCity = iTdCityService.getById(taPolicy.getCityId());
+            taPolicy.setCityName(tdCity.getName());
+
             if (iTaPolicyService.updateById(taPolicy)){
                 responseBean.addSuccess(taPolicy);
             }else {
@@ -166,7 +196,6 @@ public class TaPolicyController extends BaseController {
         return responseBean;
     }
 
-
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -89,9 +89,14 @@ public class TaPolicy implements Serializable {
      */
     private String cityName;
 
+    /**
+     * 权重
+     */
     private Integer weight;
 
+    /**
+     * 发布状态
+     */
     private Integer publishStatus;
 
-
 }