报表调整

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

@@ -8,10 +8,12 @@ import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitemreport.Boi
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbcol.DynamicTbColDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbins.DynamicTbInsDO;
 import cn.start.tz.module.pressure2.dal.dataobject.dynamictbval.DynamicTbValDO;
+import cn.start.tz.module.pressure2.dal.dataobject.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserDO;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorder.BoilerTaskOrderMapper;
 import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderitem.BoilerTaskOrderItemMapper;
 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.dal.mysql.pipetaskorderitemreportuser.PipeTaskOrderItemReportUserMapper;
 import cn.start.tz.module.pressure2.service.dynamicOFData.IDynamicOFData;
 import cn.start.tz.module.pressure2.service.dynamictbins.DynamicTbInsService;
 import cn.start.tz.module.system.api.user.AdminUserApi;
@@ -41,6 +43,9 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
     @Resource
     private BoilerTaskOrderItemMapper boilerTaskOrderItemMapper;
 
+    @Resource
+    private PipeTaskOrderItemReportUserMapper pipeTaskOrderItemReportUserMapper;
+
     @Resource
     private DynamicTbInsService dynamicTbInsService;
 
@@ -61,7 +66,7 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
         //设备报表ID
         String refId = ruleVO.getRefId();
         //检验员ID
-        String checkUserId = ruleVO.getParams().getString("checkUserId");
+        //String checkUserId = ruleVO.getParams().getString("checkUserId");
 
         JSONObject result = new JSONObject();
         BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
@@ -133,10 +138,13 @@ public class QC10098_202400RecordOFData implements IDynamicOFData {
             if (taskOrderDO != null){
                 result.put("checkDate",taskOrderDO.getCheckDate().format(dateFormat));
             }
-            AdminUserRespDTO userInfo = adminUserApi.getUser(checkUserId).getData();
-            if (userInfo != null){
+            AdminUserRespDTO userInfo = new AdminUserRespDTO();
+            if (itemDO.getMainChecker() != null){
+                userInfo = adminUserApi.getUser(itemDO.getMainChecker()).getData();
+                if (userInfo != null){
 //                result.put("checkName",userInfo.getNickname());
-                result.put("checkName",userInfo.getSignUrl());
+                    result.put("checkName",userInfo.getSignUrl());
+                }
             }
 
             //校验人员信息