|
|
@@ -3,17 +3,25 @@ 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.boilertaskorderitemreport.BoilerTaskOrderItemReportDO;
|
|
|
+import cn.start.tz.module.pressure2.dal.dataobject.boilertaskorderuser.BoilerTaskOrderUserDO;
|
|
|
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.boilertaskorderitemreport.BoilerTaskOrderItemReportMapper;
|
|
|
+import cn.start.tz.module.pressure2.dal.mysql.boilertaskorderuser.BoilerTaskOrderUserMapper;
|
|
|
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;
|
|
|
|
|
|
+import java.util.List;
|
|
|
+import java.util.Objects;
|
|
|
+import java.util.stream.Collectors;
|
|
|
+
|
|
|
/**
|
|
|
* 电站锅炉内部检验结论报告
|
|
|
*/
|
|
|
@@ -35,6 +43,12 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
|
|
|
@Resource
|
|
|
private GenerateReportJsonService generateReportJsonService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private BoilerTaskOrderUserMapper boilerTaskOrderUserMapper;
|
|
|
+
|
|
|
+ @Resource
|
|
|
+ private AdminUserApi adminUserApi;
|
|
|
+
|
|
|
@Override
|
|
|
public JSONObject getOFData(JSONObject params) {
|
|
|
return null;
|
|
|
@@ -60,6 +74,19 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
|
|
|
result.put("factoryCode", equipBoilerDO.getFactoryCode());
|
|
|
}
|
|
|
|
|
|
+ List<BoilerTaskOrderUserDO> checkUserList = boilerTaskOrderUserMapper.selectList(BoilerTaskOrderUserDO::getOrderId,itemReportDO.getOrderId());
|
|
|
+ if (!checkUserList.isEmpty()){
|
|
|
+ List<AdminUserRespDTO> userList = adminUserApi.getUserList(checkUserList.stream().map(BoilerTaskOrderUserDO::getUserId).toList()).getData();
|
|
|
+ if (!userList.isEmpty()){
|
|
|
+ String checkNames = userList.stream()
|
|
|
+ .map(AdminUserRespDTO::getSignUrl)
|
|
|
+ .filter(Objects::nonNull) // 过滤掉null值
|
|
|
+ .filter(signUrl -> !signUrl.isEmpty()) // 过滤掉空字符串
|
|
|
+ .collect(Collectors.joining(","));
|
|
|
+ result.put("checkNames",checkNames);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
result.put("ownerUnit", ""); //产权使用单位
|
|
|
}
|
|
|
|