diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java index 2118a6e..86c4261 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/BizEquipmentInfoServiceImpl.java @@ -12,7 +12,6 @@ import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.*; -import com.casic.missiles.dto.business.dispatch.DeviceScanVO; import com.casic.missiles.dto.business.dispatch.LabelBindDTO; import com.casic.missiles.dto.equipment.*; import com.casic.missiles.dto.flowable.ApprovalDeleteRequest; @@ -58,10 +57,7 @@ import java.io.IOException; import java.io.InputStream; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -102,6 +98,8 @@ private WorkbenchRemindMessageMapper messageMapper; @Autowired private BizEquipmentStandardCheckItemCategoryMapper checkItemCategoryMapper; + @Autowired + private BizEquipmentStandardCheckItemDataPistonGaugeMapper checkItemDataPistonGaugeMapper; @Override public Page approvalListPage(Page page, EquipmentApprovalListRequest request) throws Exception { @@ -504,6 +502,21 @@ BizEquipmentStandardCheckItemCategory checkItemCategory = list.get(0); equip.setItemCategoryId(checkItemCategory.getId()); equip.setItemCategoryName(checkItemCategory.getCategoryName()); + } else if(!CollectionUtils.isEmpty(list) && list.size() > 1) { + //获取配套设备的核查项分类:存在2个以上核查项的配套设备需要根据不同的标准装置请求不同的检定项数据表 + if(request.getStandardName().contains("活塞式压力计")){ + HashMap map = new HashMap<>(); + map.put("equipment_id", equip.getId()); + List itemDataPistonGauges = checkItemDataPistonGaugeMapper.selectByMap(map); + if (!CollectionUtils.isEmpty(itemDataPistonGauges)) { + equip.setItemCategoryId(itemDataPistonGauges.get(0).getItemCategoryId()); + Optional first = list.stream().filter(l -> l.getId().equals(itemDataPistonGauges.get(0).getItemCategoryId())).findFirst(); + equip.setItemCategoryName(first.get().getCategoryName()); + } + } else if(request.getStandardName().contains("xxx")){ + // TODO: 2023/11/13 + } + } QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("equipment_no", equip.getEquipmentNo());