feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.11</version>
+	<version>1.0.12</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -600,4 +600,5 @@ public class TaUserController extends BaseController {
         }
         return responseBean;
     }
+
 }

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

@@ -260,8 +260,9 @@ public class TaGoodsController extends BaseController {
     @RequestMapping(value="/wx/goods",method= RequestMethod.GET)
     public ResponseBean wxGoodsList(@RequestParam(value ="pageNumber",defaultValue = "1") Integer pageNumber,
                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                    @RequestParam(value = "buildingId",required = false) String buildingId,
-                                    @RequestParam(value = "cityId", required = false) Integer cityId,
+                                    @RequestParam(value = "goodsName",required = false) String goodsName,
+//                                    @RequestParam(value = "buildingId",required = false) String buildingId,
+//                                    @RequestParam(value = "cityId", required = false) Integer cityId,
                                     HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         String openid = getOpenId(request);
@@ -275,16 +276,15 @@ public class TaGoodsController extends BaseController {
             //使用分页插件
             IPage<TaGoods> pg = new Page<>(pageNumber, pageSize);
             QueryWrapper<TaGoods> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id", orgId);
+            queryWrapper.like(!StringUtils.isEmpty(goodsName), "goods_name", "%"+goodsName+"%");
             queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-            if (!StringUtils.isEmpty(buildingId)){
-                queryWrapper.eq("building_id", buildingId);
-            }
-            if (null != orgId){
-                queryWrapper.eq("org_id", orgId);
-            }
-            if (null != cityId){
-                queryWrapper.eq("city_id", cityId);
-            }
+//            if (!StringUtils.isEmpty(buildingId)){
+//                queryWrapper.eq("building_id", buildingId);
+//            }
+//            if (null != cityId){
+//                queryWrapper.eq("city_id", cityId);
+//            }
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.controller;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TpNewsType;
 import com.huiju.estateagents.service.ITpNewsTypeService;
 import io.swagger.annotations.Api;
@@ -127,6 +128,9 @@ public class TpNewsTypeController extends BaseController {
                                        HttpServletRequest request){
         QueryWrapper<TpNewsType> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("org_id",getOrgId(request));
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
         return ResponseBean.success(iTpNewsTypeService.list(queryWrapper));
     }
 

src/main/java/com/huiju/estateagents/property/controller/TpRepairTypeController.java

@@ -65,7 +65,7 @@ public class TpRepairTypeController extends BaseController {
         queryWrapper.eq("wx".equals(client),"status", CommConstant.STATUS_NORMAL);
         queryWrapper.gt("admin".equals(client),"status", CommConstant.STATUS_DELETE);
         queryWrapper.orderByDesc("sort_num");
-        queryWrapper.orderByDesc("create_time");
+        queryWrapper.orderByDesc("created_time");
 
         IPage<TpRepairType> result = iTpRepairTypeService.page(pg, queryWrapper);
         return ResponseBean.success(result);
@@ -104,6 +104,7 @@ public class TpRepairTypeController extends BaseController {
     public ResponseBean tpRepairTypeDelete(@ApiParam("对象ID") @PathVariable Integer id,
                                            HttpServletRequest request) throws Exception{
         TpRepairType tpRepairType = iTpRepairTypeService.getById(id);
+        tpRepairType.setStatus(CommConstant.STATUS_DELETE);
         return tpRepairTypeUpdate(tpRepairType.getTypeId(), tpRepairType, request);
     }
 
@@ -135,9 +136,10 @@ public class TpRepairTypeController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/tpRepairType/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/tpRepairType/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean tpRepairTypeGet(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean tpRepairTypeGet(@ApiParam("客户端") @PathVariable String client,
+                                        @ApiParam("对象ID") @PathVariable Integer id,
                                         HttpServletRequest request) throws Exception{
         TpRepairType tpRepairType = iTpRepairTypeService.getById(id);
         if (null == tpRepairType || tpRepairType.getStatus().equals(CommConstant.STATUS_DELETE) || !tpRepairType.getOrgId().equals(getOrgId(request))) {

src/main/java/com/huiju/estateagents/property/entity/TpRepairType.java

@@ -53,20 +53,18 @@ public class TpRepairType implements Serializable {
     private Integer status;
 
     @ApiModelProperty(value = "创建人")
-    @TableField("CREATED_BY")
     private String createdBy;
 
     @ApiModelProperty(value = "创建时间")
-    @TableField("CREATED_TIME")
     private LocalDateTime createdTime;
 
     @ApiModelProperty(value = "更新人")
-    @TableField("UPDATED_BY")
     private String updatedBy;
 
     @ApiModelProperty(value = "更新时间")
-    @TableField("UPDATED_TIME")
     private LocalDateTime updatedTime;
 
-
+    @ApiModelProperty(value = "说明")
+    @TableField("`desc`")
+    private String desc;
 }