diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index 0a776fbd..999628f0 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -436,8 +436,11 @@ public class GammaController { } @GetMapping("exportRadionuclideActivity") - public void exportRadionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response){ - gammaService.exportRadionuclideActivity(sampleId, fileName, request, response); + public void exportRadionuclideActivity(Integer sampleId, String fileName, + String arTime, String crTime, + HttpServletRequest request, + HttpServletResponse response){ + gammaService.exportRadionuclideActivity(sampleId, fileName, arTime, crTime, request, response); } @GetMapping("Spectrum") diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java index 7edf6462..ea573b19 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java @@ -153,7 +153,7 @@ public interface IGammaService{ Result radionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request); - void exportRadionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response); + void exportRadionuclideActivity(Integer sampleId, String fileName, String arTime, String crTime,HttpServletRequest request, HttpServletResponse response); Result Spectrum(Integer sampleId, String fileName, HttpServletRequest request); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 3a166ad9..a367ec7f 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -4383,20 +4383,26 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi } @Override - public void exportRadionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response) { + public void exportRadionuclideActivity(Integer sampleId, String fileName, String arTime, String crTime, HttpServletRequest request, HttpServletResponse response) { Result> result = radionuclideActivity(sampleId, fileName, request); Map dataMap = result.getResult(); if (MapUtil.isEmpty(dataMap)) return; + String formater = DateConstant.DATE_TIME; Date actRef = (Date) dataMap.get("dateTime_act_ref"); Date conRef = (Date) dataMap.get("dateTime_con_ref"); - if (ObjectUtil.isNotNull(actRef)) { - String actTime = DateUtil.format(actRef, DateConstant.DATE_TIME); - dataMap.put("dateTime_act_ref", actTime); + if (StrUtil.isNotBlank(arTime)) { + dataMap.put("dateTime_act_ref", arTime); + } else { + if (ObjectUtil.isNotNull(actRef)) + dataMap.put("dateTime_act_ref", DateUtil.format(actRef, formater)); } - if (ObjectUtil.isNotNull(conRef)) { - String conTime = DateUtil.format(conRef, DateConstant.DATE_TIME); - dataMap.put("dateTime_con_ref", conTime); + if (StrUtil.isNotBlank(crTime)) { + dataMap.put("dateTime_con_ref", crTime); + } else { + if (ObjectUtil.isNotNull(conRef)) + dataMap.put("dateTime_con_ref", DateUtil.format(conRef, formater)); } + String export = "RadionuclideActivity-Gamma.xls"; String template = ExportTemplate.RadionuclideActivity_G.getName(); ExportUtil.exportXls(response, template, dataMap, export);