| | |
| | | import com.ruoyi.inspect.pojo.InsProduct; |
| | | import com.ruoyi.inspect.pojo.InsSample; |
| | | import com.ruoyi.inspect.service.InsProductService; |
| | | import com.ruoyi.performance.pojo.AuxiliaryOutputWorkingHours; |
| | | import lombok.AllArgsConstructor; |
| | | import org.springframework.beans.BeanUtils; |
| | | import org.springframework.stereotype.Service; |
| | |
| | | |
| | | //查询待检项目 |
| | | @Override |
| | | public IPage<InsProduct> selectNoProducts(Page page, InsProduct insProduct, Integer orderId, String ids) { |
| | | public IPage<InsProduct> selectNoProducts(Page page, Integer orderId, String ids) { |
| | | List<Integer> noIds = null; |
| | | if (StringUtils.isNotBlank(ids)) { |
| | | noIds = Arrays.asList(ids.split(",")).stream() |
| | | noIds = Arrays.stream(ids.split(",")) |
| | | .map(Integer::parseInt) |
| | | .collect(Collectors.toList()); |
| | | } |
| | | IPage<InsProduct> insProductIPage = baseMapper.selectNoProducts(page, orderId, noIds); |
| | | return insProductIPage; |
| | | return baseMapper.selectNoProducts(page, orderId, noIds); |
| | | } |
| | | |
| | | //审核待检撤销 |
| | |
| | | product.setTemplate(null); |
| | | product.setStyle(null); |
| | | return product; |
| | | }).collect(Collectors.toList()); |
| | | }).sorted((o1, o2) -> (o1.getSort() == null ? 0 : o1.getSort()) |
| | | - (o2.getSort() == null ? 0 : o2.getSort())).collect(Collectors.toList()); |
| | | return insProducts; |
| | | } |
| | | |