Skip to content

T
training-project
Commit a0489c97 by 阳浪
Options

数据隔离

parent 6917e8f4
Showing with 43 additions and 26 deletions
cloud-training-project-api/src/main/java/com/yizhi/training/application/vo/api/HotEnrollListVo.java
package com.yizhi.training.application.vo.api; package com.yizhi.training.application.vo.api;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
...@@ -29,9 +30,11 @@ public class HotEnrollListVo { ...@@ -29,9 +30,11 @@ public class HotEnrollListVo {
private Long enrollId; private Long enrollId;
@ApiModelProperty(value = "报名开始时间") @ApiModelProperty(value = "报名开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date enrollStartTime; private Date enrollStartTime;
@ApiModelProperty(value = "报名结束时间") @ApiModelProperty(value = "报名结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date enrollEndTime; private Date enrollEndTime;
@ApiModelProperty(value = "报名开始时间-String类型") @ApiModelProperty(value = "报名开始时间-String类型")
......
cloud-training-project-api/src/main/java/com/yizhi/training/application/vo/domain/TrainingProjectVo.java
...@@ -6,6 +6,7 @@ import java.util.List; ...@@ -6,6 +6,7 @@ import java.util.List;
import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yizhi.training.application.vo.api.TrainingProjectDetailsImageVO; import com.yizhi.training.application.vo.api.TrainingProjectDetailsImageVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -43,9 +44,11 @@ public class TrainingProjectVo extends Model<TrainingProjectVo> { ...@@ -43,9 +44,11 @@ public class TrainingProjectVo extends Model<TrainingProjectVo> {
private String logoImg; private String logoImg;
@ApiModelProperty(value = "学习项目开始时间") @ApiModelProperty(value = "学习项目开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date startTime; private Date startTime;
@ApiModelProperty(value = "学习项目结束时间") @ApiModelProperty(value = "学习项目结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date endTime; private Date endTime;
@ApiModelProperty(value = "项目状态（0：草稿、1：启用、2：停用）") @ApiModelProperty(value = "项目状态（0：草稿、1：启用、2：停用）")
...@@ -146,15 +149,19 @@ public class TrainingProjectVo extends Model<TrainingProjectVo> { ...@@ -146,15 +149,19 @@ public class TrainingProjectVo extends Model<TrainingProjectVo> {
private Integer canNumber; private Integer canNumber;
@ApiModelProperty(value = "报名开始时间") @ApiModelProperty(value = "报名开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date enrollStartTime; private Date enrollStartTime;
@ApiModelProperty(value = "报名结束时间") @ApiModelProperty(value = "报名结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date enrollEndTime; private Date enrollEndTime;
@ApiModelProperty(value = "签到开始时间") @ApiModelProperty(value = "签到开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date signStartTime; private Date signStartTime;
@ApiModelProperty(value = "签到结束时间") @ApiModelProperty(value = "签到结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date signEndTime; private Date signEndTime;
@ApiModelProperty(value = "活动类型的ID，从site_dic获取（当业务类型是1时是这些枚举值）") @ApiModelProperty(value = "活动类型的ID，从site_dic获取（当业务类型是1时是这些枚举值）")
......
cloud-training-project-service/src/main/java/com/yizhi/training/application/controller/TpCommentController.java
...@@ -71,6 +71,9 @@ public class TpCommentController { ...@@ -71,6 +71,9 @@ public class TpCommentController {
tpComment.setId(idGenerator.generate()); tpComment.setId(idGenerator.generate());
// tpComment.setContent(StringEscapeUtils.escapeJava(tpComment.getContent())); // tpComment.setContent(StringEscapeUtils.escapeJava(tpComment.getContent()));
TpComment tp=new TpComment(); TpComment tp=new TpComment();
if(Objects.equals(tpComment.getBizType(),2)){
tpComment.setAuditStatus("1");
}
BeanUtils.copyProperties(tpComment,tp); BeanUtils.copyProperties(tpComment,tp);
Boolean f = iTpCommentService.insert(tp); Boolean f = iTpCommentService.insert(tp);
return f; return f;
......
cloud-training-project-service/src/main/java/com/yizhi/training/application/domain/TrainingProject.java
...@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.activerecord.Model; ...@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.FieldFill; import com.baomidou.mybatisplus.enums.FieldFill;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yizhi.training.application.vo.api.TrainingProjectDetailsImageVO; import com.yizhi.training.application.vo.api.TrainingProjectDetailsImageVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -49,10 +50,12 @@ public class TrainingProject extends Model<TrainingProject> { ...@@ -49,10 +50,12 @@ public class TrainingProject extends Model<TrainingProject> {
@ApiModelProperty(value = "学习项目开始时间") @ApiModelProperty(value = "学习项目开始时间")
@TableField("start_time") @TableField("start_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date startTime; private Date startTime;
@ApiModelProperty(value = "学习项目结束时间") @ApiModelProperty(value = "学习项目结束时间")
@TableField("end_time") @TableField("end_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date endTime; private Date endTime;
@ApiModelProperty(value = "项目状态（0：草稿、1：启用、2：停用）") @ApiModelProperty(value = "项目状态（0：草稿、1：启用、2：停用）")
......
cloud-training-project-service/src/main/java/com/yizhi/training/application/mapper/TrainingProjectMapper.java
...@@ -67,9 +67,8 @@ public interface TrainingProjectMapper extends BaseMapper<TrainingProject> { ...@@ -67,9 +67,8 @@ public interface TrainingProjectMapper extends BaseMapper<TrainingProject> {
@Param("bizType") Integer bizType, @Param("bizType") Integer bizType,
@Param("activityType") Long activityType, Page<TrainingProjectListVo> page); @Param("activityType") Long activityType, Page<TrainingProjectListVo> page);
Integer apiPageListCount(@Param("visiableTpIds") List<Long> visiableTpIds, TrainingProjectVo apiPageListCount(@Param("visiableTpIds") List<Long> visiableTpIds,
@Param("passEnrollTpIds") List<Long> passEnrollTpIds, @Param("passEnrollTpIds") List<Long> passEnrollTpIds, @Param("siteId") Long siteId, @Param("keyword") String keyword,
@Param("now") Date now, @Param("siteId") Long siteId, @Param("keyword") String keyword,
@Param("bizType") Integer bizType); @Param("bizType") Integer bizType);
/** /**
......
cloud-training-project-service/src/main/java/com/yizhi/training/application/mapper/TrainingProjectMapper.xml
...@@ -226,7 +226,8 @@ ...@@ -226,7 +226,8 @@
) )
</if> </if>
<if test="now != null"> <if test="now != null">
and <![CDATA[ DATE_FORMAT(tb.end_time, '%Y-%m-%d') >= DATE_FORMAT(#{now}, '%Y-%m-%d') ]]>) and <![CDATA[ DATE_FORMAT(tb.end_time, '%Y-%m-%d') >= DATE_FORMAT(#{now}, '%Y-%m-%d') ]]>
and <![CDATA[ DATE_FORMAT(tb.start_time, '%Y-%m-%d') <= DATE_FORMAT(#{now}, '%Y-%m-%d') ]]>)
</if> </if>
and and
( (
...@@ -267,12 +268,12 @@ ...@@ -267,12 +268,12 @@
order by tb.end_time desc,tb.create_time desc order by tb.end_time desc,tb.create_time desc
</select> </select>
<select id="apiPageListCount" resultType="java.lang.Integer"> <select id="apiPageListCount" resultType="com.yizhi.training.application.vo.domain.TrainingProjectVo">
select count(1) select min(tb.start_time) as startTime,max(tb.end_time) as endTime
from training_project tb from training_project tb
where where
-- 首先用站点 id 和上架状态缩小范围 -- 首先用站点 id 和上架状态缩小范围
(tb.site_id = #{siteId} and tb.status = 1 and tb.deleted = 0 and <![CDATA[ DATE_FORMAT(tb.end_time, '%Y-%m-%d') >= DATE_FORMAT(#{now}, '%Y-%m-%d') ]]>) (tb.site_id = #{siteId} and tb.status = 1 and tb.deleted = 0 )
and and
( (
-- 平台可见 -- 平台可见
......
cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TrainingProjectServiceImpl.java
...@@ -2,11 +2,7 @@ package com.yizhi.training.application.service.impl; ...@@ -2,11 +2,7 @@ package com.yizhi.training.application.service.impl;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.*;
import java.util.Calendar;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
...@@ -38,13 +34,10 @@ import com.yizhi.enroll.application.feign.EnrollFeignClient; ...@@ -38,13 +34,10 @@ import com.yizhi.enroll.application.feign.EnrollFeignClient;
import com.yizhi.enroll.application.vo.ProjectAccountVO; import com.yizhi.enroll.application.vo.ProjectAccountVO;
import com.yizhi.enroll.application.vo.domain.Enroll; import com.yizhi.enroll.application.vo.domain.Enroll;
import com.yizhi.research.application.feign.ResearchClient; import com.yizhi.research.application.feign.ResearchClient;
import com.yizhi.research.application.vo.domain.ResearchVo;
import com.yizhi.sign.application.feign.SignRecordApiClient; import com.yizhi.sign.application.feign.SignRecordApiClient;
import com.yizhi.site.application.feign.PortalManageFeignClients; import com.yizhi.site.application.feign.PortalManageFeignClients;
import com.yizhi.site.application.vo.domain.SiteDicVo;
import com.yizhi.training.application.constant.ProjectConstant; import com.yizhi.training.application.constant.ProjectConstant;
import com.yizhi.training.application.domain.TpAuthorizationRange; import com.yizhi.training.application.domain.TpAuthorizationRange;
import com.yizhi.training.application.domain.TpClassification;
import com.yizhi.training.application.domain.TpPlan; import com.yizhi.training.application.domain.TpPlan;
import com.yizhi.training.application.domain.TpPlanActivity; import com.yizhi.training.application.domain.TpPlanActivity;
import com.yizhi.training.application.domain.TpStudentEnrollPassed; import com.yizhi.training.application.domain.TpStudentEnrollPassed;
...@@ -548,6 +541,13 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe ...@@ -548,6 +541,13 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
Page<TrainingProjectListVo> page = new Page<>(paramVo.getPageNo(), paramVo.getPageSize()); Page<TrainingProjectListVo> page = new Page<>(paramVo.getPageNo(), paramVo.getPageSize());
List<TrainingProjectListVo> pageList = new ArrayList<>(); List<TrainingProjectListVo> pageList = new ArrayList<>();
if(paramVo.getNow()!=null) {
try {
paramVo.setNow( DateUtil.valueOfStandard(DateUtil.format(paramVo.getNow(),"yyyy-MM-dd")));
} catch (Exception e) {
e.printStackTrace();
}
}
List<com.yizhi.training.application.vo.domain.TrainingProjectVo> list = trainingProjectMapper.apiPageList(visiableTpIds, passEnrollTpIds, paramVo.getNow(), context.getSiteId(), paramVo.getKeyword(),enablePay, List<com.yizhi.training.application.vo.domain.TrainingProjectVo> list = trainingProjectMapper.apiPageList(visiableTpIds, passEnrollTpIds, paramVo.getNow(), context.getSiteId(), paramVo.getKeyword(),enablePay,
paramVo.getBizType(),paramVo.getActivityType(),page); paramVo.getBizType(),paramVo.getActivityType(),page);
List<Long> finishedTpIds = tpStudentProjectRecordMapper.getByAccountId(context.getAccountId()); List<Long> finishedTpIds = tpStudentProjectRecordMapper.getByAccountId(context.getAccountId());
...@@ -1484,12 +1484,16 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe ...@@ -1484,12 +1484,16 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
*/ */
private TrEnrollStatusEnum compareTime(Date start, Date end) { private TrEnrollStatusEnum compareTime(Date start, Date end) {
Date curDate = new Date(); Date curDate = new Date();
if(end.before(curDate)){ if(end!=null) {
return TrEnrollStatusEnum.ACT_END; if (end.before(curDate)) {
return TrEnrollStatusEnum.ACT_END;
}
} }
if(start.before(curDate) || start.equals(curDate)){ if(start!=null) {
return TrEnrollStatusEnum.ACT_RUN; if (start.before(curDate) || start.equals(curDate)) {
return TrEnrollStatusEnum.ACT_RUN;
}
} }
return TrEnrollStatusEnum.ACT_WAIT_START; return TrEnrollStatusEnum.ACT_WAIT_START;
...@@ -1501,14 +1505,11 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe ...@@ -1501,14 +1505,11 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
TrainingActivityVO item = new TrainingActivityVO(); TrainingActivityVO item = new TrainingActivityVO();
//目前只需要统计一天，调用以前的方法就行 //目前只需要统计一天，调用以前的方法就行
Date theDay = new Date(); TrainingProjectVo trainingProjectVo = trainingProjectMapper.apiPageListCount(null, null, context.getSiteId(), null, bizType);
Integer count = trainingProjectMapper.apiPageListCount(null, null, theDay, context.getSiteId(), null, bizType); if(trainingProjectVo!=null){
if(count > 0){
List<String> list = new ArrayList<String>(1); List<String> list = new ArrayList<String>(1);
list.add(DateUtil.toDay(theDay)); list.add(DateUtil.toDay(trainingProjectVo.getStartTime()));
list.add(DateUtil.toDay(DateUtil.addDay(theDay, 1))); list.add(DateUtil.toDay(trainingProjectVo.getEndTime()));
list.add(DateUtil.toDay(DateUtil.addDay(theDay, 2)));
list.add(DateUtil.toDay(DateUtil.addDay(theDay, 3)));
item.setTheDay(list); item.setTheDay(list);
} }
......
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