diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java
index 30e9d7eed..4487a3877 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDictItemService.java
@@ -4,6 +4,7 @@ import com.jero.modules.system.entity.SysDictItem;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
+import java.util.Map;
/**
*
@@ -46,4 +47,12 @@ public interface ISysDictItemService extends IService {
* @return
*/
String disposeShowDictItemText(List sysDictItems,String fieldTexts,String cut,String dicCode);
+
+ /**
+ * 根据字典code获取一级数据字典
+ * @param dictCode
+ * @param sysDictItems
+ * @return
+ */
+ Map> getFirstLevelSysDictItemByDictCode(String dictCode,List sysDictItems);
}
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
index dc1122fe6..f0a7f27b6 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.constant.CommonConstant;
import com.jero.common.constant.enums.CutEnum;
+import com.jero.modules.enums.DictCodeEnum;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.mapper.SysDictItemMapper;
import com.jero.modules.system.service.ISysDictItemService;
@@ -13,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -231,4 +234,27 @@ public class SysDictItemServiceImpl extends ServiceImpl> getFirstLevelSysDictItemByDictCode(String dictCode,List sysDictItems) {
+ List sysDictItemByDictCode = sysDictItems.stream().filter(sysDict -> {
+ boolean flag = false;
+ if (StringUtils.equals(sysDict.getDictCode(), dictCode)) {
+ flag = true;
+ }
+ return flag;
+ }).collect(Collectors.toList());
+
+ Map> result = null;
+ if(CollectionUtils.isNotEmpty(sysDictItemByDictCode)){
+ result = sysDictItems.stream().filter(sysDict -> {
+ boolean flag = false;
+ if (StringUtils.isNotEmpty(sysDict.getStatNode())) {
+ flag = true;
+ }
+ return flag;
+ }).collect(Collectors.groupingBy(SysDictItem::getStatNode));
+ }
+ return result;
+ }
}
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
index c440e0b3c..548ac6a32 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/enums/OperatorTypeEnum.java
@@ -38,6 +38,8 @@ public enum OperatorTypeEnum {
QUERY_PREHOMO_STATISTICS("查询prehomo统计","queryPrehomoStatistics"),
QUERY_VERIFY_STATISTICS("查询验证符合性统计","queryVerifyStatistics"),
QUERY_CERTIFICATION_PROGRESS_STATISTICS("查询认证进度统计","queryCertificationProgressStatistics"),
+ QUERY_FG_TASK_TO_CONFIRM_STATISTICS("查询法规任务确认统计","queryFGTaskToConfirmStatistics"),
+ QUERY_RZ_TASK_TO_CONFIRM_STATISTICS("查询认证任务确认统计","queryRZTaskToConfirmStatistics"),
ADD_LAWS_OPINION_GATHER("添加法规意见收集数据","addLawsOpinionGather"),
UPDATE_LAWS_OPINION_GATHER_GATHER_RESULT("更新法规意见收集数据收集结果","updateLawsOpinionGatherGatherResult"),
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
new file mode 100644
index 000000000..66059e1bd
--- /dev/null
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
@@ -0,0 +1,35 @@
+package com.jero.modules.project.service;
+
+import com.jero.modules.project.entity.ProjectLawsInventoryEO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目库统计service
+ */
+public interface IProjectLibraryStatisticsService {
+
+ /**
+ * 获取法规清单-任务确认统计信息-根据责任领域分组
+ * @param datas
+ * @return
+ */
+ Map getFGTaskToConfirmStatisticsGroupByTerritory(List datas, Map params);
+
+ /**
+ * 获取设计符合性确认流程统计信息-根据责任领域分组
+ * @param datas
+ * @param params
+ * @return
+ */
+ Map getDesignComplianceStatisticeGroupByTerritory(List datas, Map params);
+
+ /**
+ * 获取验证符合性确认流程统计信息-根据责任领域分组
+ * @param datas
+ * @param params
+ * @return
+ */
+ Map getVerifyComplianceStatisticeGroupByTerritory(List datas, Map params);
+}
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 b37caf6b3..a0dfbaf18 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
@@ -165,6 +165,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>();
lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getProjectLibraryId,projectLibraryId);
- lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getInventoryAffirmStatus, InventoryAffirmStatusEnum.ACCEPTED.getValue());
- lawsInventoryEOQueryWrapper.lambda().eq(ProjectLawsInventoryEO::getTaskAffirmStatus, TaskAffirmStatusEnum.ACCEPTED.getValue());
List projectLawsInventoryEOList = projectLawsInventoryEOMapper.selectList(lawsInventoryEOQueryWrapper);
- List projectLawsInventoryIdList = projectLawsInventoryEOList.stream().distinct().map(ProjectLawsInventoryEO::getId).collect(Collectors.toList());
- if(StringUtils.equals(OperatorTypeEnum.QUERY_CURRENT_PROJECT_STATUS_STATISTICS.getValue(),operatorType)){
- params.put("projectLawsInventoryIdList",projectLawsInventoryIdList);
- List