소스 검색

Merge branch 'v3' into v3.5

魏熙美 5 년 전
부모
커밋
23fd740e2e

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java 파일 보기

274
     }
274
     }
275
     
275
     
276
     
276
     
277
-    @ApiOperation(value = "后端活动添加", notes = "后端微信活动添加")
277
+    @ApiOperation(value = "后端活动添加", notes = "后端活动添加")
278
     @ApiImplicitParams({
278
     @ApiImplicitParams({
279
             @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
279
             @ApiImplicitParam(dataType = "TaBuildingDynamic", name = "parameter", paramType = "body",value = "活动详细信息")
280
     })
280
     })

+ 9
- 1
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java 파일 보기

12
 import com.huiju.estateagents.common.CommConstant;
12
 import com.huiju.estateagents.common.CommConstant;
13
 import com.huiju.estateagents.common.DateUtils;
13
 import com.huiju.estateagents.common.DateUtils;
14
 import com.huiju.estateagents.common.StringUtils;
14
 import com.huiju.estateagents.common.StringUtils;
15
+import com.huiju.estateagents.entity.TaBuilding;
15
 import com.huiju.estateagents.entity.TaPerson;
16
 import com.huiju.estateagents.entity.TaPerson;
16
 import com.huiju.estateagents.entity.TaRecommendCustomer;
17
 import com.huiju.estateagents.entity.TaRecommendCustomer;
17
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
18
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
18
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
19
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
19
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
20
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
21
+import com.huiju.estateagents.mapper.TaBuildingMapper;
20
 import com.huiju.estateagents.mapper.TaPersonMapper;
22
 import com.huiju.estateagents.mapper.TaPersonMapper;
21
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
23
 import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
22
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
24
 import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
58
     @Autowired
60
     @Autowired
59
     ITaUserService userService;
61
     ITaUserService userService;
60
 
62
 
63
+    @Autowired
64
+    private TaBuildingMapper taBuildingMapper;
65
+
61
     @Override
66
     @Override
62
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
67
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
63
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
68
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
189
 
194
 
190
 //        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
195
 //        taRecommendCustomer.setAppointmentTime((String) params.get("appointmentTime"));
191
         taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
196
         taRecommendCustomer.setVisiteNum(params.getInteger("visiteNum"));
192
-        taRecommendCustomer.setIntention(params.getString("intention"));
197
+
198
+        TaBuilding building = taBuildingMapper.selectById(params.getString("intention"));
199
+        taRecommendCustomer.setIntention(building.getBuildingName());
200
+
193
         taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
201
         taRecommendCustomer.setRealtyManageType(params.getString("realtyManageType"));
194
         taRecommendCustomer.setDemandType(params.getString("demandType"));
202
         taRecommendCustomer.setDemandType(params.getString("demandType"));
195
         taRecommendCustomer.setPriceRange(params.getString("priceRange"));
203
         taRecommendCustomer.setPriceRange(params.getString("priceRange"));