zgty/zt-qms
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

结果报送，bug修复

Browse Source
This commit is contained in:
王兴荣
2025-11-26 16:09:25 +08:00
parent b320d36181
commit be75cb4cf9
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/business/bus/service/SampleResultReportingServiceImpl.java
View File

@@ -133,6 +133,14 @@ public class SampleResultReportingServiceImpl implements SampleResultReportingSe
//查询结果报送未上报的样品 //查询结果报送未上报的样品
List<NoReportSubParentSampleAssessmentRespVO> noReportSubParentSampleAssessmentRespList = businessSubParentSampleAssessmentProjectMapper.selectNoReportSubParentSampleAssessment(configAssayMethodId); List<NoReportSubParentSampleAssessmentRespVO> noReportSubParentSampleAssessmentRespList = businessSubParentSampleAssessmentProjectMapper.selectNoReportSubParentSampleAssessment(configAssayMethodId);
if (CollUtil.isEmpty(noReportSubParentSampleAssessmentRespList)) {//没有查询到未上报的数据
JSONObject json = new JSONObject();
json.put("columns", columnList);
json.put("datas", dataList);
return json;
}
//分样id列表 //分样id列表
List<Long> businessSubParentSampleIds = noReportSubParentSampleAssessmentRespList.stream().map(m -> m.getBusinessSubParentSampleId()).collect(Collectors.toList()); List<Long> businessSubParentSampleIds = noReportSubParentSampleAssessmentRespList.stream().map(m -> m.getBusinessSubParentSampleId()).collect(Collectors.toList());
//报送的检测项目数据 //报送的检测项目数据

1
zt-module-qms/zt-module-qms-server/src/main/resources/com/zt/plat/module/qms/business/bus/dal/mapper/BusinessSubParentSampleAssessmentProjectMapper.xml
View File

@@ -20,6 +20,7 @@
T_BSN_SB_PRN_SMP_ASMT tbspsa T_BSN_SB_PRN_SMP_ASMT tbspsa
LEFT JOIN T_CFG_ASY_MTHD tcam ON LEFT JOIN T_CFG_ASY_MTHD tcam ON
tbspsa.CFG_ASY_MTHD_ID = tcam.ID tbspsa.CFG_ASY_MTHD_ID = tcam.ID
AND tbspsa.TENANT_ID = tcam.TENANT_ID
WHERE WHERE
tbspsa.DELETED = 0 tbspsa.DELETED = 0
AND tbspsa.IS_RPOD = 0 AND tbspsa.IS_RPOD = 0