|
@@ -10,9 +10,11 @@ import com.huiju.estateagents.common.JWTUtils;
|
10
|
10
|
import com.huiju.estateagents.entity.TaActivityDynamicEnlist;
|
11
|
11
|
import com.huiju.estateagents.entity.TaBuilding;
|
12
|
12
|
import com.huiju.estateagents.entity.TaBuildingDynamic;
|
|
13
|
+import com.huiju.estateagents.entity.TaPerson;
|
13
|
14
|
import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
|
14
|
15
|
import com.huiju.estateagents.mapper.TaBuildingMapper;
|
15
|
16
|
import com.huiju.estateagents.service.ITaBuildingDynamicService;
|
|
17
|
+import com.huiju.estateagents.service.ITaPersonService;
|
16
|
18
|
import org.springframework.beans.factory.annotation.Autowired;
|
17
|
19
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
18
|
20
|
import org.springframework.web.bind.ServletRequestDataBinder;
|
|
@@ -26,6 +28,7 @@ import java.text.SimpleDateFormat;
|
26
|
28
|
import java.time.LocalDateTime;
|
27
|
29
|
import java.util.Date;
|
28
|
30
|
import java.util.HashMap;
|
|
31
|
+import java.util.List;
|
29
|
32
|
|
30
|
33
|
/**
|
31
|
34
|
* <p>
|
|
@@ -45,6 +48,9 @@ public class TaBuildingDynamicController extends BaseController {
|
45
|
48
|
@Autowired
|
46
|
49
|
private TaBuildingMapper taBuildingMapper;
|
47
|
50
|
|
|
51
|
+ @Autowired
|
|
52
|
+ private ITaPersonService taPersonService;
|
|
53
|
+
|
48
|
54
|
@InitBinder
|
49
|
55
|
protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
|
50
|
56
|
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
|
|
@@ -79,9 +85,21 @@ public class TaBuildingDynamicController extends BaseController {
|
79
|
85
|
public ResponseBean wxBuildingDynamiceList(@RequestParam(value = "buildingId")String buildingId,
|
80
|
86
|
@RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum,
|
81
|
87
|
@RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize,
|
|
88
|
+ @RequestParam(defaultValue = "false" )boolean mine,
|
82
|
89
|
HttpServletRequest request){
|
83
|
90
|
String openid = JWTUtils.getSubject(request);
|
84
|
|
- ResponseBean responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
|
|
91
|
+ ResponseBean responseBean = new ResponseBean();
|
|
92
|
+ if(mine){
|
|
93
|
+ List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
|
|
94
|
+ if (null == taPersons || taPersons.size() != 1) {
|
|
95
|
+ return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
|
|
96
|
+ }
|
|
97
|
+ TaPerson person = taPersons.get(0);
|
|
98
|
+ responseBean.addSuccess(taPersonService.getJoinedActivity(pageNum,pageSize,person.getPhone(),""));
|
|
99
|
+ }else {
|
|
100
|
+ responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNum,pageSize,buildingId,openid);
|
|
101
|
+ }
|
|
102
|
+
|
85
|
103
|
return responseBean;
|
86
|
104
|
}
|
87
|
105
|
|