Ver código fonte

报表调整

xy 3 semanas atrás
pai
commit
e7afc377b7

+ 15 - 2
tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/boiler/QC10103_202400ReportOFData.java

@@ -2,9 +2,11 @@ package cn.start.tz.module.pressure2.service.dynamicOFData.boiler;
 
 import cn.start.tz.module.pressure2.controller.admin.dynamictbins.vo.CreateInstantiateWithRuleVO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitempart.BoilerTaskOrderItemPartDO;
 import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
 import cn.start.tz.module.pressure2.dal.dataobject.equipboiler.EquipBoilerDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitempart.BoilerTaskOrderItemPartMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
 import cn.start.tz.module.pressure2.dal.mysql.equipboiler.EquipBoilerMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
@@ -35,6 +37,9 @@ public class QC10103_202400ReportOFData implements IDynamicOFData {
     @Resource
     private GenerateReportJsonService generateReportJsonService;
 
+    @Resource
+    private BoilerTaskOrderItemPartMapper boilerTaskOrderItemPartMapper;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -57,10 +62,18 @@ public class QC10103_202400ReportOFData implements IDynamicOFData {
 
             EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
             if (equipBoilerDO != null) {
-                result.put("factoryCode", equipBoilerDO.getFactoryCode());
+
+            }
+
+            if (itemReportDO.getItemPartId() != null){
+
+                BoilerTaskOrderItemPartDO itemPartDO = boilerTaskOrderItemPartMapper.selectById(itemReportDO.getItemPartId());
+                if (itemPartDO != null){
+                    result.put("sh1_val_1", itemPartDO.getPartName());
+                }
+
             }
 
-            result.put("ownerUnit", ""); //产权使用单位
         }
 
         return result;