|
@@ -66,10 +66,7 @@ public class PlanYearsController extends BaseController {
|
|
|
@Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
|
|
|
public AjaxResult list(@RequestBody PlanYearsStandardVo vo, HttpServletRequest request) {
|
|
|
List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
|
|
|
try {
|
|
|
- Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
|
|
|
LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
|
|
|
if (!ObjectUtils.isEmpty(vo.getProjectName())) {
|
|
|
lw.like(PlanYears::getProjectName, vo.getProjectName());
|
|
@@ -87,6 +84,9 @@ public class PlanYearsController extends BaseController {
|
|
|
lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
|
|
|
}
|
|
|
if (!ObjectUtils.isEmpty(vo.getEndTime())) {
|
|
|
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
|
|
|
+ Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
|
|
|
lw.le(PlanYears::getPlanDemandSubTime, parse);
|
|
|
}
|
|
|
lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
|
|
@@ -144,10 +144,8 @@ public class PlanYearsController extends BaseController {
|
|
|
@Log(title = ModularConstans.planYear, businessType = BusinessType.QUERY)
|
|
|
public AjaxResult examineList(@RequestBody PlanYearsStandardVo vo, HttpServletRequest request) {
|
|
|
List<PlanYearsResponseVo> planYearsList = new ArrayList<>();
|
|
|
- SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
- SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
|
|
|
+
|
|
|
try {
|
|
|
- Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
|
|
|
LambdaQueryWrapper<PlanYears> lw = new LambdaQueryWrapper<PlanYears>();
|
|
|
if (!ObjectUtils.isEmpty(vo.getProjectName())) {
|
|
|
lw.like(PlanYears::getProjectName, vo.getProjectName());
|
|
@@ -163,6 +161,9 @@ public class PlanYearsController extends BaseController {
|
|
|
lw.ge(PlanYears::getPlanDemandSubTime, vo.getBeginTime());
|
|
|
}
|
|
|
if (!ObjectUtils.isEmpty(vo.getEndTime())) {
|
|
|
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ SimpleDateFormat dateFormatT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
|
|
|
+ Date parse = dateFormatT.parse(dateFormat.format(vo.getEndTime()) + " 23:59:59:999");
|
|
|
lw.le(PlanYears::getPlanDemandSubTime, parse);
|
|
|
}
|
|
|
lw.eq(PlanYears::getDelFlay, DataIsDelete.DataNOTDelete.getCode());
|