Merge branch 'v3' into v3.5

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

@@ -274,7 +274,7 @@ public class TaBuildingDynamicController extends BaseController {
     }
     
     
-    @ApiOperation(value = "后端活动添加", notes = "后端微信活动添加")
+    @ApiOperation(value = "后端活动添加", notes = "后端活动添加")
     @ApiImplicitParams({
             @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
     })

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

@@ -12,11 +12,13 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
@@ -58,6 +60,9 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     ITaUserService userService;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -189,7 +194,10 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 //        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
         taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
-        taRecommendCustomer.setIntention(params.getString("intention"));
+
+        TaBuilding building = taBuildingMapper.selectById(params.getString("intention"));
+        taRecommendCustomer.setIntention(building.getBuildingName());
+
         taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
         taRecommendCustomer.setDemandType(params.getString("demandType"));
         taRecommendCustomer.setPriceRange(params.getString("priceRange"));