|
@@ -14,22 +14,21 @@ import com.huiju.estateagents.common.CommConstant;
|
14
|
14
|
import com.huiju.estateagents.common.JWTUtils;
|
15
|
15
|
import com.huiju.estateagents.common.StringUtils;
|
16
|
16
|
import com.huiju.estateagents.entity.*;
|
|
17
|
+import com.huiju.estateagents.event.EventBus;
|
17
|
18
|
import com.huiju.estateagents.excel.HelpInitiateRecordSucceed;
|
18
|
19
|
import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
|
19
|
20
|
import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
|
20
|
21
|
import com.huiju.estateagents.mapper.TaActivityDynamicEnlistMapper;
|
21
|
22
|
import com.huiju.estateagents.mapper.TaBuildingMapper;
|
22
|
23
|
import com.huiju.estateagents.mapper.TaSharePersonFromMapper;
|
23
|
|
-import com.huiju.estateagents.service.ITaBuildingDynamicService;
|
24
|
|
-import com.huiju.estateagents.service.ITaBuildingService;
|
25
|
|
-import com.huiju.estateagents.service.ITaPersonService;
|
26
|
|
-import com.huiju.estateagents.service.ITaSaveService;
|
|
24
|
+import com.huiju.estateagents.service.*;
|
27
|
25
|
import io.swagger.annotations.Api;
|
28
|
26
|
import io.swagger.annotations.ApiImplicitParam;
|
29
|
27
|
import io.swagger.annotations.ApiImplicitParams;
|
30
|
28
|
import io.swagger.annotations.ApiOperation;
|
31
|
29
|
import org.springframework.beans.factory.annotation.Autowired;
|
32
|
30
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
|
|
31
|
+import org.springframework.context.ApplicationContext;
|
33
|
32
|
import org.springframework.format.annotation.DateTimeFormat;
|
34
|
33
|
import org.springframework.web.bind.ServletRequestDataBinder;
|
35
|
34
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -48,6 +47,8 @@ import java.util.HashMap;
|
48
|
47
|
import java.util.List;
|
49
|
48
|
import java.util.Map;
|
50
|
49
|
|
|
50
|
+import static com.huiju.estateagents.event.EventBus.EventType.ActivityCheckin;
|
|
51
|
+
|
51
|
52
|
/**
|
52
|
53
|
* <p>
|
53
|
54
|
* 项目动态表 前端控制器
|
|
@@ -82,6 +83,10 @@ public class TaBuildingDynamicController extends BaseController {
|
82
|
83
|
@Autowired
|
83
|
84
|
private TaSharePersonFromMapper taSharePersonFromMapper;
|
84
|
85
|
|
|
86
|
+ @Autowired
|
|
87
|
+ private ApplicationContext applicationContext;
|
|
88
|
+
|
|
89
|
+
|
85
|
90
|
@InitBinder
|
86
|
91
|
protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
|
87
|
92
|
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
|
|
@@ -244,9 +249,13 @@ public class TaBuildingDynamicController extends BaseController {
|
244
|
249
|
enlistQueryWrapper.eq("dynamic_id",dynamicId);
|
245
|
250
|
enlistQueryWrapper.eq("person_id",person.getPersonId());
|
246
|
251
|
enlistQueryWrapper.eq("org_id",orgId);
|
247
|
|
- TaActivityDynamicEnlist enlist = taActivityDynamicEnlistMapper.selectOne(enlistQueryWrapper);
|
|
252
|
+ List <TaActivityDynamicEnlist> enlists = taActivityDynamicEnlistMapper.selectList(enlistQueryWrapper);
|
248
|
253
|
TaBuildingDynamic buildingDynamic = iBuildingDynamicService.getById(dynamicId);
|
249
|
254
|
Map<String,Object>data = new HashMap<>();
|
|
255
|
+ TaActivityDynamicEnlist enlist = new TaActivityDynamicEnlist();
|
|
256
|
+ if(enlists.size()>0){
|
|
257
|
+ enlist=enlists.get(0);
|
|
258
|
+ }
|
250
|
259
|
data.put("enlist",enlist);
|
251
|
260
|
data.put("dynamic",buildingDynamic);
|
252
|
261
|
data.put("person",person);
|
|
@@ -262,7 +271,7 @@ public class TaBuildingDynamicController extends BaseController {
|
262
|
271
|
*/
|
263
|
272
|
@ApiOperation(value = "微信端活动签到", notes = "微信端活动签到")
|
264
|
273
|
@ApiImplicitParams({
|
265
|
|
- @ApiImplicitParam(dataTypeClass = String.class, name = "enlistId", paramType = "path",value = "活动报名ID")
|
|
274
|
+ @ApiImplicitParam(dataTypeClass = Integer.class, name = "enlistId", paramType = "path",value = "活动报名ID")
|
266
|
275
|
})
|
267
|
276
|
@RequestMapping(value = "/wx/buildingDynamicCheckin/{enlistId}", method = RequestMethod.PUT)
|
268
|
277
|
public ResponseBean iBuildingDynamicCheckin(@PathVariable(value = "enlistId") String enlistId,
|
|
@@ -273,7 +282,8 @@ public class TaBuildingDynamicController extends BaseController {
|
273
|
282
|
if(null != enlist){
|
274
|
283
|
enlist.setIsCheckin(CommConstant.STATUS_NORMAL);
|
275
|
284
|
if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
|
276
|
|
- responseBean.addSuccess("签到成功");
|
|
285
|
+ applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
|
|
286
|
+ responseBean.addSuccess(enlist);
|
277
|
287
|
}else {
|
278
|
288
|
responseBean.addError("签到失败");
|
279
|
289
|
}
|