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

Skip to content

L
liquidnet-bus-v1
Commit d4ac52aa authored by 胡佳晨's avatar 胡佳晨
Browse files
Options

提交 创建职责组

parent 1bed9c2e
Show whitespace changes
Inline Side-by-side
Showing with 135 additions and 75 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileVolunteersController.java
View file @ d4ac52aa
...@@ -33,12 +33,36 @@ public class SmileVolunteersController extends BaseController { ...@@ -33,12 +33,36 @@ public class SmileVolunteersController extends BaseController {
private final String prefix = "zhengzai/smile/volunteers"; private final String prefix = "zhengzai/smile/volunteers";
/**
* 组列表
*/
@GetMapping("/team")
public String listTeam() {
return prefix + "/team/list";
}
/**
* 活动列表
*/
@GetMapping("/project")
public String listProject() {
return prefix + "/project/list";
}
/**
* 志愿者列表
*/
@GetMapping()
public String list() {
return prefix + "/list";
}
/** /**
* 新增组 * 新增组
*/ */
@GetMapping("/team/add") @GetMapping("/team/add")
public String addTeam() { public String addTeam() {
return prefix + "team/add"; return prefix + "/team/add";
} }
/** /**
...@@ -46,12 +70,13 @@ public class SmileVolunteersController extends BaseController { ...@@ -46,12 +70,13 @@ public class SmileVolunteersController extends BaseController {
*/ */
@GetMapping("/project/add") @GetMapping("/project/add")
public String addProject() { public String addProject() {
return prefix + "project/add"; return prefix + "/project/add";
} }
@PostMapping("team/list") @PostMapping("team/list")
@ApiOperation("职责组列表") @ApiOperation("职责组列表")
@ResponseBody
public TableDataInfo listTeam(SmileVTSParam param) { public TableDataInfo listTeam(SmileVTSParam param) {
return volunteersTeamService.list(param); return volunteersTeamService.list(param);
} }
...@@ -59,14 +84,14 @@ public class SmileVolunteersController extends BaseController { ...@@ -59,14 +84,14 @@ public class SmileVolunteersController extends BaseController {
@PostMapping("team/insert") @PostMapping("team/insert")
@ApiOperation("添加职责组") @ApiOperation("添加职责组")
@ResponseBody @ResponseBody
public AjaxResult insertTeam(@RequestBody SmileVolunteersTeam bean) { public AjaxResult insertTeam(SmileVolunteersTeam bean) {
return volunteersTeamService.insertData(bean); return volunteersTeamService.insertData(bean);
} }
@PostMapping("team/update") @PostMapping("team/update")
@ApiOperation("修改职责组") @ApiOperation("修改职责组")
@ResponseBody @ResponseBody
public AjaxResult upDateTeam(@RequestBody SmileVolunteersTeam bean) { public AjaxResult upDateTeam(SmileVolunteersTeam bean) {
return volunteersTeamService.updateData(bean); return volunteersTeamService.updateData(bean);
} }
...@@ -78,7 +103,7 @@ public class SmileVolunteersController extends BaseController { ...@@ -78,7 +103,7 @@ public class SmileVolunteersController extends BaseController {
public String detailsTeam(@PathVariable("teamId") String teamId, ModelMap mmap) { public String detailsTeam(@PathVariable("teamId") String teamId, ModelMap mmap) {
SmileVolunteersTeam data = volunteersTeamService.details(teamId); SmileVolunteersTeam data = volunteersTeamService.details(teamId);
mmap.put("smileVolunteersTeam", data); mmap.put("smileVolunteersTeam", data);
return prefix + "team/details"; return prefix + "/team/edit";
} }
@GetMapping("team/search") @GetMapping("team/search")
...@@ -104,6 +129,7 @@ public class SmileVolunteersController extends BaseController { ...@@ -104,6 +129,7 @@ public class SmileVolunteersController extends BaseController {
@PostMapping("project/list") @PostMapping("project/list")
@ApiOperation("活动列表") @ApiOperation("活动列表")
@ResponseBody
public TableDataInfo listProject(SmileVPSParam param) { public TableDataInfo listProject(SmileVPSParam param) {
return volunteersProjectService.list(param); return volunteersProjectService.list(param);
} }
...@@ -130,11 +156,12 @@ public class SmileVolunteersController extends BaseController { ...@@ -130,11 +156,12 @@ public class SmileVolunteersController extends BaseController {
public String detailsProject(@PathVariable("projectId") String projectId, ModelMap mmap) { public String detailsProject(@PathVariable("projectId") String projectId, ModelMap mmap) {
SmileProjectDetailsVo data = volunteersProjectService.details(projectId); SmileProjectDetailsVo data = volunteersProjectService.details(projectId);
mmap.put("smileProjectDetailsVo", data); mmap.put("smileProjectDetailsVo", data);
return prefix + "project/details"; return prefix + "/project/details";
} }
@PostMapping("/list") @PostMapping("/list")
@ApiOperation("志愿者列表") @ApiOperation("志愿者列表")
@ResponseBody
public TableDataInfo listVolunteers(SmileVSParam param) { public TableDataInfo listVolunteers(SmileVSParam param) {
return volunteersService.list(param); return volunteersService.list(param);
} }
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/team/add.html 0 → 100644
View file @ d4ac52aa
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('新增职责组')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-team-add">
<div class="form-group">
<label class="col-sm-3 control-label is-required">职责组名称：</label>
<div class="col-sm-8">
<input name="name" class="form-control" type="text" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">职责组介绍：</label>
<div class="col-sm-8">
<input name="introduce" class="form-control" type="text" required>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var smilePrefix = ctx + "smile/volunteers";
$("#form-team-add").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(smilePrefix + "/team/insert", $('#form-team-add').serialize());
}
}
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/team/edit.html 0 → 100644
View file @ d4ac52aa
<!DOCTYPE html>
<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
<head>
<th:block th:include="include :: header('修改职责组')" />
</head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-team-edit" th:object="${smileVolunteersTeam}">
<input name="teamId" th:value="*{teamId}" type="hidden">
<div class="form-group">
<label class="col-sm-3 control-label is-required">职责组名称：</label>
<div class="col-sm-8">
<input name="name" class="form-control" type="text" th:value="*{name}" required>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label is-required">职责组介绍：</label>
<div class="col-sm-8">
<input name="introduce" class="form-control" type="text" th:value="*{introduce}" required>
</div>
</div>
</form>
</div>
<th:block th:include="include :: footer" />
<script th:inline="javascript">
var smilePrefix = ctx + "smile/volunteers";
$("#form-roadShow-edit").validate({
focusCleanup: true
});
function submitHandler() {
if ($.validate.form()) {
$.operate.save(smilePrefix + "/team/update", $('#form-team-edit').serialize());
}
}
</script>
</body>
</html>
\ No newline at end of file
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/team/list.html
View file @ d4ac52aa
...@@ -24,6 +24,11 @@ ...@@ -24,6 +24,11 @@
</div> </div>
</form> </form>
</div> </div>
<div class="btn-group-sm" id="toolbar" role="group">
<a class="btn btn-success" onclick="$.operate.add()">
<i class="fa fa-plus"></i> 添加
</a>
</div>
<div class="col-sm-12 select-table table-striped"> <div class="col-sm-12 select-table table-striped">
<table id="bootstrap-table"></table> <table id="bootstrap-table"></table>
</div> </div>
...@@ -31,91 +36,47 @@ ...@@ -31,91 +36,47 @@
</div> </div>
<th:block th:include="include :: footer"/> <th:block th:include="include :: footer"/>
<script th:inline="javascript"> <script th:inline="javascript">
var detailFlag = [[${@permission.hasPermi('kylin:performances:detail')}]]; var smilePrefix = ctx + "smile/volunteers";
var expertFlag = [[${@permission.hasPermi('kylin:performances:expert')}]];
var prefix = ctx + "kylin/performances";
$(function () { $(function () {
var options = { var options = {
url: prefix + "/list", url: smilePrefix + "/team/list",
detailUrl: prefix + "/details/{id}", // detailUrl: prefix + "/team/details/{id}",
createUrl: prefix + "/add", createUrl: smilePrefix + "/team/add",
updateUrl: prefix + "/edit/{id}", updateUrl: smilePrefix + "/team/details/{id}",
removeUrl: prefix + "/remove", modalName: "职责组",
exportUrl: prefix + "/export",
// sortName: "sort",
modalName: "演出",
orderSc: "desc", orderSc: "desc",
orderItem: "created_at", orderItem: "created_at",
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
{ {
field: 'title', field: 'teamId',
title: '演出名称' title: '职责组id'
},
{
field: 'performancesId',
title: '演出id'
},
{
field: 'timeStart',
title: '开演时间'
},
{
field: 'totalGeneral',
title: '供票总量'
},
{
field: 'saleGeneral',
title: '实销'
}, },
{ {
field: 'surplusGeneral', field: 'name',
title: '余票' title: '组名称'
}, },
{ {
field: 'totalSalePrice', field: 'introduce',
title: '总销售款' title: '组介绍'
}, },
{ {
field: 'statusName', field: 'createdAt',
title: '演出状态' title: '创建时间'
},
{
field: 'rejectTxt',
title: '拒绝理由'
},
{
field: 'sort',
title: '排序',
sortable: true
}, },
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
var actions = []; var actions = [];
if (row.auditStatus == 0 && row.fieldAuditStatus == 0) { actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.teamId + '\')"><i class="fa fa-edit"></i>管理</a> ');
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>管理</a> ');
} else {
actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detailTab(\'' + row.performancesId + '\')"><i class="fa fa-edit"></i>查看</a> ');
}
if (row.syncDamai == 1) {
actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="f(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>');
}
return actions.join(''); return actions.join('');
} }
}] }]
}; };
$.table.init(options); $.table.init(options);
}); });
function f(id) {
$.post(prefix + "/sync/damai", {performancesId: id}, function (res) {
alert(res.msg)
});
}
</script> </script>
</body> </body>
</html> </html>
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersTeamServiceImpl.java
View file @ d4ac52aa
...@@ -39,7 +39,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT ...@@ -39,7 +39,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
PageHelper.startPage(param.getPageNum(), param.getPageSize()); PageHelper.startPage(param.getPageNum(), param.getPageSize());
LambdaQueryWrapper<SmileVolunteersTeam> wrappers = Wrappers.lambdaQuery(SmileVolunteersTeam.class); LambdaQueryWrapper<SmileVolunteersTeam> wrappers = Wrappers.lambdaQuery(SmileVolunteersTeam.class);
if (param.getTitle() != null && !param.getTitle().equals("")) { if (param.getTitle() != null && !param.getTitle().equals("")) {
wrappers.eq(SmileVolunteersTeam::getName, param.getTitle()); wrappers.like(SmileVolunteersTeam::getName, param.getTitle());
} }
List<SmileVolunteersTeam> data = volunteersTeamMapper.selectList(wrappers); List<SmileVolunteersTeam> data = volunteersTeamMapper.selectList(wrappers);
rspData.setCode(0); rspData.setCode(0);
...@@ -57,7 +57,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT ...@@ -57,7 +57,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
bean.setTeamId(IDGenerator.nextTimeId2()); bean.setTeamId(IDGenerator.nextTimeId2());
int count = volunteersTeamMapper.insert(bean); int count = volunteersTeamMapper.insert(bean);
if (count > 0) { if (count > 0) {
redisUtils.setTeam(bean.getTeamId(),bean); redisUtils.setTeam(bean.getTeamId(), bean);
return AjaxResult.success("添加成功"); return AjaxResult.success("添加成功");
} }
return AjaxResult.error("添加失败"); return AjaxResult.error("添加失败");
...@@ -75,7 +75,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT ...@@ -75,7 +75,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
} }
int count = volunteersTeamMapper.update(bean, Wrappers.lambdaQuery(SmileVolunteersTeam.class).eq(SmileVolunteersTeam::getTeamId, bean.getTeamId())); int count = volunteersTeamMapper.update(bean, Wrappers.lambdaQuery(SmileVolunteersTeam.class).eq(SmileVolunteersTeam::getTeamId, bean.getTeamId()));
if (count > 0) { if (count > 0) {
redisUtils.setTeam(bean.getTeamId(),bean); redisUtils.setTeam(bean.getTeamId(), bean);
return AjaxResult.success("修改成功"); return AjaxResult.success("修改成功");
} }
return AjaxResult.error("修改失败"); return AjaxResult.error("修改失败");
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/inner/GoblinInnerServiceImpl.java
View file @ d4ac52aa
...@@ -32,8 +32,11 @@ public class GoblinInnerServiceImpl implements IGoblinInnerService { ...@@ -32,8 +32,11 @@ public class GoblinInnerServiceImpl implements IGoblinInnerService {
@Override @Override
public ResponseDto<String> insertCoupon(MultipartFile file, String performanceId) { public ResponseDto<String> insertCoupon(MultipartFile file, String performanceId) {
try { try {
EasyExcel.read(file.getInputStream(), TempCouponDto.class, new PageReadListener<TempCouponDto>(dataList -> { if(file!=null){
redisUtils.delMarketTempCoupon(performanceId);
}
redisUtils.delMarketTempCoupon(performanceId); redisUtils.delMarketTempCoupon(performanceId);
EasyExcel.read(file.getInputStream(), TempCouponDto.class, new PageReadListener<TempCouponDto>(dataList -> {
for (TempCouponDto data : dataList) { for (TempCouponDto data : dataList) {
if (data.getSpuId() == null) { if (data.getSpuId() == null) {
continue; continue;
......
liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileVolunteersController.java
View file @ d4ac52aa
package com.liquidnet.service.controller; package com.liquidnet.service.controller;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.service.base.ResponseDto; import com.liquidnet.service.base.ResponseDto;
import com.liquidnet.service.goblin.constant.SmileRedisConst;
import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
import com.liquidnet.service.goblin.dto.vo.SmileVProjectListVo; import com.liquidnet.service.goblin.dto.vo.SmileVProjectListVo;
import com.liquidnet.service.goblin.dto.vo.SmileVProjectVo; import com.liquidnet.service.goblin.dto.vo.SmileVProjectVo;
import com.liquidnet.service.goblin.param.SmileVolunteersApplyParam; import com.liquidnet.service.goblin.param.SmileVolunteersApplyParam;
import com.liquidnet.service.goblin.service.manage.SmileFrontService;
import com.liquidnet.service.goblin.service.manage.SmileVolunteersService; import com.liquidnet.service.goblin.service.manage.SmileVolunteersService;
import com.liquidnet.service.util.SmileRedisUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
......
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