xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：增加arTime/crTime

Browse Source
This commit is contained in:
nieziyan 2024-01-18 16:52:43 +08:00
parent ca744c524b
commit 92f7180f31
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java
View File

@ -436,8 +436,11 @@ public class GammaController {
} }
@GetMapping("exportRadionuclideActivity") @GetMapping("exportRadionuclideActivity")
public void exportRadionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request, HttpServletResponse response){ public void exportRadionuclideActivity(Integer sampleId, String fileName,
gammaService.exportRadionuclideActivity(sampleId, fileName, request, response); String arTime, String crTime,
HttpServletRequest request,
HttpServletResponse response){
gammaService.exportRadionuclideActivity(sampleId, fileName, arTime, crTime, request, response);
} }
@GetMapping("Spectrum") @GetMapping("Spectrum")

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java
View File

@ -153,7 +153,7 @@ public interface IGammaService{
Result<?> radionuclideActivity(Integer sampleId, String fileName, HttpServletRequest request); 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); Result Spectrum(Integer sampleId, String fileName, HttpServletRequest request);

20
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java
View File

@ -4383,20 +4383,26 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
} }
@Override @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<Map<String, Object>> result = radionuclideActivity(sampleId, fileName, request); Result<Map<String, Object>> result = radionuclideActivity(sampleId, fileName, request);
Map<String, Object> dataMap = result.getResult(); Map<String, Object> dataMap = result.getResult();
if (MapUtil.isEmpty(dataMap)) return; if (MapUtil.isEmpty(dataMap)) return;
String formater = DateConstant.DATE_TIME;
Date actRef = (Date) dataMap.get("dateTime_act_ref"); Date actRef = (Date) dataMap.get("dateTime_act_ref");
Date conRef = (Date) dataMap.get("dateTime_con_ref"); Date conRef = (Date) dataMap.get("dateTime_con_ref");
if (ObjectUtil.isNotNull(actRef)) { if (StrUtil.isNotBlank(arTime)) {
String actTime = DateUtil.format(actRef, DateConstant.DATE_TIME); dataMap.put("dateTime_act_ref", arTime);
dataMap.put("dateTime_act_ref", actTime); } else {
if (ObjectUtil.isNotNull(actRef))
dataMap.put("dateTime_act_ref", DateUtil.format(actRef, formater));
} }
if (ObjectUtil.isNotNull(conRef)) { if (StrUtil.isNotBlank(crTime)) {
String conTime = DateUtil.format(conRef, DateConstant.DATE_TIME); dataMap.put("dateTime_con_ref", crTime);
dataMap.put("dateTime_con_ref", conTime); } else {
if (ObjectUtil.isNotNull(conRef))
dataMap.put("dateTime_con_ref", DateUtil.format(conRef, formater));
} }
String export = "RadionuclideActivity-Gamma.xls"; String export = "RadionuclideActivity-Gamma.xls";
String template = ExportTemplate.RadionuclideActivity_G.getName(); String template = ExportTemplate.RadionuclideActivity_G.getName();
ExportUtil.exportXls(response, template, dataMap, export); ExportUtil.exportXls(response, template, dataMap, export);