Merge remote-tracking branch 'origin/master'

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotprojecttask/IotProjectTaskController.java

@@ -367,6 +367,18 @@ public class IotProjectTaskController {
                 }
             });
         }
+        // 找到任务对应的合同信息
+        Map<Long, String> projectPair = new HashMap<>();
+        List<Long> projectIds = convertList(pagedTasks, IotProjectTaskDO::getProjectId);
+        // 查询所有 项目信息
+        IotProjectInfoPageReqVO reqVO = new IotProjectInfoPageReqVO();
+        reqVO.setProjectIds(projectIds);
+        List<IotProjectInfoDO> projects = iotProjectInfoMapper.selectList(reqVO);
+        if (CollUtil.isNotEmpty(projects)) {
+            projects.forEach(project -> {
+                projectPair.put(project.getId(), project.getContractName());
+            });
+        }
         // 2. 拼接数据
         return BeanUtils.toBean(pagedTasks, IotProjectTaskRespVO.class, (taskVO) -> {
             // 拼接平台井信息
@@ -375,6 +387,8 @@ public class IotProjectTaskController {
             findAndThen(attachmentsPair, taskVO.getId(), attachmentRespS -> taskVO.setAttachments(attachmentRespS));
             // 任务已经完成的工作量
             findAndThen(taskFinishedWorkloadPair, taskVO.getId(), workloads -> taskVO.setItems(workloads));
+            // 设置任务的 合同信息
+            findAndThen(projectPair, taskVO.getProjectId(), projectName -> taskVO.setContractName(projectName));
         });
     }
 
@@ -507,8 +521,12 @@ public class IotProjectTaskController {
                 }
             }
         });
+        Map<Long, DeptDO> deptMap = new HashMap<>();
         // 查询当前分布任务关联的施工队伍信息
-        Map<Long, DeptDO> deptMap = deptService.getDeptMap(deptIds);
+        DataPermissionUtils.executeIgnore(() -> {
+            Map<Long, DeptDO> tempDeptMap = deptService.getDeptMap(deptIds);
+            deptMap.putAll(tempDeptMap);
+        });
         Map<Long, Long> projectDeptPair = new HashMap<>();
         if (CollUtil.isNotEmpty(projectIds)) {
             // 查询 任务 关联的项目信息

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/iotrhdailyreport/IotRhDailyReportController.java

@@ -964,7 +964,7 @@ public class IotRhDailyReportController {
             findAndThen(yearGasInjectionPair, reportVO.getDeptId(), gasInjection -> {
                 // 转换单位为 万方
                 BigDecimal gasInjectionWanFang = gasInjection
-                        .divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
+                        .divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP);
                 reportVO.setYearTotalGasInjection(gasInjectionWanFang);
             });
             // 队伍当年累计注水量
@@ -982,7 +982,7 @@ public class IotRhDailyReportController {
             findAndThen(wellGasInjectionPair, reportVO.getTaskId(), gasInjection -> {
                 // 转换单位为 万方
                 BigDecimal gasInjectionWanFang = gasInjection
-                        .divide(BigDecimal.valueOf(10000), 2, RoundingMode.HALF_UP);
+                        .divide(BigDecimal.valueOf(10000), 4, RoundingMode.HALF_UP);
                 reportVO.setWellTotalGasInjection(gasInjectionWanFang);
             });
             // 井当年累计注水量