diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
index 1a3038c6b..333452acb 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/mapper/xml/ProjectLawsInventoryEOMapper.xml
@@ -55,7 +55,10 @@
from
project_laws_inventory
where
- project_library_id = #{projectLibraryId}
+ project_library_id in
+
+ #{item}
+
group by inventory_affirm_status
@@ -67,7 +70,10 @@
from
project_laws_inventory
where
- project_library_id = #{projectLibraryId}
+ project_library_id in
+
+ #{item}
+
group by task_affirm_status
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index c6624ebb8..9d42fd017 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -699,7 +699,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>();
- lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,id);
+ lawsInventoryEOQueryWrapper.lambda().in(ProjectLawsInventoryEO::getProjectLibraryId,Arrays.asList(id.split(",")));
//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
//lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
@@ -780,6 +780,117 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl getProjectDetailsStatistics(String id) {
+// Map result = new HashMap<>();
+//
+// //当前项目状态
+// Map currentProjectStatusMap = new HashMap<>();
+// //清单确认
+// Map listingToConfirmMap = new HashMap<>();
+// //任务确认
+// Map taskToConfirmMap = new HashMap<>();
+// //设计符合性
+// Map designComplianceMap = new HashMap<>();
+// //prehomo确认
+// Map prehomoMap = new HashMap<>();
+// //验证符合性
+// Map verifyComplianceMap = new HashMap<>();
+// //认证进度
+// Map certificationProgressMap = new HashMap<>();
+//
+// //清单确认统计
+// List