|
@@ -84,10 +84,12 @@ public class TProportionController {
|
|
|
for(TProportionCheck proportionCheck:records){
|
|
|
if(proportionCheck.getEquipmentId()!=null){
|
|
|
TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
|
|
|
- if(StringUtils.isNotEmpty(equipment.getName())){
|
|
|
- proportionCheck.setEquipmentName(equipment.getName());
|
|
|
- }else {
|
|
|
- proportionCheck.setEquipmentName(equipment.getClientId());
|
|
|
+ if(equipment != null) {
|
|
|
+ if(StringUtils.isNotEmpty(equipment.getName())){
|
|
|
+ proportionCheck.setEquipmentName(equipment.getName());
|
|
|
+ }else {
|
|
|
+ proportionCheck.setEquipmentName(equipment.getClientId());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -127,10 +129,12 @@ public class TProportionController {
|
|
|
for(TProportion proportion:records){
|
|
|
if(proportion.getEquipmentId()!=null){
|
|
|
TEquipment equipment = tEquipmentService.getById(proportion.getEquipmentId());
|
|
|
- if(StringUtils.isNotEmpty(equipment.getName())){
|
|
|
- proportion.setEquipmentName(equipment.getName());
|
|
|
- }else {
|
|
|
- proportion.setEquipmentName(equipment.getClientId());
|
|
|
+ if(equipment != null) {
|
|
|
+ if(StringUtils.isNotEmpty(equipment.getName())){
|
|
|
+ proportion.setEquipmentName(equipment.getName());
|
|
|
+ }else {
|
|
|
+ proportion.setEquipmentName(equipment.getClientId());
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -181,6 +185,21 @@ public class TProportionController {
|
|
|
query.orderByDesc(TProportionCheck::getCreateDate);
|
|
|
Page<TProportionCheck> page = new Page<>(current, size, true);
|
|
|
IPage<TProportionCheck> iPage = tProportionCheckService.page(page, query);
|
|
|
+ List<TProportionCheck> records = iPage.getRecords();
|
|
|
+ if(records.size()>0){
|
|
|
+ for(TProportionCheck proportionCheck:records){
|
|
|
+ if(proportionCheck.getEquipmentId()!=null){
|
|
|
+ TEquipment equipment = tEquipmentService.getById(proportionCheck.getEquipmentId());
|
|
|
+ if(equipment != null) {
|
|
|
+ if(StringUtils.isNotEmpty(equipment.getName())){
|
|
|
+ proportionCheck.setEquipmentName(equipment.getName());
|
|
|
+ }else {
|
|
|
+ proportionCheck.setEquipmentName(equipment.getClientId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
return R.ok(iPage);
|
|
|
|
|
|
}
|