瀏覽代碼

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

张延森 5 年之前
父節點
當前提交
65cb13bac6

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

107
     /**
107
     /**
108
      * 活动详情
108
      * 活动详情
109
      * @param dynamicId
109
      * @param dynamicId
110
-     * @param buildingId
111
      * @return
110
      * @return
112
      */
111
      */
113
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
112
     @RequestMapping(value = "/wx/buildingDynamiceInfo/{dynamicId}", method = RequestMethod.GET)
114
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
113
     public ResponseBean iBuildingDynamicInfo(@PathVariable(value = "dynamicId") String dynamicId,
115
-                                             @RequestParam("buildingId")String buildingId,
114
+
116
                                              HttpServletRequest request){
115
                                              HttpServletRequest request){
117
         String openid = JWTUtils.getSubject(request);
116
         String openid = JWTUtils.getSubject(request);
117
+        String buildingId = "";
118
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
118
         ResponseBean  responseBean = iBuildingDynamicService.getWxBuildingDynamiceInfo(dynamicId,buildingId,openid);
119
         return responseBean;
119
         return responseBean;
120
     }
120
     }

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

113
     /**
113
     /**
114
      * 修改对象
114
      * 修改对象
115
      * @param id  实体ID
115
      * @param id  实体ID
116
-     * @param taPersonVisitRecord 实体对象
117
      * @return
116
      * @return
118
      */
117
      */
119
     @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
118
     @RequestMapping(value="/wx/taPersonVisitRecord/{id}",method= RequestMethod.PUT)
120
-    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id,
121
-                                        @RequestBody TaPersonVisitRecord taPersonVisitRecord){
122
-        ResponseBean responseBean = new ResponseBean();
119
+    public ResponseBean taPersonVisitRecordUpdate(@PathVariable Integer id){
120
+        TaPersonVisitRecord taPersonVisitRecord = iTaPersonVisitRecordService.getById(id);
123
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
121
         taPersonVisitRecord.setLeaveTime(LocalDateTime.now());
124
         taPersonVisitRecord.setRecordId(id);
122
         taPersonVisitRecord.setRecordId(id);
125
         Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();
123
         Long duation = taPersonVisitRecord.getLeaveTime().atZone(ZoneOffset.UTC).toEpochSecond()-taPersonVisitRecord.getVisitTime().atZone(ZoneOffset.UTC).toEpochSecond();

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

602
     public IPage<Map<String,Object>> getSavedConsaultants(int pageNumber,int pageSize,String personId){
602
     public IPage<Map<String,Object>> getSavedConsaultants(int pageNumber,int pageSize,String personId){
603
         QueryWrapper<TaSave> savePerson = new QueryWrapper<>();
603
         QueryWrapper<TaSave> savePerson = new QueryWrapper<>();
604
         savePerson.eq("person_id",personId);
604
         savePerson.eq("person_id",personId);
605
-        savePerson.eq("target_type",CommConstant.FAVOR_CONSULTANT);
605
+        savePerson.eq("tagert_type",CommConstant.FAVOR_CONSULTANT);
606
         List<TaSave> savedPerson = taSaveMapper.selectList(savePerson);
606
         List<TaSave> savedPerson = taSaveMapper.selectList(savePerson);
607
         List<String> personIds = new ArrayList<>();
607
         List<String> personIds = new ArrayList<>();
608
         for(int i =0;i<savedPerson.size();i++){
608
         for(int i =0;i<savedPerson.size();i++){