From ce40c998ca2e199f46832cc8e6f13db90aa15184 Mon Sep 17 00:00:00 2001 From: Renpc-kilig <308442850@qq.com> Date: Fri, 3 Feb 2023 14:33:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=8A=9F=E8=83=BD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActivityJoinAppController.java | 27 ++++++++- .../usercenter/dao/activity/IActivityDao.java | 6 ++ .../dao/activityjoin/IActivityJoinDao.java | 7 +++ .../dtos/activityjoin/ActivityJoinDTO.java | 42 ++++++++------ .../activityjoin/IActivityJoinService.java | 5 ++ .../impl/ActivityJoinServiceImpl.java | 37 +++++++++++- .../activity-join/activity-join-mapper.xml | 48 +++++++++++++++- .../activity-responsible-mapper.xml | 1 + .../templates/activity-join/list.html | 22 +------- .../templates/activity-join/update.html | 38 +++++-------- .../templates/activity-responsible/list.html | 56 +------------------ .../templates/activity-responsible/save.html | 8 +-- .../activity-responsible/update.html | 8 +-- 13 files changed, 175 insertions(+), 130 deletions(-) diff --git a/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java b/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java index a23025d..959d0d2 100644 --- a/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java +++ b/src/main/java/cn/com/tenlion/usercenter/controller/app/api/activityjoin/ActivityJoinAppController.java @@ -67,7 +67,7 @@ public class ActivityJoinAppController extends DefaultBaseController { @PutMapping("updateactivityjoin/{activityJoinId}") @CheckRequestBodyAnnotation public SuccessResult updateActivityJoin(@RequestHeader("token") String token, @PathVariable("activityJoinId") String activityJoinId, @RequestBody ActivityJoinVO activityJoinVO) { - activityJoinService.update(token, activityJoinId, activityJoinVO); + activityJoinService.updateApp(token, activityJoinId, activityJoinVO); return new SuccessResult(); } @@ -118,4 +118,29 @@ public class ActivityJoinAppController extends DefaultBaseController { return new SuccessResultData<>(activityJoinService.count(params)); } + @ApiOperation(value = "报名人员列表", notes = "列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "activityJoinId", value = "报名id", paramType = "path", dataType = "String"), + @ApiImplicitParam(name = "activityId", value = "活动id", paramType = "path", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listAll") + public List listAll(@RequestHeader("token") String token) { + Map params = requestParams(); + return activityJoinService.listAll(params); + } + + @ApiOperation(value = "父级列表", notes = "列表接口") + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "token", paramType = "header"), + @ApiImplicitParam(name = "activityId", value = "活动id", paramType = "path", dataType = "String") + }) + @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)}) + @GetMapping("listParent") + public List listParent(@RequestHeader("token") String token) { + Map params = requestParams(); + return activityJoinService.listParent(params); + } + } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/usercenter/dao/activity/IActivityDao.java b/src/main/java/cn/com/tenlion/usercenter/dao/activity/IActivityDao.java index 6fddf4f..deb045c 100644 --- a/src/main/java/cn/com/tenlion/usercenter/dao/activity/IActivityDao.java +++ b/src/main/java/cn/com/tenlion/usercenter/dao/activity/IActivityDao.java @@ -117,4 +117,10 @@ public interface IActivityDao { */ Integer count(Map params) throws SearchException; + /** + * 删除某活动下的某组报名信息 + * @param params + * @throws UpdateException + */ + void deleteAll(Map params) throws UpdateException; } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/usercenter/dao/activityjoin/IActivityJoinDao.java b/src/main/java/cn/com/tenlion/usercenter/dao/activityjoin/IActivityJoinDao.java index a862012..d501e65 100644 --- a/src/main/java/cn/com/tenlion/usercenter/dao/activityjoin/IActivityJoinDao.java +++ b/src/main/java/cn/com/tenlion/usercenter/dao/activityjoin/IActivityJoinDao.java @@ -117,4 +117,11 @@ public interface IActivityJoinDao { */ Integer count(Map params) throws SearchException; + /** + * 获取报名列表(某一活动下的某组数据) + * @param params + * @return + * @throws SearchException + */ + List listAll(Map params) throws SearchException; } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/usercenter/pojo/dtos/activityjoin/ActivityJoinDTO.java b/src/main/java/cn/com/tenlion/usercenter/pojo/dtos/activityjoin/ActivityJoinDTO.java index d19b0b5..87f8f62 100644 --- a/src/main/java/cn/com/tenlion/usercenter/pojo/dtos/activityjoin/ActivityJoinDTO.java +++ b/src/main/java/cn/com/tenlion/usercenter/pojo/dtos/activityjoin/ActivityJoinDTO.java @@ -42,25 +42,27 @@ public class ActivityJoinDTO { private String gmtModified; @ApiModelProperty(name = "isDelete", value = "") private Integer isDelete; + @ApiModelProperty(name = "activityName", value = "活动名称") + private String activityName; public String getActivityJoinId() { - return activityJoinId == null ? "" : activityJoinId.trim(); + return activityJoinId; } public void setActivityJoinId(String activityJoinId) { this.activityJoinId = activityJoinId; } - public String getActivityD() { - return activityId == null ? "" : activityId.trim(); + public String getActivityId() { + return activityId; } - public void setActivityD(String activityD) { - this.activityId = activityD; + public void setActivityId(String activityId) { + this.activityId = activityId; } public String getName() { - return name == null ? "" : name.trim(); + return name; } public void setName(String name) { @@ -68,7 +70,7 @@ public class ActivityJoinDTO { } public String getCardNum() { - return cardNum == null ? "" : cardNum.trim(); + return cardNum; } public void setCardNum(String cardNum) { @@ -76,7 +78,7 @@ public class ActivityJoinDTO { } public String getUserType() { - return userType == null ? "" : userType.trim(); + return userType; } public void setUserType(String userType) { @@ -84,7 +86,7 @@ public class ActivityJoinDTO { } public String getPhone() { - return phone == null ? "" : phone.trim(); + return phone; } public void setPhone(String phone) { @@ -92,7 +94,7 @@ public class ActivityJoinDTO { } public String getRemake() { - return remake == null ? "" : remake.trim(); + return remake; } public void setRemake(String remake) { @@ -100,7 +102,7 @@ public class ActivityJoinDTO { } public String getParentId() { - return parentId == null ? "" : parentId.trim(); + return parentId; } public void setParentId(String parentId) { @@ -108,7 +110,7 @@ public class ActivityJoinDTO { } public Integer getOrderNum() { - return orderNum == null ? 0 : orderNum; + return orderNum; } public void setOrderNum(Integer orderNum) { @@ -116,7 +118,7 @@ public class ActivityJoinDTO { } public String getCreator() { - return creator == null ? "" : creator.trim(); + return creator; } public void setCreator(String creator) { @@ -124,7 +126,7 @@ public class ActivityJoinDTO { } public String getGmtCreate() { - return gmtCreate == null ? "" : gmtCreate.trim(); + return gmtCreate; } public void setGmtCreate(String gmtCreate) { @@ -132,7 +134,7 @@ public class ActivityJoinDTO { } public String getModifier() { - return modifier == null ? "" : modifier.trim(); + return modifier; } public void setModifier(String modifier) { @@ -140,7 +142,7 @@ public class ActivityJoinDTO { } public String getGmtModified() { - return gmtModified == null ? "" : gmtModified.trim(); + return gmtModified; } public void setGmtModified(String gmtModified) { @@ -148,12 +150,18 @@ public class ActivityJoinDTO { } public Integer getIsDelete() { - return isDelete == null ? 0 : isDelete; + return isDelete; } public void setIsDelete(Integer isDelete) { this.isDelete = isDelete; } + public String getActivityName() { + return activityName; + } + public void setActivityName(String activityName) { + this.activityName = activityName; + } } diff --git a/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/IActivityJoinService.java b/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/IActivityJoinService.java index f697242..08db94b 100644 --- a/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/IActivityJoinService.java +++ b/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/IActivityJoinService.java @@ -185,4 +185,9 @@ public interface IActivityJoinService { */ Integer count(Map params); + List listAll(Map params); + + void updateApp(String token, String activityJoinId, ActivityJoinVO activityJoinVO); + + List listParent(Map params); } \ No newline at end of file diff --git a/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java b/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java index 346cade..50db4bb 100644 --- a/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java +++ b/src/main/java/cn/com/tenlion/usercenter/service/activityjoin/impl/ActivityJoinServiceImpl.java @@ -1,5 +1,7 @@ package cn.com.tenlion.usercenter.service.activityjoin.impl; +import cn.com.tenlion.usercenter.dao.activity.IActivityDao; +import cn.com.tenlion.usercenter.pojo.dtos.activity.ActivityDTO; import ink.wgink.common.base.DefaultBaseService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.result.SuccessResult; @@ -32,6 +34,8 @@ public class ActivityJoinServiceImpl extends DefaultBaseService implements IActi @Autowired private IActivityJoinDao activityJoinDao; + @Autowired + private IActivityDao activityDao; @Override public void save(ActivityJoinVO activityJoinVO) { @@ -55,10 +59,10 @@ public class ActivityJoinServiceImpl extends DefaultBaseService implements IActi if(activityJoinVOList.size() > 0) { for(ActivityJoinVO activityJoinVO1: activityJoinVOList) { activityJoinVO1.setParentId(activityId); - if(StringUtils.isEmpty(activityJoinVO.getPhone())) { + if(!StringUtils.isEmpty(activityJoinVO.getPhone())) { activityJoinVO1.setPhone(activityJoinVO.getPhone()); } - if(StringUtils.isEmpty(activityJoinVO.getRemake())) { + if(!StringUtils.isEmpty(activityJoinVO.getRemake())) { activityJoinVO1.setRemake(activityJoinVO.getRemake()); } saveReturnId(token, activityJoinVO1); @@ -160,7 +164,14 @@ public class ActivityJoinServiceImpl extends DefaultBaseService implements IActi @Override public List list(Map params) { - return activityJoinDao.list(params); + List list = activityJoinDao.list(params); + ActivityDTO activityDTO = activityDao.get(params); + if(list.size() > 0) { + for (ActivityJoinDTO activityJoinDTO : list) { + activityJoinDTO.setActivityName(activityDTO.getName()); + } + } + return list; } @Override @@ -187,4 +198,24 @@ public class ActivityJoinServiceImpl extends DefaultBaseService implements IActi return count == null ? 0 : count; } + @Override + public List listAll(Map params) { + return activityJoinDao.listAll(params); + } + + @Override + public void updateApp(String token, String activityJoinId, ActivityJoinVO activityJoinVO) { + Map params = new HashMap<>(2); + params.put("activityJoinId", activityJoinId); + activityDao.deleteAll(params); + + setData(token, activityJoinVO); + } + + @Override + public List listParent(Map params) { + params.put("listParent", "yes"); + return list(params); + } + } \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml b/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml index c42c9d3..b4dc1d8 100644 --- a/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml +++ b/src/main/resources/mybatis/mapper/activity-join/activity-join-mapper.xml @@ -114,6 +114,15 @@ + + + DELETE FROM + m_activity_join + WHERE + activity_join_id = #{activityJoinId} + OR parent_id = #{activityJoinId} + + UPDATE @@ -248,9 +257,14 @@ m_activity_join t1 WHERE t1.is_delete = 0 + + AND t1.activity_id = #{activityId} + + + AND t1.parent_id = '' + AND ( - t1.id LIKE CONCAT('%', #{keywords}, '%') ) @@ -271,6 +285,38 @@ + + + diff --git a/src/main/resources/templates/activity-join/list.html b/src/main/resources/templates/activity-join/list.html index 57c75b9..1959b2c 100644 --- a/src/main/resources/templates/activity-join/list.html +++ b/src/main/resources/templates/activity-join/list.html @@ -66,7 +66,7 @@ var laydate = layui.laydate; var common = layui.common; var resizeTimeout = null; - var tableUrl = 'api/activity-join/listpage'; + var tableUrl = 'api/activity-join/listpage?activityId={activityId}'; var activityId = top.restAjax.params(window.location.href).activityId; // 初始化表格 @@ -74,7 +74,7 @@ table.render({ elem: '#dataTable', id: 'dataTable', - url: top.restAjax.path(tableUrl, []), + url: top.restAjax.path(tableUrl, [activityId]), width: admin.screen() > 1 ? '100%' : '', height: $win.height() - 90, limit: 20, @@ -141,24 +141,6 @@ } return rowData; } - }, - {field: 'parentId', width: 180, title: '父ID', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'orderNum', width: 180, title: '排序', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } } ] ], diff --git a/src/main/resources/templates/activity-join/update.html b/src/main/resources/templates/activity-join/update.html index 021b8f7..d3d4191 100644 --- a/src/main/resources/templates/activity-join/update.html +++ b/src/main/resources/templates/activity-join/update.html @@ -21,12 +21,6 @@
-
- -
- -
-
@@ -37,38 +31,28 @@
+
-
+
- + +
-
+
-
+
-
- -
- -
-
-
- -
- -
-
@@ -99,9 +83,6 @@ parent.layer.close(parent.layer.getFrameIndex(window.name)); } - - - // 初始化内容 function initData() { var loadLayerIndex; @@ -110,6 +91,13 @@ for(var i in data) { dataFormData[i] = data[i] +''; } + if(!data['parentId']) { + $('#phoneDiv').show(); + $('#remakeDiv').show(); + }else { + $('#phoneDiv').hide(); + $('#remakeDiv').hide(); + } form.val('dataForm', dataFormData); form.render(null, 'dataForm'); }, function(code, data) { diff --git a/src/main/resources/templates/activity-responsible/list.html b/src/main/resources/templates/activity-responsible/list.html index 79681b4..0fa1cfe 100644 --- a/src/main/resources/templates/activity-responsible/list.html +++ b/src/main/resources/templates/activity-responsible/list.html @@ -87,15 +87,6 @@ [ {type:'checkbox', fixed: 'left'}, {field:'rowNum', width:80, title: '序号', fixed: 'left', align:'center', templet: '{{d.LAY_INDEX}}'}, - {field: 'activityResponsibleId', width: 180, title: '主键UUID', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, {field: 'titlePhoto', width: 180, title: '标题图片', align:'center', templet: function(row) { var rowData = row[this.field]; @@ -156,52 +147,7 @@ } return rowData; } - }, - {field: 'creator', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'gmtCreate', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'modifier', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'gmtModified', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, - {field: 'isDelete', width: 180, title: '', align:'center', - templet: function(row) { - var rowData = row[this.field]; - if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { - return '-'; - } - return rowData; - } - }, + } ] ], page: true, diff --git a/src/main/resources/templates/activity-responsible/save.html b/src/main/resources/templates/activity-responsible/save.html index 88e3871..01208fc 100644 --- a/src/main/resources/templates/activity-responsible/save.html +++ b/src/main/resources/templates/activity-responsible/save.html @@ -42,7 +42,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
@@ -72,7 +72,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
@@ -276,7 +276,7 @@ // 初始化描述富文本 function initDescriptionRichText() { var editor = new wangEditor('#description'); - editor.customConfig.zIndex = 1000; + editor.customConfig.zIndex = 0; editor.customConfig.uploadImgMaxSize = 5 * 1024 * 1024; editor.customConfig.uploadImgMaxLength = 1; editor.customConfig.uploadFileName = 'image'; @@ -299,7 +299,7 @@ // 初始化内容富文本 function initContentRichText() { var editor = new wangEditor('#content'); - editor.customConfig.zIndex = 1000; + editor.customConfig.zIndex = 0; editor.customConfig.uploadImgMaxSize = 5 * 1024 * 1024; editor.customConfig.uploadImgMaxLength = 1; editor.customConfig.uploadFileName = 'image'; diff --git a/src/main/resources/templates/activity-responsible/update.html b/src/main/resources/templates/activity-responsible/update.html index 95396f4..499bf02 100644 --- a/src/main/resources/templates/activity-responsible/update.html +++ b/src/main/resources/templates/activity-responsible/update.html @@ -42,7 +42,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
@@ -72,7 +72,7 @@
{{# } }} {{# } }} - {{# if(d[fileName].length < 9) { }} + {{# if(d[fileName].length < 1) { }}
@@ -278,7 +278,7 @@ // 初始化描述富文本 function initDescriptionRichText(value) { var editor = new wangEditor('#description'); - editor.customConfig.zIndex = 1000; + editor.customConfig.zIndex = 0; editor.customConfig.uploadImgMaxSize = 5 * 1024 * 1024; editor.customConfig.uploadImgMaxLength = 1; editor.customConfig.uploadFileName = 'image'; @@ -302,7 +302,7 @@ // 初始化内容富文本 function initContentRichText(value) { var editor = new wangEditor('#content'); - editor.customConfig.zIndex = 1000; + editor.customConfig.zIndex = 0; editor.customConfig.uploadImgMaxSize = 5 * 1024 * 1024; editor.customConfig.uploadImgMaxLength = 1; editor.customConfig.uploadFileName = 'image';