受理单调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QR0405_202402ReportOFData.java

@@ -125,7 +125,6 @@ public class QR0405_202402ReportOFData implements IDynamicOFData {
         result.put("equipNums", String.valueOf(equipBoilerDOS.size()));
 
         AtomicReference<Boolean> isDZGL = new AtomicReference<>(false);
-        JSONArray voList = new JSONArray();
         AtomicInteger number = new AtomicInteger(1);
         equipBoilerDOS.forEach(equipBoilerDO -> {
 
@@ -133,17 +132,15 @@ public class QR0405_202402ReportOFData implements IDynamicOFData {
                 isDZGL.set(true);
             }
 
-            JSONObject vo = new JSONObject();
-            //序号
-            vo.put("value1",String.valueOf(number.getAndIncrement()));
+            result.put("value1_" + number.get(), String.valueOf(number.get()));
             DictDataRespDTO boilerTypeDTO = dictDataApi.getDictData("system_equip_boiler_type",equipBoilerDO.getType().toString()).getData();
             if (boilerTypeDTO != null){
-                vo.put("value2",boilerTypeDTO.getLabel());
+                result.put("value2_" + number.get(), boilerTypeDTO.getLabel());
             }
-            vo.put("value3",equipBoilerDO.getFactoryCode());
-            vo.put("value4",equipBoilerDO.getUseRegisterNo());
-            vo.put("value5",equipBoilerDO.getEquipCode());
-            vo.put("value6","-");
+            result.put("value3_" + number.get(), equipBoilerDO.getFactoryCode());
+            result.put("value4_" + number.get(), equipBoilerDO.getUseRegisterNo());
+            result.put("value5_" + number.get(), equipBoilerDO.getEquipCode());
+            result.put("value6_" + number.get(), "-");
             if (taskOrderDO != null){
                 BoilerTaskOrderItemDO taskOrderItemDO = boilerTaskOrderItemMapper.selectOne(
                         new LambdaQueryWrapper<BoilerTaskOrderItemDO>()
@@ -151,14 +148,13 @@ public class QR0405_202402ReportOFData implements IDynamicOFData {
                                 .eq(BoilerTaskOrderItemDO::getOrderId, taskOrderDO.getId())
                 );
                 if (taskOrderItemDO != null){
-                    vo.put("value7",taskOrderItemDO.getFee());
+                    result.put("value7_" + number.get(), taskOrderItemDO.getFee());
                 }
             }
-            vo.put("value8","-");
-            voList.add(vo);
+            result.put("value8_" + number.get(), "-");
+            number.getAndIncrement();
 
         });
-        result.put("table",voList.toJSONString());
 
         if (isDZGL.get()){
             result.put("DZGL", "true");

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QR0413_0415ReportOFData.java

@@ -122,7 +122,6 @@ public class QR0413_0415ReportOFData implements IDynamicOFData {
 
         AtomicReference<Boolean> isIndustry = new AtomicReference<>(false);
         AtomicReference<Boolean> isPublic = new AtomicReference<>(false);
-        JSONArray voList = new JSONArray();
         AtomicInteger number = new AtomicInteger(1);
         equipPipeDOS.forEach(equipPipeDO -> {
 
@@ -132,17 +131,14 @@ public class QR0413_0415ReportOFData implements IDynamicOFData {
                 isPublic.set(true);
             }
 
-            JSONObject vo = new JSONObject();
-            //序号
-            vo.put("value1",String.valueOf(number.getAndIncrement()));
-            vo.put("value2",equipPipeDO.getCertificateNo());
-            vo.put("value3",equipPipeDO.getProjectNo());
-            vo.put("value4",equipPipeDO.getProjectName());
-            vo.put("value5","-");
-            voList.add(vo);
+            result.put("value1_" + number.get(), String.valueOf(number.get()));
+            result.put("value2_" + number.get(), equipPipeDO.getCertificateNo());
+            result.put("value3_" + number.get(), equipPipeDO.getProjectNo());
+            result.put("value4_" + number.get(), equipPipeDO.getProjectName());
+            result.put("value5_" + number.get(), "-");
+            number.getAndIncrement();
 
         });
-        result.put("table",voList.toJSONString());
 
         if (isIndustry.get()){
             result.put("GYGD", "true");