修改活动列表

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileVolunteersController.java

@@ -205,14 +205,13 @@ public class SmileVolunteersController extends BaseController {
         return volunteersService.list(param);
     }
 
-    @GetMapping("/details/{uid}/{projectId}")
+    @GetMapping("/details/{mid}")
     @ApiOperation("志愿者详情")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "projectId", value = "活动id"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "uid", value = "用户id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "mid", value = "mid"),
     })
-    public String detailsVolunteers(String projectId, String uid, ModelMap mmap) {
-        SmileVolunteersDetailsVo data = volunteersService.details(projectId, uid);
+    public String detailsVolunteers(String mid, ModelMap mmap) {
+        SmileVolunteersDetailsVo data = volunteersService.details(mid);
         mmap.put("smileVolunteersDetailsVo", data);
         return prefix + "/details";
     }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html

@@ -61,71 +61,54 @@
                 checkbox: true
             },
                 {
-                    field: 'title',
-                    title: '演出名称'
+                    field: 'mid',
+                    title: '序号'
                 },
                 {
-                    field: 'performancesId',
-                    title: '演出id'
+                    field: 'uid',
+                    title: '用户id'
                 },
                 {
-                    field: 'timeStart',
-                    title: '开演时间'
+                    field: 'name',
+                    title: '姓名'
                 },
                 {
-                    field: 'totalGeneral',
-                    title: '供票总量'
+                    field: 'img',
+                    title: '头像'
                 },
                 {
-                    field: 'saleGeneral',
-                    title: '实销'
+                    field: 'sex',
+                    title: '性别'
                 },
                 {
-                    field: 'surplusGeneral',
-                    title: '余票'
+                    field: 'status',
+                    title: '状态'
                 },
                 {
-                    field: 'totalSalePrice',
-                    title: '总销售款'
+                    field: 'school',
+                    title: '学校'
                 },
                 {
-                    field: 'statusName',
-                    title: '演出状态'
+                    field: 'phone',
+                    title: '手机号'
                 },
                 {
-                    field: 'rejectTxt',
-                    title: '拒绝理由'
-                },
-                {
-                    field: 'sort',
-                    title: '排序',
-                    sortable: true
+                    field: 'createdAt',
+                    title: '创建时间'
                 },
+
                 {
                     title: '操作',
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        if (row.auditStatus == 0 && row.fieldAuditStatus == 0) {
-                            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>');
-                        }
+                        actions.push('<a class="btn btn-warning btn-xs ' + expertFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.performancesId + '\')"><i class="fa fa-remove"></i>同步</a>');
                         return actions.join('');
                     }
                 }]
         };
         $.table.init(options);
     });
-
-    function f(id) {
-        $.post(prefix + "/sync/damai", {performancesId: id}, function (res) {
-            alert(res.msg)
-        });
-    }
 </script>
 </body>
 </html>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileVolunteersService.java

@@ -24,6 +24,6 @@ public interface ISmileVolunteersService extends IService<SmileVolunteers> {
     AjaxResult audit(String projectId, String uid, String teamId, Integer status);
 
     //志愿者详情详情
-    SmileVolunteersDetailsVo details(String projectId, String uid);
+    SmileVolunteersDetailsVo details(String mid);
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersServiceImpl.java

@@ -35,7 +35,6 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
     SmileVolunteersTeamRelationMapper volunteersTeamRelationMapper;
 
 
-
     @Override
     public TableDataInfo list(SmileVSParam param) {
         try {
@@ -93,8 +92,8 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
     }
 
     @Override
-    public SmileVolunteersDetailsVo details(String projectId, String uid) {
-        SmileVolunteers bean = volunteersMapper.selectOne(Wrappers.lambdaQuery(SmileVolunteers.class).eq(SmileVolunteers::getProjectId, projectId).eq(SmileVolunteers::getUid, uid));
+    public SmileVolunteersDetailsVo details(String mid) {
+        SmileVolunteers bean = volunteersMapper.selectOne(Wrappers.lambdaQuery(SmileVolunteers.class).eq(SmileVolunteers::getMid, mid));
         ArrayList<String> teamIdArray = CollectionUtil.arrayListString();
         if (bean == null) {
             return null;
@@ -109,7 +108,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
                 teamIdArray.add(bean.getTeamId3());
             }
         } else if (bean.getStatus().equals(1)) {//审核通过 显示分配的组
-            List<String> teamIds = volunteersTeamRelationMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersTeamRelation.class).eq(SmileVolunteersTeamRelation::getProjectId, projectId).eq(SmileVolunteersTeamRelation::getUid, uid))
+            List<String> teamIds = volunteersTeamRelationMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersTeamRelation.class).eq(SmileVolunteersTeamRelation::getProjectId, bean.getProjectId()).eq(SmileVolunteersTeamRelation::getUid, bean.getUid()))
                     .stream().map(SmileVolunteersTeamRelation::getTeamId).collect(Collectors.toList());
             teamIdArray.addAll(teamIds);
         } else {