diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml index 9a6976b..c821cf3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessLabExecutiveInfoMapper.xml @@ -33,7 +33,7 @@ blei.id AS id, csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no, bo.order_code AS orderNo, bo.id AS orderId, bo.customer_id, bo.customer_no, bo.customer_name, bo.deliverer, bo.is_urgent, csi.sample_belong, bo.require_over_time, blei.require_certifications, - blei.measure_status, blei.measure_person_id, csi.label_bind + blei.measure_status, blei.measure_person_id, csi.label_bind,blei.remark AS remark diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 29724db..b372e32 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -221,6 +221,8 @@ if (!StringUtils.isEmpty(oldCertificateCode)) { labExecutiveInfo.setRemark("重检,原证书编号是" + oldCertificateCode); } + //暂时制定为检测完成 + labExecutiveInfo.setMeasureStatus(SampleStatusEnum.MEASURE_COMPLETE); executiveInfoMapper.updateById(labExecutiveInfo); labExecutiveInfo.setInvalid(false); labExecutiveInfo.setMeasureStatus(SampleStatusEnum.IN_MEASURE);