如果其他检验不检也可以生成报告结束试验跳过

zss

9 天以前 0ed3d6d60ece4effae6072556165a0aad9fe8f9f

如果其他检验不检也可以生成报告结束试验跳过

 inspect-server/src/main/java/com/yuanchu/mom/mapper/InsOrderUserMapper.java

@@ -29,5 +29,5 @@
    IPage<InsOrderUserDto> selectInsOrderUserDto2(@Param("ids") List<Integer> ids, Page page);

    //根据订单id查询出需要生成报告的所有样品的所有数据
    List<InsReportDto1> selectInsReportDto1(@Param("id") Integer id);
    List<InsReportDto1> selectInsReportDto1(@Param("id") Integer id,@Param("sampleId") Integer sampleId);
}

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java

@@ -1239,7 +1239,7 @@
                            .set(InsOrderState::getVerifyTell, tell)
                            .set(InsOrderState::getVerifyUser, userId));
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),null);
                    createReport(insOrder.getId(),insReportDto1s);
                    break;
            }
@@ -1339,7 +1339,7 @@
                                .set(InsOrderState::getVerifyUser, userId));
                    }
                    /*生成对应的检验报告*/
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId());
                    List<InsReportDto1> insReportDto1s=insOrderUserMapper.selectInsReportDto1(insOrder.getId(),sampleId);
                    createReport(insOrder.getId(),insReportDto1s);
                    break;
            }

 inspect-server/src/main/java/com/yuanchu/mom/utils/WordUtils.java

@@ -2590,6 +2590,7 @@
        SampleProductDto insSample = insSampleMapper.selectSampleProductListByOrderId(insReportDto1.getSampleId());
        SampleProductDto s = insSample;
        List<InsProduct> insProducts = insProductMapper.selectList(Wrappers.<InsProduct>lambdaQuery()
                .isNotNull(InsProduct::getInsResult)
                .eq(InsProduct::getInsSampleId, insSample.getId())
                .eq(InsProduct::getState, 1));
        /*首页*/

 inspect-server/src/main/resources/mapper/InsOrderUserMapper.xml

@@ -66,6 +66,9 @@
                 left join ins_order_state ios on isa.id = ios.ins_sample_id
                 left join ins_order_user iou on ios.id = iou.ins_order_state_id
        where isa.ins_order_id=#{id}
        <if test="sampleId != null">
          and  isa.id=#{sampleId}
        </if>
        order by isa.id,ios.laboratory
    </select>
</mapper>