diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 1972134..bd4bace 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.enums.business.MeasureCategoryEnum; +import com.casic.missiles.exception.BusinessException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -42,5 +44,14 @@ map.put("phone", HAIKOU_PHONE); map.put("postalCode", HAIKOU_POSTAL_CODE); } + //填充有效日期 + if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) { + String measureValidDate = (String) map.get(MEASURE_VALID_DATE); + try { + map.put(MEASURE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format( new SimpleDateFormat("yyyy-MM-dd").parse(measureValidDate))); + } catch (Exception e) { + throw new BusinessException(1500, String.format(measureValidDate, "检定有效日期,格式不正确")); + } + } } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 1972134..bd4bace 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.enums.business.MeasureCategoryEnum; +import com.casic.missiles.exception.BusinessException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -42,5 +44,14 @@ map.put("phone", HAIKOU_PHONE); map.put("postalCode", HAIKOU_POSTAL_CODE); } + //填充有效日期 + if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) { + String measureValidDate = (String) map.get(MEASURE_VALID_DATE); + try { + map.put(MEASURE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format( new SimpleDateFormat("yyyy-MM-dd").parse(measureValidDate))); + } catch (Exception e) { + throw new BusinessException(1500, String.format(measureValidDate, "检定有效日期,格式不正确")); + } + } } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java index c2b2166..3760c92 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java @@ -243,7 +243,6 @@ throw new BusinessException(1500, String.format(measureValidDate, "检定有效日期,格式不正确")); } } - } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java index 1972134..bd4bace 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/StandardEquipmentSupport.java @@ -2,9 +2,11 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.casic.missiles.enums.business.MeasureCategoryEnum; +import com.casic.missiles.exception.BusinessException; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -42,5 +44,14 @@ map.put("phone", HAIKOU_PHONE); map.put("postalCode", HAIKOU_POSTAL_CODE); } + //填充有效日期 + if (ObjectUtils.isNotEmpty(map.get(MEASURE_VALID_DATE))) { + String measureValidDate = (String) map.get(MEASURE_VALID_DATE); + try { + map.put(MEASURE_DATE, new SimpleDateFormat("yyyy年MM月dd日").format( new SimpleDateFormat("yyyy-MM-dd").parse(measureValidDate))); + } catch (Exception e) { + throw new BusinessException(1500, String.format(measureValidDate, "检定有效日期,格式不正确")); + } + } } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java index c2b2166..3760c92 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/eqpt/standard/impl/MultiCalibrationBuilder.java @@ -243,7 +243,6 @@ throw new BusinessException(1500, String.format(measureValidDate, "检定有效日期,格式不正确")); } } - } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java index 05d15a0..aac1112 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/PrintFileRegister.java @@ -116,9 +116,9 @@ log.error("文件打印出现异常,打印参数信息为{},异常信息为{}", JSON.toJSON(filePrintRegister), rex); } finally { //如果文件路径不为空,回传文件流 -// if (StringUtils.isNotEmpty(printDocUrl)) { -// miniName = createResponseFileInput(printDocUrl, response); -// } + if (StringUtils.isNotEmpty(printDocUrl)) { + miniName = createResponseFileInput(printDocUrl, response); + } //删除无效的文件 File invalidFile = new File(tempLocalFileDir); //删除运行空间下的文件