|
|
@@ -1,15 +1,19 @@
|
|
|
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.boilertaskorder.BoilerTaskOrderDO;
|
|
|
import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderitem.BoilerTaskOrderItemDO;
|
|
|
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.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.service.dynamicOFData.IDynamicOFData;
|
|
|
import cn.start.tz.module.pressure2.service.dynamicOFData.util.AutoDataBoilerService;
|
|
|
import cn.start.tz.module.pressure2.service.dynamicOFData.util.GenerateReportJsonService;
|
|
|
+import cn.start.tz.module.system.api.user.AdminUserApi;
|
|
|
+import cn.start.tz.module.system.api.user.dto.AdminUserRespDTO;
|
|
|
import com.alibaba.fastjson2.JSONObject;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -35,6 +39,9 @@ public class QC10101_202401ReportOFData implements IDynamicOFData {
|
|
|
@Resource
|
|
|
private GenerateReportJsonService generateReportJsonService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private AdminUserApi adminUserApi;
|
|
|
+
|
|
|
@Override
|
|
|
public JSONObject getOFData(JSONObject params) {
|
|
|
return null;
|
|
|
@@ -57,10 +64,18 @@ public class QC10101_202401ReportOFData implements IDynamicOFData {
|
|
|
|
|
|
EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
|
|
|
if (equipBoilerDO != null) {
|
|
|
- result.put("factoryCode", equipBoilerDO.getFactoryCode());
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ //检验员信息
|
|
|
+ AdminUserRespDTO userInfo;
|
|
|
+ if (itemDO.getMainChecker() != null){
|
|
|
+ userInfo = adminUserApi.getUser(itemDO.getMainChecker()).getData();
|
|
|
+ if (userInfo != null){
|
|
|
+ result.put("checkName",userInfo.getSignUrl());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
- result.put("ownerUnit", ""); //产权使用单位
|
|
|
}
|
|
|
|
|
|
return result;
|