调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/synchronization/SynchronizationServiceImpl.java

@@ -317,11 +317,13 @@ public class SynchronizationServiceImpl implements SynchronizationService {
             Map<String, Object> map = new HashMap<>();
             map.put("NAME", name);
             map.put("FIELD0001", boilerTaskOrderItemReportDO.getReportNo().substring(2, 4));
-            BoilerTaskOrderItemDO boilerTaskOrderItemDO = boilerTaskOrderItemMapper.selectById(boilerTaskOrderItemReportDO.getOrderItemId());
-            String equipId = boilerTaskOrderItemDO.getEquipId();
-            EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(equipId);
-            DeptRespDTO data = deptApi.getDept(equipBoilerDO.getRelatedDepartment()).getCheckedData();
-            map.put("FIELD0003", !equipBoilerDO.getType().equals("1") && data.getName().equals("锅炉检验部") ? "1" : "0");
+            if (map.get("FIELD0001").equals("06")){
+                BoilerTaskOrderItemDO boilerTaskOrderItemDO = boilerTaskOrderItemMapper.selectById(boilerTaskOrderItemReportDO.getOrderItemId());
+                String equipId = boilerTaskOrderItemDO.getEquipId();
+                EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(equipId);
+                DeptRespDTO data = deptApi.getDept(equipBoilerDO.getRelatedDepartment()).getCheckedData();
+                map.put("FIELD0003", !equipBoilerDO.getType().equals("1") && data.getName().equals("锅炉检验部") ? "1" : "0");
+            }
             String result = getRequest("formmain_1650", map);
             JSONObject jsonObject = JSONObject.parseObject(result);
             return JSONArray.parseArray(jsonObject.getString("data"), SignatureDto.class);
@@ -331,19 +333,21 @@ public class SynchronizationServiceImpl implements SynchronizationService {
             Map<String, Object> map = new HashMap<>();
             map.put("NAME", name);
             map.put("FIELD0001", pipeTaskOrderItemReportDO.getReportNo().substring(2, 4));
-            PipeTaskOrderDO pipeTaskOrderDO = pipeTaskOrderMapper.selectById(pipeTaskOrderItemReportDO.getOrderId());
-            List<PipeTaskOrderItemDO> pipeTaskOrderItemDOS = pipeTaskOrderItemMapper.selectList(PipeTaskOrderItemDO::getOrderId, pipeTaskOrderDO.getId());
-            if (pipeTaskOrderItemDOS.isEmpty()){
-                return new ArrayList<>();
-            }
-            PipeTaskOrderItemDO pipeTaskOrderItemDO = pipeTaskOrderItemDOS.get(0);
-            List<PipeTaskOrderItemDetailDO> pipeTaskOrderItemDetailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, pipeTaskOrderItemDO.getOrderId());
-            if (pipeTaskOrderItemDetailDOS.isEmpty()){
-                return new ArrayList<>();
+            if (map.get("FIELD0001").equals("22")){
+                PipeTaskOrderDO pipeTaskOrderDO = pipeTaskOrderMapper.selectById(pipeTaskOrderItemReportDO.getOrderId());
+                List<PipeTaskOrderItemDO> pipeTaskOrderItemDOS = pipeTaskOrderItemMapper.selectList(PipeTaskOrderItemDO::getOrderId, pipeTaskOrderDO.getId());
+                if (pipeTaskOrderItemDOS.isEmpty()){
+                    return new ArrayList<>();
+                }
+                PipeTaskOrderItemDO pipeTaskOrderItemDO = pipeTaskOrderItemDOS.get(0);
+                List<PipeTaskOrderItemDetailDO> pipeTaskOrderItemDetailDOS = pipeTaskOrderItemDetailMapper.selectList(PipeTaskOrderItemDetailDO::getOrderId, pipeTaskOrderItemDO.getOrderId());
+                if (pipeTaskOrderItemDetailDOS.isEmpty()){
+                    return new ArrayList<>();
+                }
+                String equipId = pipeTaskOrderItemDetailDOS.get(0).getEquipDetailId();
+                EquipPipeDetailDO equipPipeDetailDO = equipPipeDetailMapper.selectById(equipId);
+                map.put("FIELD0003", equipPipeDetailDO.getPipeRegCode().startsWith("81") ? "1" : "0");
             }
-            String equipId = pipeTaskOrderItemDetailDOS.get(0).getEquipDetailId();
-            EquipPipeDetailDO equipPipeDetailDO = equipPipeDetailMapper.selectById(equipId);
-            map.put("FIELD0003", equipPipeDetailDO.getPipeRegCode().startsWith("81") ? "1" : "0");
             String data = getRequest("formmain_1650", map);
             JSONObject jsonObject = JSONObject.parseObject(data);
             return JSONArray.parseArray(jsonObject.getString("data"), SignatureDto.class);