修改 ui相关问题

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

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
@@ -83,8 +85,7 @@ public class SmileVolunteersController extends BaseController {
         SmileVTSParam param = new SmileVTSParam();
         param.setPageNum(1);
         param.setPageSize(40);
-        TableDataInfo tableDataInfo = volunteersTeamService.list(param);
-        List<SmileVolunteersTeam> list = (List<SmileVolunteersTeam>) tableDataInfo.getRows();
+        List<SmileVolunteersTeam> list = volunteersTeamService.list(param);
         mmap.put("platformUrl", platformUrl);
         mmap.put("listData", list);
         return prefix + "/project/add";
@@ -95,8 +96,8 @@ public class SmileVolunteersController extends BaseController {
     @ApiOperation("职责组列表")
     @ResponseBody
     public TableDataInfo listTeam(SmileVTSParam param) {
-        TableDataInfo tableDataInfo = volunteersTeamService.list(param);
-        return tableDataInfo;
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        return getDataTable(volunteersTeamService.list(param));
     }
 
     @PostMapping("team/insert")
@@ -149,7 +150,8 @@ public class SmileVolunteersController extends BaseController {
     @ApiOperation("活动列表")
     @ResponseBody
     public TableDataInfo listProject(SmileVPSParam param) {
-        return volunteersProjectService.list(param);
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        return getDataTable(volunteersProjectService.list(param));
     }
 
     @PostMapping("project/insert")
@@ -176,9 +178,8 @@ public class SmileVolunteersController extends BaseController {
         SmileVTSParam param = new SmileVTSParam();
         param.setPageNum(1);
         param.setPageSize(40);
-        TableDataInfo tableDataInfo = volunteersTeamService.list(param);
         List<SmileVolunteersTeamVo> listVo = new ArrayList<>();
-        List<SmileVolunteersTeam> listBean = ((List<SmileVolunteersTeam>) tableDataInfo.getRows());
+        List<SmileVolunteersTeam> listBean = volunteersTeamService.list(param);
         List<String> list = data.getTeamArray().stream().map(SmileVolunteersTeam::getTeamId).collect(Collectors.toList());
         for (SmileVolunteersTeam bean : listBean) {
             SmileVolunteersTeamVo vo = SmileVolunteersTeamVo.getNew();
@@ -202,7 +203,8 @@ public class SmileVolunteersController extends BaseController {
     @ApiOperation("志愿者列表")
     @ResponseBody
     public TableDataInfo listVolunteers(SmileVSParam param) {
-        return volunteersService.list(param);
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        return getDataTable(volunteersService.list(param));
     }
 
     @GetMapping("/details/{mid}")

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

@@ -28,7 +28,9 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">头像：</label>
             <div class="col-sm-8">
-                <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>
+                <!--                <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>-->
+                <img class="img-details" name="img" th:src="*{img}"
+                     th:onclick="click_big([[*{img}]])">
             </div>
         </div>
         <div class="form-group">
@@ -96,7 +98,7 @@
         </div>
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">用户申请职责组：</label>
-            <table id="team-table_user" th:border="1">
+            <table id="team-table_user" class="table table-condensed table-sm" th:border="1">
                 <tr>
                     <td>名称</td>
                     <td>介绍</td>
@@ -113,7 +115,7 @@
         </div>
         <div class="form-group" th:if="*{status==0}">
             <label class="col-sm-3 control-label is-required">可分配申请职责组：</label>
-            <table id="team-table" th:border="1">
+            <table id="team-table" class="table table-condensed table-sm" th:border="1">
                 <tr>
                     <td>名称</td>
                     <td>介绍</td>

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

@@ -54,7 +54,7 @@
     </form>
 
     <form class="form-horizontal m" id="form-team" th:object="${listData}">
-        <table id="team-table" th:border="1">
+        <table id="team-table" class="table table-condensed table-sm" th:border="1">
             <tr>
                 <td>名称</td>
                 <td>介绍</td>

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

@@ -72,7 +72,7 @@
     </form>
 
     <form class="form-horizontal m" id="form-team">
-        <table id="team-table" th:border="1">
+        <table id="team-table" class="table table-condensed table-sm" th:border="1">
             <tr>
                 <td>名称</td>
                 <td>介绍</td>

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

@@ -8,6 +8,8 @@ import com.liquidnet.service.goblin.dto.vo.SmileProjectDetailsVo;
 import com.liquidnet.service.smile.entity.SmileVolunteersProject;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 志愿者-志愿者项目表 服务类
@@ -19,7 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISmileVolunteersProjectService extends IService<SmileVolunteersProject> {
 
     //活动列表
-    TableDataInfo list(SmileVPSParam param);
+    List<SmileVolunteersProject> list(SmileVPSParam param);
 
     //活动添加
     AjaxResult insertData(SmileVPParam param);

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

 package com.liquidnet.client.admin.zhengzai.smile.service;
 
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVSParam;
@@ -7,6 +8,8 @@ import com.liquidnet.service.goblin.dto.vo.SmileVolunteersDetailsVo;
 import com.liquidnet.service.smile.entity.SmileVolunteers;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 志愿者-志愿者表 服务类
@@ -18,7 +21,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISmileVolunteersService extends IService<SmileVolunteers> {
 
     //志愿者列表
-    TableDataInfo list(SmileVSParam param);
+    List<SmileVolunteers> list(SmileVSParam param);
 
     //志愿者审核
     AjaxResult audit(String projectId, String uid, String teamId, Integer status);

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

@@ -19,7 +19,7 @@ import java.util.List;
 public interface ISmileVolunteersTeamService extends IService<SmileVolunteersTeam> {
 
     //组列表
-    TableDataInfo list(SmileVTSParam param);
+    List<SmileVolunteersTeam> list(SmileVTSParam param);
 
     //组添加
     AjaxResult insertData(SmileVolunteersTeam bean);

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

@@ -44,20 +44,16 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
     SmileRedisUtils redisUtils;
 
     @Override
-    public TableDataInfo list(SmileVPSParam param) {
+    public List<SmileVolunteersProject> list(SmileVPSParam param) {
         try {
             TableDataInfo rspData = new TableDataInfo();
-//            PageHelper.startPage(param.getPageNum(), param.getPageSize());
             LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
             if (param.getTitle() != null && !param.getTitle().equals("")) {
                 wrappers.like(SmileVolunteersProject::getTitle, param.getTitle());
             }
             wrappers.orderByDesc(SmileVolunteersProject::getCreatedAt);
             List<SmileVolunteersProject> data = volunteersProjectMapper.selectList(wrappers);
-            rspData.setCode(0);
-            rspData.setRows(data);
-            rspData.setTotal(data.size());
-            return rspData;
+            return data;
         } catch (Exception e) {
             e.printStackTrace();
             return null;

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVSParam;
@@ -36,10 +37,9 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
 
 
     @Override
-    public TableDataInfo list(SmileVSParam param) {
+    public List<SmileVolunteers> list(SmileVSParam param) {
         try {
             TableDataInfo rspData = new TableDataInfo();
-//            PageHelper.startPage(param.getPageNum(), param.getPageSize());
             LambdaQueryWrapper<SmileVolunteers> wrappers = Wrappers.lambdaQuery(SmileVolunteers.class);
             if (param.getTitle() != null && !param.getTitle().equals("")) {
                 List<String> projectIdArray = volunteersProjectMapper.selectList(Wrappers.lambdaQuery(SmileVolunteersProject.class).like(SmileVolunteersProject::getTitle, param.getTitle())).stream().map(SmileVolunteersProject::getProjectId).collect(Collectors.toList());
@@ -55,10 +55,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
                 wrappers.eq(SmileVolunteers::getStatus, param.getStatus());
             }
             List<SmileVolunteers> data = volunteersMapper.selectList(wrappers.orderByDesc(SmileVolunteers::getCreatedAt));
-            rspData.setCode(0);
-            rspData.setRows(data);
-            rspData.setTotal(data.size());
-            return rspData;
+            return data;
         } catch (Exception e) {
             e.printStackTrace();
             return null;
@@ -69,7 +66,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
     public AjaxResult audit(String projectId, String uid, String teamId, Integer status) {
         try {
             LambdaQueryWrapper<SmileVolunteers> wrappers = Wrappers.lambdaQuery(SmileVolunteers.class).eq(SmileVolunteers::getProjectId, projectId).eq(SmileVolunteers::getUid, uid);
-                SmileVolunteers bean = volunteersMapper.selectOne(wrappers);
+            SmileVolunteers bean = volunteersMapper.selectOne(wrappers);
             if (bean != null && !bean.getStatus().equals(0)) {
                 return AjaxResult.warn("已审核");
             }

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

@@ -34,7 +34,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
     SmileRedisUtils redisUtils;
 
     @Override
-    public TableDataInfo list(SmileVTSParam param) {
+    public  List<SmileVolunteersTeam> list(SmileVTSParam param) {
         try {
             TableDataInfo rspData = new TableDataInfo();
             LambdaQueryWrapper<SmileVolunteersTeam> wrappers = Wrappers.lambdaQuery(SmileVolunteersTeam.class);
@@ -43,11 +43,7 @@ public class SmileVolunteersTeamServiceImpl extends ServiceImpl<SmileVolunteersT
             }
             wrappers.orderByDesc(SmileVolunteersTeam::getCreatedAt);
             List<SmileVolunteersTeam> data = volunteersTeamMapper.selectList(wrappers);
-//            PageHelper.startPage(param.getPageNum(), param.getPageSize());
-            rspData.setCode(0);
-            rspData.setRows(data);
-            rspData.setTotal(data.size());
-            return rspData;
+            return data;
         } catch (Exception e) {
             e.printStackTrace();
             return null;