修改首页清单列表
This commit is contained in:
+8
-1
@@ -120,7 +120,7 @@ public class LawsMarketStandard implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
|
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
|
||||||
@ApiModelProperty(value = "作者")
|
@ApiModelProperty(value = "作者")
|
||||||
@Excel(name = "发布时间", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id" ,needMerge = true)
|
@Excel(name = "作者", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "id" ,needMerge = true)
|
||||||
private String author;
|
private String author;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -185,4 +185,11 @@ public class LawsMarketStandard implements Serializable {
|
|||||||
@ApiModelProperty(value = "流程查询标识")
|
@ApiModelProperty(value = "流程查询标识")
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private String processFlag;
|
private String processFlag;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 首页查询标识
|
||||||
|
*/
|
||||||
|
@ApiModelProperty(value = "首页查询标识")
|
||||||
|
@TableField(exist = false)
|
||||||
|
private String homeFlag;
|
||||||
}
|
}
|
||||||
|
|||||||
+12
@@ -35,6 +35,10 @@ import org.springframework.web.servlet.ModelAndView;
|
|||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
import java.time.LocalDate;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
|
import java.time.temporal.ChronoUnit;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@@ -83,6 +87,14 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
|
|||||||
Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize);
|
Page<LawsMarketStandard> page = new Page<>(pageNo, pageSize);
|
||||||
QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
|
QueryWrapper<LawsMarketStandard> queryWrapper = getLawsMarketStandardQueryWrapper(marketStandard);
|
||||||
if(StringUtils.isBlank(marketStandard.getProcessFlag())){
|
if(StringUtils.isBlank(marketStandard.getProcessFlag())){
|
||||||
|
if(!StringUtils.isBlank(marketStandard.getHomeFlag())){
|
||||||
|
LocalDate currentDate = LocalDate.now();
|
||||||
|
// 前90天的日期
|
||||||
|
LocalDate ninetyDaysAgo = currentDate.minus(90, ChronoUnit.DAYS);
|
||||||
|
LocalDateTime time = LocalDateTime.parse(ninetyDaysAgo.toString() + " 00:00:00",
|
||||||
|
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
|
||||||
|
queryWrapper.ge("ms.release_date", time);
|
||||||
|
}
|
||||||
return marketStandardMapper.queryByPage(page, queryWrapper);
|
return marketStandardMapper.queryByPage(page, queryWrapper);
|
||||||
}else{
|
}else{
|
||||||
queryWrapper.isNull("pms1.manifest_id");
|
queryWrapper.isNull("pms1.manifest_id");
|
||||||
|
|||||||
Reference in New Issue
Block a user