refeat(jyjc): 报检规则4.0开发

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java

@@ -835,7 +835,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         LambdaQueryWrapper<JyjcOpeningApplication> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JyjcOpeningApplication::getUnitCode, applicationModel.getInspectionUnitCode());
         queryWrapper.eq(JyjcOpeningApplication::getStatus, FlowStatusEnum.TO_BE_FINISHED.getName());
-        queryWrapper.select(JyjcOpeningApplication::getResultType, BaseEntity::getSequenceNbr);
+        queryWrapper.select(JyjcOpeningApplication::getResultType, BaseEntity::getSequenceNbr,JyjcOpeningApplication::getDockingUnitCode);
         queryWrapper.orderByDesc(JyjcOpeningApplication::getRecDate);
         queryWrapper.last("limit 1");
         List<JyjcOpeningApplication> applicationList = jyjcOpeningApplicationService.list(queryWrapper);
@@ -1365,7 +1365,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
 
     private void replaceNull2EmptyString(JSONObject dto2) {
         dto2.forEach((k,v)->{
-            if(v == null){
+            if(v == null || "null".equals(v)){
                 dto2.put(k,"");
             }
         });
@@ -1528,6 +1528,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                     dto2.put(EQU_STATE, status);
                 }
                 dto2.put("record", dto2.get(SEQUENCE_NBR));
+                replaceNull2EmptyString(dto2);
                 list.add(dto2);
             }
             // 填充地址

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionResultServiceImpl.java

@@ -217,6 +217,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
             }
             v.setSourceResult(ResultTypeEnum.getNameByCode(v.getResultType()));
             v.setIdentity(identity);
+            v.setUseInnerCode("null".equals(v.getUseInnerCode()) ? ""  : v.getUseInnerCode());
         });
         return resultPage;
     }