调整

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01006_202400OFData.java

@@ -103,8 +103,13 @@ public class QC01006_202400OFData implements IDynamicOFData {
                 // 填充签名
                 BoilerTaskOrderDO taskOrderDO = boilerTaskOrderService.getOne(new LambdaQueryWrapper<BoilerTaskOrderDO>().eq(BoilerTaskOrderDO::getId, itemReportDO.getOrderId()));
                 result.put("checkUnit", itemReportDO.getSignUrl());
-                AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getEnterId()).getCheckedData();
-                result.put("checkName", checkedData.getSignUrl());
+                if (itemReportDO.getEnterId() != null) {
+                    AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getEnterId()).getCheckedData();
+                    result.put("checkName", checkedData.getSignUrl());
+                } else {
+                    AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getEnterId()).getCheckedData();
+                    result.put("checkName", checkedData.getSignUrl());
+                }
 
                 String orderItemId = itemReportDO.getOrderItemId();
                 BoilerTaskOrderItemDO itemDO = boilerTaskOrderItemMapper.selectById(orderItemId);

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/comm/QC01007_202400OFData.java

@@ -111,8 +111,13 @@ public class QC01007_202400OFData implements IDynamicOFData {
                     result.put("checkUnit", signUrl.split(",")[0]);
                     result.put("checkUnitPerson", signUrl.split(",")[1]);
                 }
-                AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getEnterId()).getCheckedData();
-                result.put("checkName",checkedData.getSignUrl());
+                if (itemReportDO.getEnterId() != null) {
+                    AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getEnterId()).getCheckedData();
+                    result.put("checkName", checkedData.getSignUrl());
+                }else {
+                    AdminUserRespDTO checkedData = adminUserApi.getUser(itemReportDO.getCreator()).getCheckedData();
+                    result.put("checkName", checkedData.getSignUrl());
+                }
                 if (taskOrderDO != null){
                     result.put("checkDate",taskOrderDO.getCheckDate());
                 }

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/application-uat.yaml

@@ -135,7 +135,7 @@ tz:
   captcha:
     enable: false
   minio:
-     host: https://yudao-admin.hofo.co/dexdev/
+     host: http://192.168.19.190/cyjw/
      hostouter: https://tjt.gzsei.cn/app-api/dexdev/
   office:
     docservice:
@@ -168,6 +168,6 @@ synchronization:
   apiKey: cecb02cf8d1c7be3a05987d6acc6d913666d9cb72cc061039ffb19ecaead1bb9
   cron: 0 0 0 * * ?
 grapecity:
-  url: http://192.168.19.166:48011
+  url: http://192.168.19.190:48011
 app-auth:
   enabled: false

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equipboiler/EquipBoilerMapper.xml

@@ -13,7 +13,7 @@
         select rownum,a.* from (
         select id,unit_code,unit_name,equip_code,equip_street ,equip_district ,USE_REGISTER_NO,CONTACT,CONTACT_PHONE,USE_STATUS as status,
         TONNAGE,PRODUCT_CODE,MAX_CONTINUE_EVAPOR,NEXT_IN_CHECK_DATE,NEXT_OUT_CHECK_DATE,NEXT_PRESSURE_CHECK_DATE,BOILER_MODEL,
-        FACTORY_CODE,
+        FACTORY_CODE,eb.EQUIP_NAME,
         (select a.APPOINTMENT_DATE from PRESSURE_APPOINTMENT_CONFIRM_ORDER a
         left join PRESSURE2_BOILER_APPOINTMENT_CONFIRM_ORDER_ITEM b on a.ID = b.ORDER_ID
         where b.EQUIP_ID = eb.id and a.DELETED = 0 and b.DELETED = 0  and a.check_type = 100 limit 1) plan_in_check_date,