| | |
|---|
| | | } |
|---|
| | | IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory); |
|---|
| | | sampleOrderDtoIPage.getRecords().forEach(i -> { |
|---|
| | | if (i.getSampleCode().contains("，")) { |
|---|
| | | if (ObjectUtils.isNotEmpty(i.getSampleCode()) && i.getSampleCode().contains("，")) { |
|---|
| | | String[] split = i.getSampleCode().split("，"); |
|---|
| | | i.setSampleCode(split[0]); |
|---|
| | | } |
|---|
| | |
|---|
| | | List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, orderId).select(InsSample::getId)); |
|---|
| | | List<Integer> ids = insSamples.stream().map(a -> a.getId()).collect(Collectors.toList()); |
|---|
| | | List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery() |
|---|
| | | .in(InsProduct::getInsSampleId, ids). |
|---|
| | | eq(InsProduct::getState, 1) |
|---|
| | | .isNotNull(InsProduct::getInspectionItemClass) |
|---|
| | | .in(InsProduct::getInsSampleId, ids) |
|---|
| | | .eq(InsProduct::getState, 1) |
|---|
| | | // .isNull(InsProduct::getInsFibersId) |
|---|
| | | // .isNull(InsProduct::getInsFiberId) |
|---|
| | | .select(InsProduct::getSonLaboratory).groupBy(InsProduct::getSonLaboratory)); |
|---|
| | |
|---|
| | | |
|---|
| | | @Override |
|---|
| | | public int upInsOrderOfState(InsOrder insOrder) { |
|---|
| | | InsOrder order = insOrderMapper.selectById(insOrder.getId()); |
|---|
| | | insOrder.setCompany(order.getCompany()); |
|---|
| | | insOrder.setExamineTime(LocalDateTime.now()); |
|---|
| | | if (insOrder.getState() == 1) { |
|---|
| | | //审核通过才会生成委托编号 |
|---|
| | |
|---|
| | | if (StringUtils.isEmpty(code)) { |
|---|
| | | code = ""; |
|---|
| | | } |
|---|
| | | Custom custom = customMapper.selectById(insOrder.getCompanyId()); |
|---|
| | | Custom custom = customMapper.selectById(order.getCompanyId()); |
|---|
| | | System.out.println("============="+custom.getCompany()); |
|---|
| | | System.out.println("-------------"+order.getCompany()); |
|---|
| | | String code2 = custom.getCode2(); |
|---|
| | | if (!custom.getCompany().equals(insOrder.getCompany())){ |
|---|
| | | Custom one = customMapper.selectOne(Wrappers.<Custom>lambdaQuery().eq(Custom::getCompany, insOrder.getCompany())); |
|---|
| | | if (!custom.getCompany().equals(order.getCompany())){ |
|---|
| | | Custom one = customMapper.selectOne(Wrappers.<Custom>lambdaQuery().eq(Custom::getCompany, order.getCompany())); |
|---|
| | | insOrder.setCompanyId(one.getId()); |
|---|
| | | code2=one.getCode2(); |
|---|
| | | } |
|---|
| | | //String code2 = customMapper.selectById(insOrder.getCompanyId()).getCode2(); |
|---|
| | | insOrder.setEntrustCode(giveCode.giveCode2("JCZX/" + code + "-" + code2 + "-", insOrder.getCompanyId(), insOrder.getLaboratory(), "ins_order", "", "yyMM")); |
|---|
| | | } |
|---|
| | | return insOrderMapper.updateById(insOrder); |
|---|
| | |
|---|
| | | public Map<String, Object> selectSampleAndProductByOrderId(IPage<SampleProductDto2> page, SampleProductDto2 sampleProductDto) { |
|---|
| | | Map<String, Object> map = new HashMap<>(); |
|---|
| | | map.put("head", PrintChina.printChina(SampleProductDto2.class)); |
|---|
| | | IPage<SampleProductDto2> productDto2IPage = insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto)); |
|---|
| | | IPage<SampleProductDto2> productDto2IPage = insOrderMapper.selectSampleAndProductByOrderId(page, QueryWrappers.queryWrappers(sampleProductDto).orderByAsc("inspection_item"),sampleProductDto.getId()); |
|---|
| | | for (SampleProductDto2 record : productDto2IPage.getRecords()) { |
|---|
| | | InsProductUser insProductUser = insProductUserMapper.selectOne(Wrappers.<InsProductUser>lambdaQuery() |
|---|
| | | .eq(InsProductUser::getInsProductId, record.getInsProductId()) |
|---|
