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

修改QC文件查询不出来的问题

Browse Source
This commit is contained in:
duwenyuan 2026-05-25 09:38:57 +08:00
parent 66b48737c5
commit 1a07a49a73
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java
View File

@ -43,7 +43,7 @@ public interface SpectrumAnalysisMapper {
List<GardsXeResultsSpectrum> getXeDataList(Integer sampleId); List<GardsXeResultsSpectrum> getXeDataList(Integer sampleId);
String getQCFilePath(String siteDetCode, String collectStartStr); String getQCFilePath(String siteDetCode, Date collectStart);
CommentData viewComment(@Param(value = "sampleId") Integer sampleId); CommentData viewComment(@Param(value = "sampleId") Integer sampleId);

6
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml
View File

@ -362,17 +362,17 @@
FROM ORIGINAL.GARDS_SAMPLE_DATA qc_samples FROM ORIGINAL.GARDS_SAMPLE_DATA qc_samples
WHERE qc_samples.SITE_DET_CODE = #{siteDetCode} WHERE qc_samples.SITE_DET_CODE = '${siteDetCode}'
AND qc_samples.DATA_TYPE = 'Q' AND qc_samples.DATA_TYPE = 'Q'
AND qc_samples.SPECTRAL_QUALIFIE = 'FULL' AND qc_samples.SPECTRAL_QUALIFIE = 'FULL'
AND qc_samples.ACQUISITION_START <![CDATA[ <= ]]>TO_DATE(#{collectStartStr} ,'yyyy-MM-DD HH24:mi:ss') AND qc_samples.ACQUISITION_START <![CDATA[ <= ]]>#{collectStart}
) )
AND org_sample_data.SITE_DET_CODE = #{siteDetCode} AND org_sample_data.SITE_DET_CODE = '${siteDetCode}'
</where> </where>

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

@ -522,12 +522,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
String qcFileName = ""; String qcFileName = "";
if (Objects.nonNull(dbSpectrumFilePath.getCollectStart()) && if (Objects.nonNull(dbSpectrumFilePath.getCollectStart()) &&
StringUtils.isNotBlank(dbSpectrumFilePath.getSiteDetCode())) { StringUtils.isNotBlank(dbSpectrumFilePath.getSiteDetCode())) {
String collectStartStr =
DateUtils.formatDate(dbSpectrumFilePath.getCollectStart(),
"yyyy/MM/dd HH:mm:ss");
dbQcFilePath = spectrumAnalysisMapper.getQCFilePath( dbQcFilePath = spectrumAnalysisMapper.getQCFilePath(
dbSpectrumFilePath.getSiteDetCode(), dbSpectrumFilePath.getSiteDetCode(),
collectStartStr); dbSpectrumFilePath.getCollectStart());
if (StringUtils.isNotBlank(dbQcFilePath)) { if (StringUtils.isNotBlank(dbQcFilePath)) {
qc = spectrumAnalysisMapper.findSampleByFilePath(dbQcFilePath); qc = spectrumAnalysisMapper.findSampleByFilePath(dbQcFilePath);
qcFileName = dbQcFilePath.substring( qcFileName = dbQcFilePath.substring(
@ -962,12 +959,9 @@ public class SpectrumAnalysisServiceImpl extends AbstractLogOrReport
resultMap.put("detBg", detBgMap); resultMap.put("detBg", detBgMap);
} }
// 查询Qc谱 // 查询Qc谱
String collectStartStr =
DateUtils.formatDate(sampleData.getCollectStart(),
"yyyy/MM/dd HH:mm:ss");
String qcFilePath = String qcFilePath =
spectrumAnalysisMapper.getQCFilePath(sampleData.getSiteDetCode(), spectrumAnalysisMapper.getQCFilePath(sampleData.getSiteDetCode(),
collectStartStr); sampleData.getCollectStart());
if (StringUtils.isNotBlank(qcFilePath)) { if (StringUtils.isNotBlank(qcFilePath)) {
GardsSampleData qcSampleData = GardsSampleData qcSampleData =
spectrumAnalysisMapper.findSampleByFilePath(qcFilePath); spectrumAnalysisMapper.findSampleByFilePath(qcFilePath);