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

处理空白样样品编号为null导致bug

Browse Source
This commit is contained in:
王兴荣
2025-11-10 18:16:48 +08:00
parent 3afd68cbfe
commit d9d63ab587
2 changed files with 5 additions and 5 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/SampleAnalysisServiceImpl.java
View File

@@ -272,7 +272,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
// String key = entry.getKey(); // String key = entry.getKey();
Object val = entry.getValue(); Object val = entry.getValue();
if (val instanceof String) { if (val instanceof String || val == null) {
continue; continue;
} }
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class); BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class);
@@ -635,7 +635,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>(); List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
Object val = entry.getValue(); Object val = entry.getValue();
if (val instanceof String) { if (val instanceof String || val == null) {
continue; continue;
} }
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class); BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class);
@@ -717,7 +717,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>(); List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
Object val = entry.getValue(); Object val = entry.getValue();
if (val instanceof String) { if (val instanceof String || val == null) {
continue; continue;
} }
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class); BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class);
@@ -796,7 +796,7 @@ public class SampleAnalysisServiceImpl implements SampleAnalysisService {
List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>(); List<BusinessAssayProjectAndParameterRespVO> listBusinessAssayProjectAndParameter = new ArrayList<>();
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
Object val = entry.getValue(); Object val = entry.getValue();
if (val instanceof String) { if (val instanceof String || val == null) {
continue; continue;
} }
BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class); BusinessAssayProjectAndParameterRespVO businessAssayProjectAndParameter = JSON.parseObject(JSON.toJSONString(val), BusinessAssayProjectAndParameterRespVO.class);

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

@@ -124,7 +124,7 @@ public class SampleEntrustServiceImpl implements SampleEntrustService {
} }
result.put("sampleEntrustRegistration", jsonArray); result.put("sampleEntrustRegistration", jsonArray);
result.put("sampleEntrustDetail", businessSampleEntrustDetailExtendRespVO); result.put("sampleEntrustDetail", sampleEntrustDetailExtendRespVOList);
return result; return result;
} }