Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents

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

@@ -107,14 +107,14 @@ public class TaBuildingDynamicController extends BaseController {
     /**
      * 活动详情
      * @param dynamicId
-     * @param buildingId
      * @return
      */
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
-                                             @RequestParam("buildingId")String buildingId,
+
                                              HttpServletRequest request){
         String openid = JWTUtils.getSubject(request);
+        String buildingId = "";
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
         return responseBean;
     }

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

@@ -113,13 +113,11 @@ public class TaPersonVisitRecordController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param taPersonVisitRecord 实体对象
      * @return
      */
     @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
-    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id,
-                                        @RequestBody TaPersonVisitRecord taPersonVisitRecord){
-        ResponseBean responseBean = new ResponseBean();
+    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
+        TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
         taPersonVisitRecord.setRecordId(id);
         Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();

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

@@ -602,7 +602,7 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     public IPage<Map<String,Object>> getSavedConsaultants(int pageNumber,int pageSize,String personId){
         QueryWrapper<TaSave> savePerson = new QueryWrapper<>();
         savePerson.eq("person_id",personId);
-        savePerson.eq("target_type",CommConstant.FAVOR_CONSULTANT);
+        savePerson.eq("tagert_type",CommConstant.FAVOR_CONSULTANT);
         List<TaSave> savedPerson = taSaveMapper.selectList(savePerson);
         List<String> personIds = new ArrayList<>();
         for(int i =0;i<savedPerson.size();i++){