Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/common/CommConstant.java

@@ -269,10 +269,6 @@ public class CommConstant {
      * */
     public static final String ENTRY_VERIFY = "verify";
 
-    /**
-     * 渠道报备
-     */
-    public static final String ENTRY_CHANNEL_VERIFY = "channel_verify";
     //=================  客户入口类型 end =======================
 
     /**

src/main/java/com/yunzhi/marketing/controller/TaPersonController.java

@@ -46,7 +46,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "微信用户表", tags = "xlk-微信用户表")
+@Api(value = "森哥看这里-微信用户表", tags = "森哥看这里-xlk-微信用户表")
 public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService taPersonService;
@@ -385,7 +385,7 @@ public class TaPersonController extends BaseController {
      * 成为驻场顾问
      *
      */
-    @ApiOperation(value = "wx-成为驻场顾问", notes = "admin-成为驻场顾问")
+    @ApiOperation(value = "森哥看这里-wx-成为驻场顾问", notes = "森哥看这里-wx-成为驻场顾问")
     @PostMapping("/wx/marketing")
     public ResponseBean marketing(@RequestBody PersonMarketingDTO marketingDTO, HttpServletRequest request) {
         // 当前人员

src/main/java/com/yunzhi/marketing/controller/TaRecommendCustomerController.java

@@ -52,7 +52,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "xlk - 项目类型", tags = "xlk - 项目类型")
+@Api(value = "森哥看这里-xlk - 项目类型", tags = "森哥看这里-xlk - 项目类型")
 public class TaRecommendCustomerController extends BaseController {
 
     @Autowired
@@ -92,7 +92,7 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @GetMapping("/wx/marking/customers")
-    @ApiOperation(value = "wx-查询驻场的客户列表", notes = "wx-查询驻场的客户列表")
+    @ApiOperation(value = "森哥看这里-wx-查询驻场的客户列表", notes = "森哥看这里-wx-查询驻场的客户列表")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNumber", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
@@ -227,6 +227,7 @@ public class TaRecommendCustomerController extends BaseController {
      * @return
      */
     @PostMapping("/wx/channel/report")
+    @ApiOperation(value = "森哥看这里-wx-渠道顾问报备客户", notes = "森哥看这里-wx-渠道顾问报备客户")
     public ResponseBean channelReportCust(@RequestBody ChannelReportDTO channelReportDTO, HttpServletRequest request) throws Exception {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "渠道报备客户表", tags = "xlk-渠道报备客户表")
+@Api(value = "森哥看这里-渠道报备客户表", tags = "森哥看这里-xlk-渠道报备客户表")
 public class ChannelCustomerController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(ChannelCustomerController.class);
@@ -84,7 +84,7 @@ public class ChannelCustomerController extends BaseController {
      * @param
      * @return
      */
-    @ApiOperation(value = "wx-驻场确认到访", notes = "wx-驻场确认到访")
+    @ApiOperation(value = "森哥看这里-wx-驻场确认到访", notes = "森哥看这里-wx-驻场确认到访")
     @RequestMapping(value="/wx/marking/channelCustomer",method= RequestMethod.PUT)
     public ResponseBean channelCustomerUpdate(@RequestBody MarkingChannelCustomerDTO params){
         return iChannelCustomerService.markingChannelCustomer(params);

src/main/java/com/yunzhi/marketing/xlk/service/impl/ChannelCustomerServiceImpl.java

@@ -74,7 +74,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
             taRecommendCustomer.setReportDate(LocalDateTime.now());
             taRecommendCustomer.setOrgId(customer.getOrgId());
             taRecommendCustomer.setPersonId(customer.getPersonId());
-            taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
             taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
             taRecommendCustomerMapper.insert(taRecommendCustomer);
             return ResponseBean.success("审核成功");
@@ -126,7 +126,7 @@ public class ChannelCustomerServiceImpl extends ServiceImpl<ChannelCustomerMappe
                 taRecommendCustomer.setReportDate(LocalDateTime.now());
                 taRecommendCustomer.setOrgId(customer.getOrgId());
                 taRecommendCustomer.setPersonId(customer.getPersonId());
-                taRecommendCustomer.setEntryType(CommConstant.ENTRY_CHANNEL_VERIFY);
+                taRecommendCustomer.setEntryType(CommConstant.ENTRY_VERIFY);
                 taRecommendCustomer.setStatus(CommConstant.CUSTOMER_VISITE);
                 taRecommendCustomerMapper.insert(taRecommendCustomer);
                 return ResponseBean.success("审核成功");

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -944,18 +944,19 @@ FROM
     </select>
     <select id="getMarkingCustList" resultType="com.yunzhi.marketing.po.TaRecommendCustomerPO">
         SELECT
-            customer_id AS id,
-            name,
-            phone,
-            picture,
-            sex,
+            t.customer_id AS id,
+            t.NAME,
+            t.phone,
+            t.picture,
+            t.sex,
             "customer" AS type
         FROM
-            ta_recommend_customer
+            ta_recommend_customer t
+        INNER JOIN ta_person p ON t.recommend_person = p.person_id
         WHERE
-            building_id = #{buildingId}
+            t.building_id = #{buildingId}
         <if test="keywords != null and keywords !=''">
-            and name like CONCAT('%',#{keywords}, '%')
+            and t.name like CONCAT('%',#{keywords}, '%')
         </if>
     UNION ALL
         SELECT