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-17 10:00:15 +08:00
parent dddf21c94f
commit 24a6e95f26
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,7 +190,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
//处理数据 //处理数据
List<Map<String, Object>> datas = new ArrayList<>(); List<Map<String, Object>> datas = new ArrayList<>();
for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) { for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) {
BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null); BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskDataDO.getId())).findFirst().orElse(null);
Map<String, Object> map = new HashedMap<>(); Map<String, Object> map = new HashedMap<>();
map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId()); map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId());
@@ -448,7 +448,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
//处理数据 //处理数据
List<Map<String, Object>> datas = new ArrayList<>(); List<Map<String, Object>> datas = new ArrayList<>();
for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) { for (BusinessAssayTaskDataDO businessAssayTaskDataDO : businessAssayTaskDataList) {
BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getSampleId().equals(businessAssayTaskDataDO.getBusinessSubSampleId())).findFirst().orElse(null); BusinessAssayTaskDetailDO businessAssayTaskDetailDO = businessAssayTaskDetailList.stream().filter(f -> f.getBusinessAssayTaskDataId().equals(businessAssayTaskDataDO.getId())).findFirst().orElse(null);
Map<String, Object> map = new HashedMap<>(); Map<String, Object> map = new HashedMap<>();
map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId()); map.put("businessAssayTaskDataId", businessAssayTaskDataDO.getId());
@@ -875,6 +875,10 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
JSONObject resultJsonObject = new JSONObject(); JSONObject resultJsonObject = new JSONObject();
BusinessAssayTaskDataExtendRespVO businessAssayTaskData = businessAssayTaskDataMapper.selectExtendRespById(businessAssayTaskDataId); BusinessAssayTaskDataExtendRespVO businessAssayTaskData = businessAssayTaskDataMapper.selectExtendRespById(businessAssayTaskDataId);
if (businessAssayTaskData == null) {
throw new ServiceException(1_032_100_000, "未找到检测任务业务数据，请检查参数是否正确");
}
resultJsonObject = (JSONObject) JSON.toJSON(businessAssayTaskData); resultJsonObject = (JSONObject) JSON.toJSON(businessAssayTaskData);
List<Map<String, Object>> columns = new ArrayList<>(); List<Map<String, Object>> columns = new ArrayList<>();
@@ -916,7 +920,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByIds(req.getIdList()); List<BusinessAssayTaskDetailDO> businessAssayTaskDetailList = businessAssayTaskDetailMapper.selectByIds(req.getIdList());
for (BusinessAssayTaskDetailDO businessAssayTaskDetailDO : businessAssayTaskDetailList) { for (BusinessAssayTaskDetailDO businessAssayTaskDetailDO : businessAssayTaskDetailList) {
businessAssayTaskDetailDO.setRollbackStatus("confirmed_return"); businessAssayTaskDetailDO.setRollbackStatus("returned");
businessAssayTaskDetailDO.setRemark(req.getBackDesc()); businessAssayTaskDetailDO.setRemark(req.getBackDesc());
} }