diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java index c02d124..3fbe5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java @@ -43,9 +43,7 @@ protected final FilePrintRegister initialization(String templateFileDir, Long id, String fileName) { FilePrintRegister filePrintRegister = new FilePrintRegister(); - filePrintRegister.setTemplateWordType(fileName.endsWith(".docx") || - fileName.endsWith(".doc") - ? true : false); + filePrintRegister.setTemplateWordType(fileName.endsWith(".docx") || fileName.endsWith(".doc") ? true : false); templateFileDir = templateFileDir + id + File.separator; filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java index c02d124..3fbe5ca 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/PrintFileDataSupport.java @@ -43,9 +43,7 @@ protected final FilePrintRegister initialization(String templateFileDir, Long id, String fileName) { FilePrintRegister filePrintRegister = new FilePrintRegister(); - filePrintRegister.setTemplateWordType(fileName.endsWith(".docx") || - fileName.endsWith(".doc") - ? true : false); + filePrintRegister.setTemplateWordType(fileName.endsWith(".docx") || fileName.endsWith(".doc") ? true : false); templateFileDir = templateFileDir + id + File.separator; filePrintRegister.setFileName(fileName); filePrintRegister.setTemDir(templateFileDir); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java index 251b515..fa805a1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/data/certificate/CertificatePrintFileData.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; import java.text.SimpleDateFormat; -import java.util.Arrays; +import java.util.Calendar; import java.util.Map; @@ -66,10 +66,29 @@ try { if (StringUtils.isNotEmpty(metaData.getIssuanceDate())) { params.put("issuanceDate", new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getIssuanceDate()))); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getIssuanceDate())); + params.put("yearI", calendar.get(Calendar.YEAR)); + params.put("monthI", calendar.get(Calendar.MONTH) + 1); + params.put("dayI", calendar.get(Calendar.DAY_OF_MONTH)); } if (StringUtils.isNotEmpty(metaData.getCalibrationTime())) { params.put("calibrationTime", new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getCalibrationTime()))); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getCalibrationTime())); + params.put("yearC", calendar.get(Calendar.YEAR)); + params.put("monthC", calendar.get(Calendar.MONTH) + 1); + params.put("dayC", calendar.get(Calendar.DAY_OF_MONTH)); } + if (StringUtils.isNotEmpty(metaData.getDeliverTime())) { + params.put("deliverTime", new SimpleDateFormat("yyyy年MM月dd日").format(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getDeliverTime()))); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(new SimpleDateFormat("yyyy-MM-dd").parse(metaData.getDeliverTime())); + params.put("yearD", calendar.get(Calendar.YEAR)); + params.put("monthD", calendar.get(Calendar.MONTH) + 1); + params.put("dayD", calendar.get(Calendar.DAY_OF_MONTH)); + } + params.put("certificateNo", metaData.getCertificateReportCode()); params.put("createUserName", metaData.getCreateUserName()); } catch (Exception ex) { log.error("日期格式转换异常,异常信息{}", ex);