Skip to content

T
training-project
Commit 1e236f2d by 梅存智
Options

Merge branch 'dev' into 'master' 

活动类型优化

See merge request !5
parents eb433873 32f7e57b
Showing with 29 additions and 45 deletions
cloud-training-project-api/src/main/java/com/yizhi/training/application/vo/api/TrainingProjectParamVo.java
......@@ -35,5 +35,5 @@ public class TrainingProjectParamVo {
private Integer bizType;
@ApiModelProperty(value = "活动类型，null查询全部")
private Integer activityType;
private Long activityType;
}
cloud-training-project-service/src/main/java/com/yizhi/training/application/mapper/TrainingProjectMapper.java
......@@ -3,6 +3,7 @@ package com.yizhi.training.application.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.yizhi.training.application.domain.TrainingProject;
import com.yizhi.training.application.vo.api.ActivityTypeVo;
import com.yizhi.training.application.vo.api.HotEnrollListVo;
import com.yizhi.training.application.vo.api.PaidTrainingProjectVO;
import com.yizhi.training.application.vo.api.TrainingProjectDetailsImageVO;
......@@ -64,7 +65,7 @@ public interface TrainingProjectMapper extends BaseMapper<TrainingProject> {
@Param("now") Date now, @Param("siteId") Long siteId,
@Param("keyword") String keyword,@Param("enablePay") Integer enablePay,
@Param("bizType") Integer bizType,
@Param("activityType") Integer activityType, Page<TrainingProjectListVo> page);
@Param("activityType") Long activityType, Page<TrainingProjectListVo> page);
Integer apiPageListCount(@Param("visiableTpIds") List<Long> visiableTpIds,
@Param("passEnrollTpIds") List<Long> passEnrollTpIds,
......@@ -357,4 +358,12 @@ public interface TrainingProjectMapper extends BaseMapper<TrainingProject> {
* @return
*/
List<TrainingProjectVo> getTop(@Param("siteId") Long siteId);
/**
* 获取活动类型
* @param companyId
* @param siteId
* @return
*/
List<ActivityTypeVo> selectActivityType(@Param("companyId") Long companyId, @Param("siteId") Long siteId);
}
cloud-training-project-service/src/main/java/com/yizhi/training/application/mapper/TrainingProjectMapper.xml
......@@ -214,10 +214,11 @@
<!-- 培训项目首页列表 -->
<select id="apiPageList" resultType="com.yizhi.training.application.vo.domain.TrainingProjectVo">
select tb.*,en.enable_pay,en.actual_price,en.person_limit_num AS canNumber,en.start_time AS enrollStartTime, en.end_time AS enrollEndTime,
sg.start_time AS signStartTime, sg.end_time AS signEndTime,tb.activity_type,tb.biz_type
sg.start_time AS signStartTime, sg.end_time AS signEndTime,tb.tp_classification_id AS activity_type,clss.name AS activityCode,tb.biz_type
from training_project tb
left join tr_enroll en on tb.id = en.training_project_id
left join tr_sign_time sg on tb.id = sg.training_project_id
left join tp_classification clss ON clss.id=tb.tp_classification_id
where
-- 首先用站点 id 和上架状态缩小范围
(tb.site_id = #{siteId} and tb.status = 1 and tb.deleted = 0
......@@ -261,7 +262,7 @@
and tb.biz_type = #{bizType}
</if>
<if test="activityType != null">
and tb.activity_type = #{activityType}
and clss.id = #{activityType}
</if>
order by tb.end_time desc,tb.create_time desc
</select>
......@@ -895,4 +896,10 @@
where tb.site_id = #{siteId} and tb.biz_type = 2 and tb.status = 1 and tb.top_up = 1 and tb.deleted = 0
</select>
<select id="selectActivityType" resultType="com.yizhi.training.application.vo.api.ActivityTypeVo">
select a.id AS activityType,a.name AS activityName
from tp_classification a
where a.company_id = #{companyId} AND a.site_id = #{siteId} AND a.deleted = 0
ORDER BY a.create_time,a.id
</select>
</mapper>
cloud-training-project-service/src/main/java/com/yizhi/training/application/service/impl/TrainingProjectServiceImpl.java
......@@ -44,6 +44,7 @@ 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.domain.TpAuthorizationRange;
import com.yizhi.training.application.domain.TpClassification;
import com.yizhi.training.application.domain.TpPlan;
import com.yizhi.training.application.domain.TpPlanActivity;
import com.yizhi.training.application.domain.TpStudentEnrollPassed;
......@@ -53,6 +54,7 @@ import com.yizhi.training.application.domain.TrainingProject;
import com.yizhi.training.application.domain.TrainingProjectDetailsImage;
import com.yizhi.training.application.enums.TrEnrollStatusEnum;
import com.yizhi.training.application.mapper.TpAuthorizationRangeMapper;
import com.yizhi.training.application.mapper.TpClassificationMapper;
import com.yizhi.training.application.mapper.TpPlanActivityConditionPostMapper;
import com.yizhi.training.application.mapper.TpPlanActivityConditionPreMapper;
import com.yizhi.training.application.mapper.TpPlanActivityMapper;
......@@ -176,8 +178,8 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
@Autowired
private TrainingProjectDetailsImageMapper trainingProjectDetailsImageMapper;
private static final String ACTIVITY_KEY = "activity";
private static final String REDIS_PRO_ACTIVITY_TYPE_KEY = "REDIS_PRO_ACTIVITY_TYPE";
@Autowired
private TpClassificationMapper tpClassificationMapper;
/**
* 业务类型:1活动服务
......@@ -547,12 +549,6 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
paramVo.getBizType(),paramVo.getActivityType(),page);
List<Long> finishedTpIds = tpStudentProjectRecordMapper.getByAccountId(context.getAccountId());
//获取活动栏目
List<SiteDicVo> siteDics = (List<SiteDicVo>) redisCache.get(REDIS_PRO_ACTIVITY_TYPE_KEY);
if(siteDics == null){
siteDics = portalManageFeignClients.list(ACTIVITY_KEY);
redisCache.set(REDIS_PRO_ACTIVITY_TYPE_KEY, siteDics, 7200L);
}
if (!CollectionUtils.isEmpty(list)) {
/*Date date = new Date();
List<Long> tpIdsForJoinNum = null;
......@@ -572,14 +568,7 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
vo.setCanNumber(tr.getCanNumber());
vo.setCreateTime(tr.getCreateTime());
vo.setCreatebyName(tr.getCreateByName());
//活动名称
if(siteDics != null){
for(SiteDicVo dic : siteDics){
if(dic.getType().equals(String.valueOf(tr.getActivityType()))){
vo.setActivityName(dic.getName());
}
}
}
vo.setActivityName(tr.getActivityCode());
/**
* 设置活动状态：
......@@ -1521,31 +1510,10 @@ public class TrainingProjectServiceImpl extends ServiceImpl<TrainingProjectMappe
}
//获取活动栏目
List<SiteDicVo> siteDics = (List<SiteDicVo>) redisCache.get(REDIS_PRO_ACTIVITY_TYPE_KEY);
if(siteDics == null){
siteDics = portalManageFeignClients.list(ACTIVITY_KEY);
redisCache.set(REDIS_PRO_ACTIVITY_TYPE_KEY, siteDics, 7200L);
}
if (!CollectionUtils.isEmpty(siteDics)) {
siteDics.sort(new Comparator<SiteDicVo>() {
@Override
public int compare(SiteDicVo d1, SiteDicVo d2) {
Integer sort1= d1.getSort();
Integer sort2= d2.getSort();
return sort1.compareTo(sort2);
}
});
List<ActivityTypeVo> activityType = new ArrayList<ActivityTypeVo>(4);
for(SiteDicVo dic : siteDics){
ActivityTypeVo type = new ActivityTypeVo();
type.setActivityName(dic.getName());
type.setActivityType(dic.getType());
activityType.add(type);
}
item.setActivityType(activityType);
}
//获取活动栏
List<ActivityTypeVo> activityType = trainingProjectMapper.selectActivityType(context.getCompanyId(), context.getSiteId());
item.setActivityType(activityType);
return item;
}
......
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