diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index d23b197..2e8657f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -68,12 +68,22 @@ @ExcelProperty(value = "检定周期", order = 7) private String measurePeriod; + @ApiModelProperty(value = "证书过期时间", dataType = "String") + @ExcelProperty(value = "证书过期时间", order = 8) + private String validDeadline; + + @TableField(exist = false) + @ApiModelProperty(value = "证书状态", dataType = "String") + @ExcelProperty(value = "证书状态", order = 9) + private String certificationStatus; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") - @ExcelProperty(value = "上次检定时间", order = 8) + @ExcelProperty(value = "上次检定时间", order = 10) private String measureLastTime; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注", order = 9) + @ExcelProperty(value = "备注", order = 11) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index d23b197..2e8657f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -68,12 +68,22 @@ @ExcelProperty(value = "检定周期", order = 7) private String measurePeriod; + @ApiModelProperty(value = "证书过期时间", dataType = "String") + @ExcelProperty(value = "证书过期时间", order = 8) + private String validDeadline; + + @TableField(exist = false) + @ApiModelProperty(value = "证书状态", dataType = "String") + @ExcelProperty(value = "证书状态", order = 9) + private String certificationStatus; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") - @ExcelProperty(value = "上次检定时间", order = 8) + @ExcelProperty(value = "上次检定时间", order = 10) private String measureLastTime; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注", order = 9) + @ExcelProperty(value = "备注", order = 11) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index beb1f86..849947e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -68,6 +68,9 @@ @ApiModelProperty(value = " 附件及数量", dataType = "String") private String appendix; + @ApiModelProperty(value = " 附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") private String specialRequire; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index d23b197..2e8657f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -68,12 +68,22 @@ @ExcelProperty(value = "检定周期", order = 7) private String measurePeriod; + @ApiModelProperty(value = "证书过期时间", dataType = "String") + @ExcelProperty(value = "证书过期时间", order = 8) + private String validDeadline; + + @TableField(exist = false) + @ApiModelProperty(value = "证书状态", dataType = "String") + @ExcelProperty(value = "证书状态", order = 9) + private String certificationStatus; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") - @ExcelProperty(value = "上次检定时间", order = 8) + @ExcelProperty(value = "上次检定时间", order = 10) private String measureLastTime; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注", order = 9) + @ExcelProperty(value = "备注", order = 11) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index beb1f86..849947e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -68,6 +68,9 @@ @ApiModelProperty(value = " 附件及数量", dataType = "String") private String appendix; + @ApiModelProperty(value = " 附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") private String specialRequire; 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 fe3e293..289209a 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 @@ -103,7 +103,7 @@ // 对样品进行是否在库的判断，如果不存在则入库， 入库操作完成，进行委托书样品关系的绑定 @Override public ReturnDTO updateOrder(BusinessOrder businessOrder) { - Integer updateFlag = this.baseMapper.deleteById(businessOrder); + Integer updateFlag = this.baseMapper.updateById(businessOrder); Boolean sampleUpdateFlag = true; for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) { sampleInfo.setDeliverer(businessOrder.getDeliverer()); @@ -112,9 +112,9 @@ ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getId()) > 0; } - if (updateFlag > 0) { + if (updateFlag > 0&&sampleUpdateFlag) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java index d23b197..2e8657f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListResponse.java @@ -68,12 +68,22 @@ @ExcelProperty(value = "检定周期", order = 7) private String measurePeriod; + @ApiModelProperty(value = "证书过期时间", dataType = "String") + @ExcelProperty(value = "证书过期时间", order = 8) + private String validDeadline; + + @TableField(exist = false) + @ApiModelProperty(value = "证书状态", dataType = "String") + @ExcelProperty(value = "证书状态", order = 9) + private String certificationStatus; + + @ApiModelProperty(value = "上次检定时间", dataType = "String") - @ExcelProperty(value = "上次检定时间", order = 8) + @ExcelProperty(value = "上次检定时间", order = 10) private String measureLastTime; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注", order = 9) + @ExcelProperty(value = "备注", order = 11) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java index beb1f86..849947e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/customer/CustomerSampleInfo.java @@ -68,6 +68,9 @@ @ApiModelProperty(value = " 附件及数量", dataType = "String") private String appendix; + @ApiModelProperty(value = " 附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = " 客户特殊要求", dataType = "String") private String specialRequire; 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 fe3e293..289209a 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 @@ -103,7 +103,7 @@ // 对样品进行是否在库的判断，如果不存在则入库， 入库操作完成，进行委托书样品关系的绑定 @Override public ReturnDTO updateOrder(BusinessOrder businessOrder) { - Integer updateFlag = this.baseMapper.deleteById(businessOrder); + Integer updateFlag = this.baseMapper.updateById(businessOrder); Boolean sampleUpdateFlag = true; for (CustomerSampleInfo sampleInfo : businessOrder.getCustomerSampleInfoList()) { sampleInfo.setDeliverer(businessOrder.getDeliverer()); @@ -112,9 +112,9 @@ ReturnDTO returnDTO = customerSampleService.addSample(sampleInfo); sampleUpdateFlag = sampleUpdateFlag && returnDTO.getCode().equals("200"); } - sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(sampleInfo.getOrderId(), sampleInfo.getId()) > 0; + sampleUpdateFlag = sampleUpdateFlag && sampleStatusCreator(businessOrder.getId(), sampleInfo.getId()) > 0; } - if (updateFlag > 0) { + if (updateFlag > 0&&sampleUpdateFlag) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java index a4c7e4e..79a776b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/customer/CustomerSampleServiceImpl.java @@ -36,9 +36,8 @@ import org.springframework.util.ObjectUtils; import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; -import java.util.Optional; +import java.text.SimpleDateFormat; +import java.util.*; import java.util.stream.Collectors; @Service @@ -62,6 +61,7 @@ if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } }); for (CustomerSampleListResponse customerSampleListResponse : customerSamplePage.getRecords()) { @@ -101,7 +101,7 @@ @Override public CustomerSampleInfo sampleDetail(Long id) { CustomerSampleInfo customerSampleInfo = this.baseMapper.selectById(id); - if(!ObjectUtils.isEmpty(customerSampleInfo)){ + if (!ObjectUtils.isEmpty(customerSampleInfo)) { doCustomerSampleInfoPopulation(customerSampleInfo); } return customerSampleInfo; @@ -134,6 +134,7 @@ if (!ObjectUtils.isEmpty(businessOrderSampleRelation)) { customerSample.setOrderId(businessOrderSampleRelation.getOrderId()); customerSample.setSampleSatus(businessOrderSampleRelation.getSampleStatus()); + customerSample.setCertificationStatus(calculateCertificationStatus(customerSample.getValidDeadline())); } } ); @@ -195,7 +196,7 @@ private QueryWrapper listParamWrapper(CustomerSampleListRequest request) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,measure_period,measure_last_time,remark"); + queryWrapper.select("id,sample_no,sample_name,sample_model,manufacturing_no,customer_id,measure_period,measure_last_time,remark,valid_deadline"); queryWrapper.like(StringUtils.isNotBlank(request.getSampleNo()), "sample_no", request.getSampleNo());//样品编号 queryWrapper.like(StringUtils.isNotBlank(request.getSampleName()), "sample_name", request.getSampleName());//样品名称 queryWrapper.like(StringUtils.isNotBlank(request.getSampleBelong()), "sample_belong", request.getSampleBelong());//样品所属 @@ -217,11 +218,28 @@ return queryWrapper; } + private String calculateCertificationStatus(String validDeadline) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (StringUtils.isEmpty(validDeadline)) { + return "0"; + } + if (validDeadline.compareTo(sdf.format(new Date())) > 0) { + return "2"; + } + Calendar date = Calendar.getInstance(); + date.setTime(new Date()); + date.add(Calendar.DAY_OF_MONTH, -30); + if (validDeadline.compareTo(sdf.format(date.getTime())) > 0) { + return "1"; + } + return "0"; + } + private void doCustomerSampleInfoPopulation(CustomerSampleInfo customerSampleInfo) { - CustomerInfo customerInfo =customerMapper.selectById(customerSampleInfo.getCustomerId()); - if(!ObjectUtils.isEmpty(customerInfo)){ + CustomerInfo customerInfo = customerMapper.selectById(customerSampleInfo.getCustomerId()); + if (!ObjectUtils.isEmpty(customerInfo)) { customerSampleInfo.setPhone(customerInfo.getPhone()); - customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName()+customerInfo.getAddressProvinceName()+customerInfo.getAddressCityName()+customerInfo.getFullAddress()); + customerSampleInfo.setCustomerAddress(customerInfo.getAddressCountryName() + customerInfo.getAddressProvinceName() + customerInfo.getAddressCityName() + customerInfo.getFullAddress()); customerSampleInfo.setPostalCode(customerInfo.getPostalCode()); } }