Skip to content

S
site-project
Commit fc3f5288 by 阳浪
Options

咨询查询所有

parent 11ba99cc
Showing with 36 additions and 17 deletions
cloud-site-api/src/main/java/com/yizhi/site/application/vo/site/InfomationParamVO.java
...@@ -31,6 +31,8 @@ public class InfomationParamVO extends ContextVO { ...@@ -31,6 +31,8 @@ public class InfomationParamVO extends ContextVO {
@ApiModelProperty(value="发布时间的终点") @ApiModelProperty(value="发布时间的终点")
private Date end; private Date end;
private Long isTop;
private Long siteId; private Long siteId;
@ApiModelProperty(value = "状态 0 删除 1 未发布 2 发布") @ApiModelProperty(value = "状态 0 删除 1 未发布 2 发布")
......
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/DataClassificationServiceImpl.java
...@@ -122,12 +122,13 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio ...@@ -122,12 +122,13 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio
}*/ }*/
} else { } else {
Map<String, Object> map = null; Map<String, Object> map = null;
for(ClassificationVO vo : list){ for(ClassificationVO vo : list) {
if (vo.getId() != 0L) {
EntityWrapper<DataClassification> wrapper = new EntityWrapper<>(); EntityWrapper<DataClassification> wrapper = new EntityWrapper<>();
wrapper.eq("state", 1); wrapper.eq("state", 1);
wrapper.eq("parent_id", vo.getId()); wrapper.eq("parent_id", vo.getId());
List<DataClassification> selectByMap = dataClassificationService.selectList(wrapper); List<DataClassification> selectByMap = dataClassificationService.selectList(wrapper);
List<DataClassificationVo> selectVoByMap=new ArrayList<>(); List<DataClassificationVo> selectVoByMap = new ArrayList<>();
if (CollectionUtil.isNotEmpty(selectByMap)) { if (CollectionUtil.isNotEmpty(selectByMap)) {
for (DataClassification d : selectByMap) { for (DataClassification d : selectByMap) {
DataClassificationVo entityVo = new DataClassificationVo(); DataClassificationVo entityVo = new DataClassificationVo();
...@@ -146,13 +147,15 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio ...@@ -146,13 +147,15 @@ public class DataClassificationServiceImpl extends ServiceImpl<DataClassificatio
BeanUtils.copyProperties(child, entityChild); BeanUtils.copyProperties(child, entityChild);
childClassifyNews.add(entityChild); childClassifyNews.add(entityChild);
} }
entityVo.setChildClassifyNews(childClassifyNews);; entityVo.setChildClassifyNews(childClassifyNews);
;
} }
} }
} }
vo.setData(selectVoByMap); vo.setData(selectVoByMap);
} }
} }
}
return list; return list;
} }
......
cloud-site-service/src/main/java/com/yizhi/site/application/service/impl/SystemMailboxServiceImpl.java
...@@ -69,19 +69,21 @@ public class SystemMailboxServiceImpl extends ServiceImpl<SystemMailboxMapper,Sy ...@@ -69,19 +69,21 @@ public class SystemMailboxServiceImpl extends ServiceImpl<SystemMailboxMapper,Sy
systemMailBoxVo.setUpdateById(res.getAccountId()); systemMailBoxVo.setUpdateById(res.getAccountId());
systemMailBoxVo.setUpdateByName(res.getAccountName()); systemMailBoxVo.setUpdateByName(res.getAccountName());
systemMailBoxVo.setUpdateTime(new Date()); systemMailBoxVo.setUpdateTime(new Date());
Long id = systemMailBoxVo.getId(); systemMailBox.setDeleted(DeletedEnum.NO.getValue());
BeanUtils.copyProperties(systemMailBoxVo,systemMailBox);
Long id = systemMailBox.getId();
if(id==null||id==0L) { if(id==null||id==0L) {
id = idGenerator.generate(); id = idGenerator.generate();
systemMailBoxVo.setId(id); systemMailBox.setId(id);
systemMailBoxVo.setSubmitTime(new Date()); systemMailBox.setSubmitTime(new Date());
systemMailBoxVo.setState(SiteConstant.TWO); systemMailBox.setState(SiteConstant.TWO);
systemMailBoxVo.setCreateById(res.getAccountId()); systemMailBox.setCreateById(res.getAccountId());
systemMailBoxVo.setCreateByName(res.getAccountName()); systemMailBox.setCreateByName(res.getAccountName());
systemMailBoxVo.setCreateTime(new Date()); systemMailBox.setCreateTime(new Date());
}
BeanUtils.copyProperties(systemMailBoxVo,systemMailBox);
systemMailBox.setDeleted(DeletedEnum.NO.getValue());
this.insert(systemMailBox); this.insert(systemMailBox);
}else{
this.updateById(systemMailBox);
}
return id; return id;
} }
......
cloud-site-service/src/main/resources/mapper/InformationMapper.xml
...@@ -55,7 +55,10 @@ ...@@ -55,7 +55,10 @@
<if test="null != state"> <if test="null != state">
and a.state = #{state} and a.state = #{state}
</if> </if>
order by a.is_top desc, a.create_time desc <if test="isTop != null">
and a.is_top = #{isTop}
</if>
order by a.is_top desc, a.update_time desc
</select> </select>
<select id="informationThreeList" resultType="com.yizhi.site.application.domain.Information"> <select id="informationThreeList" resultType="com.yizhi.site.application.domain.Information">
...@@ -74,7 +77,10 @@ ...@@ -74,7 +77,10 @@
<if test="end != null"> <if test="end != null">
and #{end} >= a.release_time and #{end} >= a.release_time
</if> </if>
order by a.is_top desc, a.create_time desc <if test="isTop != null">
and a.is_top = #{isTop}
</if>
order by a.is_top desc, a.update_time desc
</select> </select>
<select id="informationTwoList" resultType="com.yizhi.site.application.domain.Information"> <select id="informationTwoList" resultType="com.yizhi.site.application.domain.Information">
...@@ -93,7 +99,10 @@ ...@@ -93,7 +99,10 @@
<if test="end != null"> <if test="end != null">
and #{end} >= a.release_time and #{end} >= a.release_time
</if> </if>
order by a.is_top desc, a.create_time desc <if test="isTop != null">
and a.is_top = #{isTop}
</if>
order by a.is_top desc, a.update_time desc
</select> </select>
<select id="informationAllList" resultType="com.yizhi.site.application.domain.Information"> <select id="informationAllList" resultType="com.yizhi.site.application.domain.Information">
...@@ -112,7 +121,10 @@ ...@@ -112,7 +121,10 @@
<if test="end != null"> <if test="end != null">
and #{end} >= a.release_time and #{end} >= a.release_time
</if> </if>
order by a.is_top desc, a.create_time desc <if test="isTop != null">
and a.is_top = #{isTop}
</if>
order by a.is_top desc, a.update_time desc
</select> </select>
<select id="informationPageList" resultType="com.yizhi.site.application.vo.site.InformationStudentVO"> <select id="informationPageList" resultType="com.yizhi.site.application.vo.site.InformationStudentVO">
......
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