From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index f3bb9b7..64e9037 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -38,7 +38,7 @@
@Resource
private UserService userService;
- @ApiOperation(value = "分页党建动态/政策文件",response =PartyCommitteeVO.class )
+ @ApiOperation(value = "分页党建动态/政策文件",response =PartyBuildingComPbDynVO.class )
@PostMapping("pagedynamic")
public R pageYnamic(@RequestBody PartyBuildingComPbDynVO partyBuildingComPbDynVO){
Long communityId = this.getCommunityId();
@@ -76,7 +76,14 @@
comPbDynUserVO.setCreateAt(new Date());
comPbDynUserVO.setDynId(id);
comPbDynUserVO.setUserId(userId);
- partyBuildingService.addDynUser(comPbDynUserVO);
+ R r1 = partyBuildingService.addDynUser(comPbDynUserVO);
+ PartyBuildingComPbDynVO partyBuildingComPbDynVO=JSONObject.parseObject(JSONObject.toJSONString(r.getData()),PartyBuildingComPbDynVO.class);
+ if (R.isOk(r1)) {
+ partyBuildingComPbDynVO.setIsAdd(1);
+ }else{
+ partyBuildingComPbDynVO.setIsAdd(0);
+ }
+ return R.ok(partyBuildingComPbDynVO);
}
return r;
}
@@ -133,7 +140,8 @@
sysUserNoticeVO.setTitle("报名成功");
sysUserNoticeVO.setBusinessType(2);
sysUserNoticeVO.setBusinessTitle(partyBuildingActivityVO.getName());
- sysUserNoticeVO.setBusinessContent(String.format("活动将于%s开始，请按时参加",partyBuildingActivityVO.getActivityTimeBegin()));
+ Date activityTimeBegin = partyBuildingActivityVO.getActivityTimeBegin();
+ sysUserNoticeVO.setBusinessContent(String.format("活动将于 %tF %tT 开始，请按时参加", activityTimeBegin,activityTimeBegin));
sysUserNoticeVO.setBusinessId(id);
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(2);
@@ -182,4 +190,9 @@
return partyBuildingService.pageServiceTeam(pageComPbServiceTeamDTO);
}
+ public static void main(String[] args) {
+ Date date = new Date();
+ String dateFormat = String.format("%tF %tT ", date, date);
+ System.out.println(dateFormat);
+ }
}
--
Gitblit v1.7.1