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

Skip to content

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

修改 志愿者活动列表列明 

修改 志愿者列表 增加 性别筛选
增加 志愿者详情 增加 点击图片展示大图
parent 26bb70e8
Hide whitespace changes
Inline Side-by-side
Showing with 223 additions and 22 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-dev.yml
View file @ 73431480
......@@ -6,7 +6,7 @@ liquidnet:
username: user
password: user123
eureka:
host: 39.107.71.112:7001
host: 127.0.0.1:7001
# end-dev-这里是配置信息基本值
spring:
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html
View file @ 73431480
......@@ -150,6 +150,27 @@
focusCleanup: true
});
// 点击图片放大
function click_big(url) {
var img_url = url
if (url.indexOf("x-oss-process") != "-1") {
img_url = url.split("?")[0]
}
var json = {
"data": [ //相册包含的图片，数组格式
{
"alt": "图片",
"src": img_url, //原图地址
}
]
};
layer.photos({
photos: json,
closeBtn: 1, //右上角按钮，可通过配置1和2来展示，如果不显示，则closeBtn: 0
anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
});
}
function submitHandler(status) {
var teamIds = $("input[name^='teamCheck']:checked").val()
var uid = $("input[name^='uid']").val()
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html
View file @ 73431480
......@@ -30,6 +30,14 @@
<label>手机号：</label>
<input type="text" name="phone"/>
</li>
<li>
<label>性别：</label>
<select name="sex">
<option value="-1">全部</option>
<option value="1">男</option>
<option value="2">女</option>
</select>
</li>
<li>
<label>审核状态：</label>
<select name="status">
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/project/list.html
View file @ 73431480
......@@ -53,29 +53,61 @@
columns: [{
checkbox: true
},
{
field: 'projectId',
title: '活动id'
},
// {
// field: 'projectId',
// title: '活动id'
// },
{
field: 'title',
title: '活动名称'
},
{
field: 'img',
title: '封面图',
formatter: function (value, row, index) {
return $.table.imageView(value, "300", "300");
}
field: 'all',
title: '报名人数'
},
{
field: 'unAudit',
title: '待审核'
},
{
field: 'audit',
title: '审核通过'
},
{
field: 'refuse',
title: '已拒绝'
},
// {
// field: 'img',
// title: '封面图',
// formatter: function (value, row, index) {
// return $.table.imageView(value, "300", "300");
// }
// },
{
field: 'timeStart',
title: '开始时间'
title: '活动时间',
formatter: function (value, row, index) {
return row.timeStart.split("T")[0] +" 至 "+row.timeEnd.split("T")[0]
}
},
{
field: 'timeEnd',
title: '结束时间'
field: 'timeStatus',
title: '活动状态',
formatter: function (value, row, index) {
if(value===1){
return "活动中"
}else{
return "已结束";
}
}
},
// {
// field: 'timeEnd',
// title: '结束时间'
// },
{
field: 'createdAt',
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileVSParam.java
View file @ 73431480
......@@ -19,6 +19,8 @@ public class SmileVSParam {
private String phone;
@ApiModelProperty(value = "审核状态", example = "")
private Integer status;
@ApiModelProperty(value = "性别[1-男|2-女]", example = "")
private Integer sex;
@ApiModelProperty(value = "职责组名称", example = "")
private String team;
@ApiModelProperty(value = "活动id", example = "")
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileVolunteersProjectService.java
View file @ 73431480
......@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPSParam;
import com.liquidnet.service.goblin.dto.vo.SmileProjectDetailsVo;
import com.liquidnet.service.smile.entity.SmileVolunteersProject;
import com.baomidou.mybatisplus.extension.service.IService;
import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
import java.util.List;
......@@ -21,7 +22,7 @@ import java.util.List;
public interface ISmileVolunteersProjectService extends IService<SmileVolunteersProject> {
//活动列表
List<SmileVolunteersProject> list(SmileVPSParam param);
List<SmileVolunteersProjectListDto> 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/impl/SmileVolunteersProjectServiceImpl.java
View file @ 73431480
......@@ -15,6 +15,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
import com.liquidnet.service.smile.entity.SmileProjectTeamRelation;
import com.liquidnet.service.smile.entity.SmileVolunteersProject;
import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
import com.liquidnet.service.smile.mapper.SmileProjectTeamRelationMapper;
import com.liquidnet.service.smile.mapper.SmileVolunteersProjectMapper;
import com.liquidnet.service.smile.mapper.SmileVolunteersTeamMapper;
......@@ -44,15 +45,15 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
SmileRedisUtils redisUtils;
@Override
public List<SmileVolunteersProject> list(SmileVPSParam param) {
public List<SmileVolunteersProjectListDto> list(SmileVPSParam param) {
try {
TableDataInfo rspData = new TableDataInfo();
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);
// 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);
List<SmileVolunteersProjectListDto> data = volunteersProjectMapper.selectProjectList(param.getTitle());
return data;
} catch (Exception e) {
e.printStackTrace();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersServiceImpl.java
View file @ 73431480
......@@ -81,6 +81,7 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
map.put("title", param.getTitle() == null ? "" : param.getTitle());
map.put("status", param.getStatus() + "");
map.put("projectId", param.getProjectId());
map.put("sex", param.getSex().toString());
List<VolunteersExportDto> dtoList = volunteersMapper.expertVolunteer(map);
return dtoList;
} catch (Exception e) {
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/SmileVolunteersProjectListDto.java 0 → 100644
View file @ 73431480
package com.liquidnet.service.smile.entity.dto;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* <p>
* 志愿者-志愿者项目表
* </p>
*
* @author jiangxiulong
* @since 2022-04-01
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class SmileVolunteersProjectListDto implements Serializable, Cloneable {
private static final long serialVersionUID = 1L;
/**
* 活动id
*/
private String projectId;
/**
* 项目名称
*/
private String title;
/**
* 开始时间
*/
private LocalDateTime timeStart;
/**
* 结束时间
*/
private LocalDateTime timeEnd;
/**
* 状态[1-上线|0-下线]
*/
private Integer status;
/**
* 创建时间
*/
private LocalDateTime createdAt;
/**
* 活动状态 [1开始|2结束]
*/
private Integer timeStatus;
/**
* 报名人数
*/
private Integer all;
/**
* 待审核人数
*/
private Integer unAudit;
/**
* 审核人数
*/
private Integer audit;
/**
* 拒绝人数
*/
private Integer refuse;
private static final SmileVolunteersProjectListDto obj = new SmileVolunteersProjectListDto();
public static SmileVolunteersProjectListDto getNew() {
try {
return (SmileVolunteersProjectListDto) obj.clone();
} catch (CloneNotSupportedException e) {
return new SmileVolunteersProjectListDto();
}
}
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileVolunteersProjectMapper.java
View file @ 73431480
......@@ -2,6 +2,9 @@ package com.liquidnet.service.smile.mapper;
import com.liquidnet.service.smile.entity.SmileVolunteersProject;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
import java.util.List;
/**
* <p>
......@@ -15,4 +18,5 @@ public interface SmileVolunteersProjectMapper extends BaseMapper<SmileVolunteers
void getDetailsById(String projectId);
List<SmileVolunteersProjectListDto> selectProjectList(String title);
}
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersMapper.xml
View file @ 73431480
......@@ -73,6 +73,9 @@
<if test="status!='-1'">
AND sv.status = #{status}
</if>
<if test="sex!='-1'">
AND sex = #{sex}
</if>
<if test="team!=''">
AND (svt1.name = #{team} OR svt2.name = #{team} OR svt3.name = #{team})
</if>
......
liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersProjectMapper.xml
View file @ 73431480
......@@ -2,6 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.liquidnet.service.smile.mapper.SmileVolunteersProjectMapper">
<resultMap id="smileVolunteersProjectListDto" type="com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto">
<result column="project_id" property="projectId"/>
<result column="title" property="title"/>
<result column="status" property="status"/>
<result column="time_start" property="timeStart"/>
<result column="time_end" property="timeEnd"/>
<result column="created_at" property="createdAt"/>
<result column="time_status" property="timeStatus"/>
<result column="all" property="all"/>
<result column="un_audit" property="unAudit"/>
<result column="audit" property="audit"/>
<result column="refuse" property="refuse"/>
</resultMap>
<select id="selectUserList" resultType="com.liquidnet.service.smile.entity.SmileUser">
select * from smile_user
<where>
......@@ -13,4 +28,29 @@
ORDER BY id desc
</select>
<select id="selectProjectList" resultType="com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto">
select a.project_id,
title,
a.time_start,
a.time_end,
a.created_at,
a.status,
IF(now() >time_end,2,1) as 'time_status',
count(b0.project_id) + count(b1.project_id) + count(b2.project_id) as 'all',
count(b0.project_id) as 'un_audit',
count(b1.project_id) as 'audit',
count(b2.project_id) as 'refuse'
from smile_volunteers_project as a
LEFT JOIN smile_volunteers as b0 on a.project_id = b0.project_id and b0.status = 0
LEFT JOIN smile_volunteers as b1 on a.project_id = b1.project_id and b1.status = 1
LEFT JOIN smile_volunteers as b2 on a.project_id = b2.project_id and b2.status = 2
<where>
<if test="title!='' and title !=null">
AND title Like concat('%',#{title},'%')
</if>
</where>
GROUP BY a.project_id
ORDER BY a.created_at desc
</select>
</mapper>
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