报表调整

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

@@ -12,12 +12,15 @@ 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.clientunit.ClientUnitApi;
+import cn.start.tz.module.system.api.clientunit.dto.ClientUnitDTO;
 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.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -49,6 +52,9 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
     @Resource
     private AdminUserApi adminUserApi;
 
+    @Resource
+    private ClientUnitApi clientUnitApi;
+
     @Override
     public JSONObject getOFData(JSONObject params) {
         return null;
@@ -56,9 +62,12 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
 
     @Override
     public JSONObject getOfDataByVO(CreateInstantiateWithRuleVO ruleVO) {
+
         //设备报表ID
         String refId = ruleVO.getRefId();
 
+        DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
+
         JSONObject result = new JSONObject();
         BoilerTaskOrderItemReportDO itemReportDO = boilerTaskOrderItemReportMapper.selectById(refId);
 
@@ -71,23 +80,23 @@ public class QC10038_202401ReportOFData implements IDynamicOFData {
 
             EquipBoilerDO equipBoilerDO = equipBoilerMapper.selectById(itemDO.getEquipId());
             if (equipBoilerDO != null) {
-                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);
+                //企业信息
+                if (equipBoilerDO.getUnitCode() != null){
+                    ClientUnitDTO clientUnit = clientUnitApi.getClientUnitByCode(equipBoilerDO.getUnitCode()).getData();
+                    if (clientUnit !=  null){
+                        result.put("socialCreditCode", clientUnit.getSocialCreditCode());
+                        result.put("unitContact", clientUnit.getContact());
+                        result.put("unitContactPhone", clientUnit.getTel());
+                    }
                 }
+
+            }
+
+            if (itemDO.getEndCheckDate() != null){
+                result.put("checkDate2", itemDO.getEndCheckDate().format(dateFormat));
             }
 
-            result.put("ownerUnit", ""); //产权使用单位
         }
 
         return result;

tz-module-pressure2/tz-module-pressure2-biz/src/main/java/cn/start/tz/module/pressure2/service/dynamicOFData/pipe/QC12024_202403JRecordOFData.java

@@ -138,8 +138,8 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
                     List<EquipPipeDetailDO> equipPipeDetailDOList = equipPipeDetailMapper.selectList(new LambdaQueryWrapper<EquipPipeDetailDO>().in(EquipPipeDetailDO::getId, allDetailDOS.stream().map(PipeTaskOrderItemDetailDO::getEquipDetailId).toList()));
                     double sum = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getPipeLength() != null ? equipPipeDetailDO.getPipeLength().doubleValue() : 0.0).sum();
                     double sum1 = equipPipeDetailDOList.stream().mapToDouble(equipPipeDetailDO -> equipPipeDetailDO.getUndergroundLength() != null ? equipPipeDetailDO.getUndergroundLength().doubleValue() : 0.0).sum();
-                    result.put("pipeLengthTotal", String.valueOf(sum));
-                    result.put("undergroundLength", String.valueOf(sum1));
+                    result.put("pipeLengthTotal", formatNumber(sum));
+                    result.put("undergroundLength", formatNumber(sum1));
                 }
 
                 //获取约检管线
@@ -228,4 +228,17 @@ public class QC12024_202403JRecordOFData implements IDynamicOFData {
 
         return result;
     }
+
+    /**
+     * 格式化数字：小数为0时显示整数，否则保留1位小数
+     * @param value 需要格式化的数值
+     * @return 格式化后的字符串
+     */
+    private String formatNumber(double value) {
+        if (value == (long) value) {
+            return String.valueOf((long) value);
+        } else {
+            return String.format("%.1f", value);
+        }
+    }
 }