From 96f64f416802c8434607667fa8ff998dc0c2b988 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 9 Aug 2019 16:17:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=87=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201908091615__G_ALTER_ACTIVITY_JOIN.sql | 3 +++ .../com/iformall/domain/po/WxActivityJoin.java | 7 ++++++- .../domain/vo/WxActivityJoinQuestionAnswer.java | 14 ++++++++++++++ .../service/impl/WxActivityJoinServiceImpl.java | 16 ++++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201908091615__G_ALTER_ACTIVITY_JOIN.sql create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxActivityJoinQuestionAnswer.java diff --git a/mallinkAdmin/src/main/resources/db/migration/V201908091615__G_ALTER_ACTIVITY_JOIN.sql b/mallinkAdmin/src/main/resources/db/migration/V201908091615__G_ALTER_ACTIVITY_JOIN.sql new file mode 100644 index 000000000..b64579205 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201908091615__G_ALTER_ACTIVITY_JOIN.sql @@ -0,0 +1,3 @@ +ALTER TABLE wx_activity_join add column telphone varchar(15) DEFAULT '' COMMENT '联系电话'; + + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index d37ac71d5..9fc13d286 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java @@ -57,7 +57,8 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "手机", name = "phone") private String phone; - @io.swagger.annotations.ApiModelProperty(value = "答案", name = "answer") + @Excel(name = "调查问券", width = 10, orderNum = "10") + @io.swagger.annotations.ApiModelProperty(value = "调查问券", name = "answer") private String answer; @Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") @@ -81,4 +82,8 @@ public class WxActivityJoin extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "状态", name = "statusStr") private String statusStr; + @Excel(name = "联系电话", width = 10, orderNum = "9") + @io.swagger.annotations.ApiModelProperty(value = "联系电话", name = "telphone") + private String telphone; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxActivityJoinQuestionAnswer.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxActivityJoinQuestionAnswer.java new file mode 100644 index 000000000..7e44e11a6 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxActivityJoinQuestionAnswer.java @@ -0,0 +1,14 @@ +package com.iformall.domain.vo; + +import lombok.Data; + +/** + * @author gongbiao + * @date 2019/8/9 + */ +@Data +public class WxActivityJoinQuestionAnswer { + + private String ques; + private String answer; +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java index 14e67748e..db0a785a6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxActivityJoinServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -11,6 +12,7 @@ import com.iformall.domain.po.WxActivityJoin; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.msg.WxMsgRecord; +import com.iformall.domain.vo.WxActivityJoinQuestionAnswer; import com.iformall.enums.*; import com.iformall.mapper.*; import com.iformall.mq.MqBaseProducer; @@ -93,6 +95,20 @@ public class WxActivityJoinServiceImpl implements WxActivityJoinService { WxActivity wxActivity = wxActivityMapper.selectByPrimaryKey(wxActivityJoin.getActivityId()); String title = wxActivity.getTitle(); List list = wxActivityJoinMapper.findList(wxActivityJoin); + for (WxActivityJoin activityJoin : list) { + String answer = activityJoin.getAnswer(); + if (StringUtils.isNotEmpty(answer)) { + StringBuffer quesAnswer = new StringBuffer(); + List wxActivityJoinQuestionAnswers = JSONArray.parseArray(answer, WxActivityJoinQuestionAnswer.class); + for (int i = 0; i < wxActivityJoinQuestionAnswers.size(); i++) { + WxActivityJoinQuestionAnswer wxActivityJoinQuestionAnswer = wxActivityJoinQuestionAnswers.get(i); + quesAnswer.append("[").append("问题").append(i + 1).append(":").append(wxActivityJoinQuestionAnswer.getQues()) + .append(",").append("答案").append(":").append(wxActivityJoinQuestionAnswer.getAnswer()) + .append("]"); + activityJoin.setAnswer(quesAnswer.toString()); + } + } + } excelService.exportExcel(list, title, title, WxActivityJoin.class, "报名表.xlsx", response, false); }