胡轶钦 5 年之前
父節點
當前提交
afc93c813b

+ 3
- 2
src/main/java/com/huiju/estateagents/controller/ExtendContentController.java 查看文件

@@ -87,8 +87,9 @@ public class ExtendContentController extends BaseController {
87 87
                                                   @RequestParam(value = "contentType", required = false) String contentType,
88 88
                                                   @RequestParam(value = "buildingId", required = false) String buildingId,
89 89
                                                   @RequestParam(value = "contentId", required = false) String contentId,
90
-                                                  @RequestParam(value = "cityId", required = false) Integer cityId){
91
-        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId);
90
+                                                  @RequestParam(value = "cityId", required = false) Integer cityId,
91
+                                                  HttpServletRequest request){
92
+        ResponseBean responseBean= iExtendContentService.selectExtendContentListShowType(showType, showPosition, targetId,contentType, buildingId, contentId, cityId,getOrgId(request));
92 93
         return responseBean;
93 94
     }
94 95
 

+ 1
- 0
src/main/java/com/huiju/estateagents/controller/MiniAppController.java 查看文件

@@ -78,6 +78,7 @@ public class MiniAppController extends BaseController {
78 78
             String code,
79 79
             @RequestParam(required = false) String from,
80 80
             @RequestParam(required = false)String recommender,
81
+            @RequestParam(required = false)String targetId,
81 82
             HttpServletRequest request) {
82 83
         String appid = request.getHeader("appid");
83 84
 

+ 22
- 0
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

@@ -24,6 +24,10 @@ import com.huiju.estateagents.service.ITaPersonService;
24 24
 import com.huiju.estateagents.service.ITaRecommendCustomerService;
25 25
 import com.huiju.estateagents.service.TaChannelPersonService;
26 26
 import com.huiju.estateagents.service.TaChannelService;
27
+import io.swagger.annotations.Api;
28
+import io.swagger.annotations.ApiImplicitParam;
29
+import io.swagger.annotations.ApiImplicitParams;
30
+import io.swagger.annotations.ApiOperation;
27 31
 import org.springframework.beans.factory.annotation.Autowired;
28 32
 import org.springframework.context.ApplicationContext;
29 33
 import org.springframework.web.bind.annotation.*;
@@ -48,6 +52,7 @@ import java.util.List;
48 52
  */
49 53
 @RestController
50 54
 @RequestMapping("/api")
55
+@Api(value = "项目类型", tags = "项目类型")
51 56
 public class TaRecommendCustomerController extends BaseController {
52 57
 
53 58
     @Autowired
@@ -74,6 +79,12 @@ public class TaRecommendCustomerController extends BaseController {
74 79
      * @return
75 80
      */
76 81
     @GetMapping("/wx/customer/list")
82
+    @ApiOperation(value = "查询我的客户列表", notes = "查询我的客户列表")
83
+    @ApiImplicitParams({
84
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query",value = "第几页"),
85
+            @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query",value = "一页多少行"),
86
+            @ApiImplicitParam(dataTypeClass = String.class, name = "keywords", paramType = "query",value = "搜索关键字,目前仅支持姓名")
87
+    })
77 88
     public ResponseBean getMyCustList(@RequestParam int pageNumber, @RequestParam int pageSize, String keywords, HttpServletRequest request) {
78 89
         if (pageNumber < 0 || pageSize < 0) {
79 90
             return ResponseBean.error("分页参数不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -89,6 +100,10 @@ public class TaRecommendCustomerController extends BaseController {
89 100
      * @return
90 101
      */
91 102
     @GetMapping("/wx/customer/{id}")
103
+    @ApiOperation(value = "查询客户详情", notes = "查询客户详情")
104
+    @ApiImplicitParams({
105
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字,目前仅支持姓名")
106
+    })
92 107
     public ResponseBean getCustDetail(@PathVariable String id) {
93 108
         if (null == id || "".equals(id.trim())) {
94 109
             return ResponseBean.error("请求地址错误", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -103,6 +118,10 @@ public class TaRecommendCustomerController extends BaseController {
103 118
      * @return
104 119
      */
105 120
     @PostMapping("/wx/customer/edit")
121
+    @ApiOperation(value = "客户编辑", notes = "客户编辑")
122
+    @ApiImplicitParams({
123
+            @ApiImplicitParam(dataTypeClass = String.class, name = "id", paramType = "path",value = "搜索关键字,目前仅支持姓名")
124
+    })
106 125
     public ResponseBean updateCust(@RequestBody String paramStr) {
107 126
         return taRecommendCustomerService.updateCustByJSON(paramStr);
108 127
     }
@@ -478,6 +497,9 @@ public class TaRecommendCustomerController extends BaseController {
478 497
                 taRecommendCustomer.setVerifyStatus(verifyStatus);
479 498
                 if(!StringUtils.isEmpty(verifyRemark)){
480 499
                     taRecommendCustomer.setVerifyRemark(verifyRemark);
500
+                    if(CommConstant.CUSTOMER_REPORT.equals(taRecommendCustomer.getReportRecommendStatus())){
501
+                        taRecommendCustomer.setRealtyConsultant(taRecommendCustomer.getRecommendPerson());
502
+                    }
481 503
                 }
482 504
                 if (taRecommendCustomerService.updateById(taRecommendCustomer)){
483 505
 

+ 4
- 0
src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java 查看文件

@@ -52,4 +52,8 @@ public class TaActivityDynamicEnlist implements Serializable {
52 52
 
53 53
     private Integer orgId;
54 54
 
55
+    private String sharePerson;
56
+
57
+    private String sharePersonType;
58
+
55 59
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/service/IExtendContentService.java 查看文件

@@ -37,5 +37,5 @@ public interface IExtendContentService extends IService<ExtendContent> {
37 37
      * @param cityId
38 38
      * @return
39 39
      */
40
-    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId);
40
+    ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId,Integer orgId);
41 41
 }

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/ExtendContentServiceImpl.java 查看文件

@@ -59,7 +59,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
59 59
     }
60 60
 
61 61
     @Override
62
-    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId) {
62
+    public ResponseBean selectExtendContentListShowType(String showType, String showPosition, String targetId, String contentType, String buildingId, String contentId, Integer cityId,Integer orgId) {
63 63
         ResponseBean responseBean= new ResponseBean<>();
64 64
         // 开屏
65 65
         QueryWrapper<ExtendContent> extendContentQuery= new QueryWrapper<>();
@@ -73,6 +73,7 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
73 73
         extendContentQuery.eq(StringUtils.isNotBlank(buildingId), "building_id",buildingId);
74 74
         extendContentQuery.eq(null != cityId && cityId != 0, "city_id", cityId);
75 75
         extendContentQuery.eq("status","1");
76
+        extendContentQuery.eq("org_id",orgId);
76 77
         List<ExtendContent> taExtendContent = extendContentMapper.selectList(extendContentQuery);
77 78
         responseBean.addSuccess(taExtendContent);
78 79
         return responseBean;