diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 259ed00..a28fcd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -98,23 +98,23 @@
@GetMapping("/test")
@ResponseBody
public void test(Long id)throws Exception {
- BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper = SpringContextUtil.getBean(BusinessSiteExecutiveInfoMapper.class);
- BusinessSiteExecutiveInfo siteExecutive = siteExecutiveInfoMapper.selectById(id);
- //进行证书报告生成,并在远程注册服务器注册
- PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
- try {
- DictCodeUtils.convertDictCodeToName(siteExecutive);
- String printFileName = printFileRegister.registerPrintFile(siteExecutive, FilePrintTypeEnum.EXTERNAL_CALIBRATION_FILE);
- log.info(printFileName);
- } catch (Exception ex) {
- log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex);
- }
-// BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-// BusinessCertificateReport certificateReport = certificateReportMapper.selectById(id);
-// DictCodeUtils.convertDictCodeToName(certificateReport);
+// BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper = SpringContextUtil.getBean(BusinessSiteExecutiveInfoMapper.class);
+// BusinessSiteExecutiveInfo siteExecutive = siteExecutiveInfoMapper.selectById(id);
+// //进行证书报告生成,并在远程注册服务器注册
// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-// String printFileName = printFileRegister.registerPrintFile(certificateReport,certificateReport.getCertificateReportTypeName());
-// log.info(printFileName);
+// try {
+// DictCodeUtils.convertDictCodeToName(siteExecutive);
+// String printFileName = printFileRegister.registerPrintFile(siteExecutive, FilePrintTypeEnum.EXTERNAL_CALIBRATION_FILE);
+// log.info(printFileName);
+// } catch (Exception ex) {
+// log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex);
+// }
+ BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+ BusinessCertificateReport certificateReport = certificateReportMapper.selectById(id);
+ DictCodeUtils.convertDictCodeToName(certificateReport);
+ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
+ String printFileName = printFileRegister.registerPrintFile(certificateReport,certificateReport.getCertificateReportTypeName());
+ log.info(printFileName);
}
}
diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
index 259ed00..a28fcd5 100644
--- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MockController.java
@@ -98,23 +98,23 @@
@GetMapping("/test")
@ResponseBody
public void test(Long id)throws Exception {
- BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper = SpringContextUtil.getBean(BusinessSiteExecutiveInfoMapper.class);
- BusinessSiteExecutiveInfo siteExecutive = siteExecutiveInfoMapper.selectById(id);
- //进行证书报告生成,并在远程注册服务器注册
- PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
- try {
- DictCodeUtils.convertDictCodeToName(siteExecutive);
- String printFileName = printFileRegister.registerPrintFile(siteExecutive, FilePrintTypeEnum.EXTERNAL_CALIBRATION_FILE);
- log.info(printFileName);
- } catch (Exception ex) {
- log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex);
- }
-// BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
-// BusinessCertificateReport certificateReport = certificateReportMapper.selectById(id);
-// DictCodeUtils.convertDictCodeToName(certificateReport);
+// BusinessSiteExecutiveInfoMapper siteExecutiveInfoMapper = SpringContextUtil.getBean(BusinessSiteExecutiveInfoMapper.class);
+// BusinessSiteExecutiveInfo siteExecutive = siteExecutiveInfoMapper.selectById(id);
+// //进行证书报告生成,并在远程注册服务器注册
// PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
-// String printFileName = printFileRegister.registerPrintFile(certificateReport,certificateReport.getCertificateReportTypeName());
-// log.info(printFileName);
+// try {
+// DictCodeUtils.convertDictCodeToName(siteExecutive);
+// String printFileName = printFileRegister.registerPrintFile(siteExecutive, FilePrintTypeEnum.EXTERNAL_CALIBRATION_FILE);
+// log.info(printFileName);
+// } catch (Exception ex) {
+// log.error("打印异常,证书报告信息为{},异常信息为{}", JSONObject.toJSON(siteExecutive), ex);
+// }
+ BusinessCertificateReportMapper certificateReportMapper = SpringContextUtil.getBean(BusinessCertificateReportMapper.class);
+ BusinessCertificateReport certificateReport = certificateReportMapper.selectById(id);
+ DictCodeUtils.convertDictCodeToName(certificateReport);
+ PrintFileRegister printFileRegister = SpringContextUtil.getBean(PrintFileRegister.class);
+ String printFileName = printFileRegister.registerPrintFile(certificateReport,certificateReport.getCertificateReportTypeName());
+ log.info(printFileName);
}
}
diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
index ddc9269..fe07844 100644
--- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
+++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml
@@ -92,6 +92,7 @@
and SAMPLE_NAME like concat('%',#{request.sampleName},'%')
) csi ON csi.id=bcp.sample_id
+ ORDER BY bcp.create_time DESC