巡检对象 对象编码key修正

main
weitingdong 12 months ago
parent b8ddcd3eaf
commit 80b1b53f67
  1. 9
      src/main/java/org/energy/modules/inspection/controller/InspectionObjectController.java

@ -94,17 +94,14 @@ public class InspectionObjectController extends DafController {
qw.lambda().eq(InspectionObject::getObjectName, inspectionObject.getObjectName());
}
if (null != inspectionObject.getStation()) {
qw.lambda().like(InspectionObject::getStation, inspectionObject.getStation());
qw.lambda().eq(InspectionObject::getStation, inspectionObject.getStation());
}
if (null != inspectionObject.getIstatus()) {
qw.lambda().like(InspectionObject::getIstatus, inspectionObject.getIstatus());
qw.lambda().eq(InspectionObject::getIstatus, inspectionObject.getIstatus());
}
if (StringUtil.isNotEmpty(inspectionObject.getObjectArea())){
qw.lambda().like(InspectionObject::getObjectArea, inspectionObject.getObjectArea());
}
if (StringUtil.isNotEmpty(inspectionObject.getKksNo())){
qw.lambda().like(InspectionObject::getKksNo, inspectionObject.getKksNo());
}
IPage<InspectionObject> pages = inspectionObjectService.page(Condition.getPage(query), qw);
return R.data(pages);
}
@ -158,7 +155,7 @@ public class InspectionObjectController extends DafController {
number = 1;
}
String numFormat = String.format("%04d", number);
String no = "R" + date + numFormat;
String no = "D" + date + numFormat;
inspectionObject.setObjectNo(no);
return R.status(inspectionObjectService.saveOrUpdate(inspectionObject));
}

Loading…
Cancel
Save