diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index a496210..cb10b91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -141,6 +141,7 @@ appearance, rely_file AS "relyFile", bo.deliverer, + bo.deliver_time AS "deliverTime", bo.deliverer_tel AS "delivererTel", deliverer_sign_file AS "delivererSignFile", deliverer_sign_time AS "delivererSignTime", diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index a496210..cb10b91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -141,6 +141,7 @@ appearance, rely_file AS "relyFile", bo.deliverer, + bo.deliver_time AS "deliverTime", bo.deliverer_tel AS "delivererTel", deliverer_sign_file AS "delivererSignFile", deliverer_sign_time AS "delivererSignTime", diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java index ecb13ff..80b26c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java @@ -160,6 +160,11 @@ /** * 送检人签名文件,minio存储文件名(为空时打印签字) */ + @ApiModelProperty(value = "送检时间", dataType = "String") + private String delivererTime; + /** + * 送检人签名文件,minio存储文件名(为空时打印签字) + */ @ApiModelProperty(value = "送检人(可改写,以实际送检人为准)", dataType = "String") @TableField("deliverer_tel") private String delivererTel; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index a496210..cb10b91 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -141,6 +141,7 @@ appearance, rely_file AS "relyFile", bo.deliverer, + bo.deliver_time AS "deliverTime", bo.deliverer_tel AS "delivererTel", deliverer_sign_file AS "delivererSignFile", deliverer_sign_time AS "delivererSignTime", diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java index ecb13ff..80b26c2 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/BusinessInterchangeDetailResponse.java @@ -160,6 +160,11 @@ /** * 送检人签名文件,minio存储文件名(为空时打印签字) */ + @ApiModelProperty(value = "送检时间", dataType = "String") + private String delivererTime; + /** + * 送检人签名文件,minio存储文件名(为空时打印签字) + */ @ApiModelProperty(value = "送检人(可改写,以实际送检人为准)", dataType = "String") @TableField("deliverer_tel") private String delivererTel; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java index 4f91a9e..f6b3933 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessOrderServiceImpl.java @@ -114,10 +114,13 @@ if (sampleInfo.getIsExistSample().equals("0")) { ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); + } else { + ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo); + sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode() == 200; } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(),sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0; } - if (updateFlag > 0&&sampleUpdateFlag) { + if (updateFlag > 0 && sampleUpdateFlag) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -143,7 +146,7 @@ ReturnDTO returnDTO = customerSampleService.updateSample(sampleInfo); sampleAddFlag = sampleAddFlag && returnDTO.getCode() == 200; } - sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(),sampleInfo.getId()) > 0; + sampleAddFlag = sampleAddFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getMeasureContent(), sampleInfo.getId()) > 0; } if (addFlag > 0 && sampleAddFlag) { return ReturnUtil.success(); @@ -227,7 +230,7 @@ return sampleStatus; } - private Integer sampleStatusCreator(Long orderId,String measureContent, Long sampleId) { + private Integer sampleStatusCreator(Long orderId, String measureContent, Long sampleId) { BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); sampleStatusPopulation.setOrderId(orderId); sampleStatusPopulation.setSampleId(sampleId);