参数模板管理--时间搜索

This commit is contained in:
zhn
2024-01-17 10:54:31 +08:00
parent 6e5c05373f
commit b9434ec806
2 changed files with 16 additions and 7 deletions
@@ -43,6 +43,8 @@ import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.Collator;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -112,7 +114,14 @@ public class ParamsTemplateEOController extends JeroController<ParamsTemplateEO,
queryWrapper.lambda().ge(ParamsTemplateEO::getUpdateTime,paramsTemplateEO.getUpdateTimeStart());
}
if(ObjectUtil.isNotEmpty(paramsTemplateEO.getUpdateTimeEnd())){
queryWrapper.lambda().le(ParamsTemplateEO::getUpdateTime,paramsTemplateEO.getUpdateTimeEnd());
try {
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format = sdf1.format(paramsTemplateEO.getUpdateTimeEnd())+" 23:59:59";
queryWrapper.lambda().le(ParamsTemplateEO::getUpdateTime,sdf2.parse(format));
} catch (ParseException e) {
e.printStackTrace();
}
}
Page<ParamsTemplateEO> page = new Page<ParamsTemplateEO>(pageNo, pageSize);
IPage<ParamsTemplateEO> pageList = paramsTemplateEOService.page(page, queryWrapper);
@@ -57,15 +57,15 @@ public class ParamsTemplateEO implements Serializable {
private java.util.Date updateTime;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "最新变更时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "变更起始时间")
private java.util.Date updateTimeStart;
@TableField(exist = false)
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "最新变更时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "变更结束时间")
private java.util.Date updateTimeEnd;
/**所属部门*/