记得上下班打卡 | git大法好,push需谨慎

Commit 5e3cf743 authored by 胡佳晨's avatar 胡佳晨

提交 yb报名

parent 1dc5495c
...@@ -46,4 +46,9 @@ public class SweetYbEnrollParam implements Serializable { ...@@ -46,4 +46,9 @@ public class SweetYbEnrollParam implements Serializable {
@ApiModelProperty(position = 19, required = false, value = "活动id", example = "0") @ApiModelProperty(position = 19, required = false, value = "活动id", example = "0")
private String activityId; private String activityId;
@ApiModelProperty(position = 20, required = false, value = "平均年龄", example = "0")
private Integer age;
} }
...@@ -19,6 +19,8 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable { ...@@ -19,6 +19,8 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable {
private String contactWechat; private String contactWechat;
@Excel(name = "乐队名称", cellType = Excel.ColumnType.STRING) @Excel(name = "乐队名称", cellType = Excel.ColumnType.STRING)
private String nickname; private String nickname;
@Excel(name = "平均年龄", cellType = Excel.ColumnType.STRING)
private String age;
@Excel(name = "风格", cellType = Excel.ColumnType.STRING) @Excel(name = "风格", cellType = Excel.ColumnType.STRING)
private String style; private String style;
@Excel(name = "图片地址", cellType = Excel.ColumnType.STRING) @Excel(name = "图片地址", cellType = Excel.ColumnType.STRING)
...@@ -46,6 +48,7 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable { ...@@ -46,6 +48,7 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable {
public SweetYbActivityExportVo copyOrderExportVo(SweetYbEnroll source,String name) { public SweetYbActivityExportVo copyOrderExportVo(SweetYbEnroll source,String name) {
this.setActivityName(name); this.setActivityName(name);
this.setAge(source.getAge()+"");
this.setContactTell(source.getContactTell()); this.setContactTell(source.getContactTell());
this.setContactWechat(source.getContactWechat()); this.setContactWechat(source.getContactWechat());
this.setNickname(source.getNickname()); this.setNickname(source.getNickname());
......
...@@ -70,6 +70,11 @@ public class SweetYbEnroll implements Serializable { ...@@ -70,6 +70,11 @@ public class SweetYbEnroll implements Serializable {
*/ */
private String cityName; private String cityName;
/**
* 平均年龄
*/
private int age;
/** /**
* 活动id * 活动id
*/ */
......
...@@ -512,6 +512,8 @@ alter table sweet_yb_enroll ...@@ -512,6 +512,8 @@ alter table sweet_yb_enroll
add city_name varchar(255) NOT NULL DEFAULT '' COMMENT '常驻城市名称' after universities; add city_name varchar(255) NOT NULL DEFAULT '' COMMENT '常驻城市名称' after universities;
alter table sweet_yb_enroll alter table sweet_yb_enroll
add activity_id varchar(255) DEFAULT '0' COMMENT '活动id' after city_name; add activity_id varchar(255) DEFAULT '0' COMMENT '活动id' after city_name;
alter table sweet_yb_enroll
add age int DEFAULT 0 COMMENT '平均年龄' after city_name;
-- YB活动 -- YB活动
drop TABLE if exists `sweet_yb_activity`; drop TABLE if exists `sweet_yb_activity`;
......
...@@ -48,6 +48,9 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService { ...@@ -48,6 +48,9 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
if (param.getActivityId() == null || param.getActivityId().equals("")) { if (param.getActivityId() == null || param.getActivityId().equals("")) {
param.setActivityId("0"); param.setActivityId("0");
} }
if (param.getAge() == null ) {
param.setAge(0);
}
LinkedList<String> sqls = CollectionUtil.linkedListString(); LinkedList<String> sqls = CollectionUtil.linkedListString();
LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr(); LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
sqls.add(SqlMapping.get("sweet_yb_enroll.insert")); sqls.add(SqlMapping.get("sweet_yb_enroll.insert"));
...@@ -55,7 +58,7 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService { ...@@ -55,7 +58,7 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
IDGenerator.nextSnowId(), StringUtil.isEmpty(param.getContactTell()) ? "" : param.getContactTell(), IDGenerator.nextSnowId(), StringUtil.isEmpty(param.getContactTell()) ? "" : param.getContactTell(),
StringUtil.isEmpty(param.getContactWechat()) ? "" : param.getContactWechat(), param.getNickname(), param.getStyle(), StringUtil.isEmpty(param.getContactWechat()) ? "" : param.getContactWechat(), param.getNickname(), param.getStyle(),
param.getImgUrl(), param.getAudioUrl(), StringUtil.isEmpty(param.getUniversities()) ? "" : param.getUniversities(), param.getImgUrl(), param.getAudioUrl(), StringUtil.isEmpty(param.getUniversities()) ? "" : param.getUniversities(),
StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName(), param.getActivityId() StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName(), param.getActivityId(),param.getAge()
}); });
queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(), queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(),
SqlMapping.gets(sqls, sqlsDataA)); SqlMapping.gets(sqls, sqlsDataA));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment