|
@@ -329,6 +329,8 @@ public class PlanServiceImpl implements PlanService {
|
|
|
.or()
|
|
|
.like("equipment_id",bo.getText())
|
|
|
.or()
|
|
|
+ .like("equipment_code",bo.getText())
|
|
|
+ .or()
|
|
|
.like("equipment_name",bo.getText());
|
|
|
if (bo.getStartTime() != null)
|
|
|
statisticsQueryWrapper.apply("DATE_FORMAT(laster_time,'%Y-%m-%d %H:%i:%s') >= DATE_FORMAT({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
|
|
@@ -360,6 +362,8 @@ public class PlanServiceImpl implements PlanService {
|
|
|
QueryWrapper<Equipment> equipmentQueryWrapper = new QueryWrapper<>();
|
|
|
if (bo.getText() != null)
|
|
|
equipmentQueryWrapper.like("equipment_id",bo.getText())
|
|
|
+ .or()
|
|
|
+ .like("equipment_code",bo.getText())
|
|
|
.or()
|
|
|
.like("equipment_name",bo.getText());
|
|
|
if (bo.getAddrCodes() != null){
|