WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

车型库详情-状态导出-参数搜集进度管理

Browse Source
This commit is contained in:
zhn
2023-10-12 13:51:29 +08:00
parent b0f3ba8dc2
commit 4473a4cf04
3 changed files with 64 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/IProjectLibraryStatisticsService.java
+2
View File
@@ -84,4 +84,6 @@ public interface IProjectLibraryStatisticsService {
* @return
*/
Map<String, Object> getParameterCollectingStatisticsGroupByTerritory(List<ParamsCollectManifestEO> datas, Map<String, Object> params);
Map<String, Object> getParameterCollectingStatisticsGroupByTerritoryExport(List<ParamsCollectManifestEO> datas, Map<String, Object> params);
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+1 -1
View File
@@ -3515,7 +3515,7 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
* @param pcmEos
*/
private void exportParameterCollectingSetData(Map<String, Object> params, HSSFSheet sheet, int dataIndex, String key, List<ParamsCollectManifestEO> pcmEos) {
Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritory(pcmEos,params);
Map<String, Object> parameterCollectingMap = this.projectLibraryStatisticsService.getParameterCollectingStatisticsGroupByTerritoryExport(pcmEos,params);
Map<String, Object> notStartMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.NOT_START.getValue());
double notStartAmount = (double) notStartMap.get("amount");
Map<String, Object> collectingMap = (Map<String, Object>) parameterCollectingMap.get(CollectManifestStatisticsStateEnum.COLLECTING.getValue());
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryStatisticsServiceImpl.java
+61 -3
View File
@@ -776,7 +776,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
Map<String,Object> collectingMap = new HashMap<>();
Map<String,Object> submitMap = new HashMap<>();
Map<String,Object> syncReporMap = new HashMap<>();
//未发起
List<ParamsCollectManifestEO> notStartPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue())
@@ -787,7 +787,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
}).collect(Collectors.toList());
double notStartCount = (double) notStartPcmEoList.size();
notStartMap.put("amount",notStartCount);
//收集中
List<ParamsCollectManifestEO> collectingPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue())
@@ -799,7 +799,7 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
}).collect(Collectors.toList());
double collectingCount = (double) collectingPcmEoList.size();
collectingMap.put("amount",collectingCount);
//已提交
List<ParamsCollectManifestEO> submitPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue())
@@ -808,7 +808,65 @@ public class ProjectLibraryStatisticsServiceImpl implements IProjectLibraryStati
}).collect(Collectors.toList());
double submitCount = (double) submitPcmEoList.size();
submitMap.put("amount",submitCount);
//已同步至上报库
List<ParamsCollectManifestEO> syncReporPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue())
);
return flag;
}).collect(Collectors.toList());
double syncReporCount = (double) syncReporPcmEoList.size();
syncReporMap.put("amount",syncReporCount);
result.put(CollectManifestStatisticsStateEnum.NOT_START.getValue(),notStartMap);
result.put(CollectManifestStatisticsStateEnum.COLLECTING.getValue(),collectingMap);
result.put(CollectManifestStatisticsStateEnum.SUBMIT.getValue(),submitMap);
result.put(CollectManifestStatisticsStateEnum.SYNC_REPORT.getValue(),syncReporMap);
}
return result;
}
@Override
public Map<String, Object> getParameterCollectingStatisticsGroupByTerritoryExport(List<ParamsCollectManifestEO> datas, Map<String, Object> params) {
Map<String, Object> result = new HashMap<>();
if(CollectionUtils.isNotEmpty(datas)){
Map<String,Object> notStartMap = new HashMap<>();
Map<String,Object> collectingMap = new HashMap<>();
Map<String,Object> submitMap = new HashMap<>();
Map<String,Object> syncReporMap = new HashMap<>();
//未发起
List<ParamsCollectManifestEO> notStartPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_COLLECT.getValue())
|| StringUtils.equals(data.getState(), CollectManifestStateEnum.SDT_BACK.getValue())
// || StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
);
return flag;
}).collect(Collectors.toList());
double notStartCount = (double) notStartPcmEoList.size();
notStartMap.put("amount",notStartCount);
//收集中
List<ParamsCollectManifestEO> collectingPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.WAIT_FILL.getValue())
|| StringUtils.equals(data.getState(),CollectManifestStateEnum.WAIT_SDT.getValue())
|| StringUtils.equals(data.getState(),CollectManifestStateEnum.DRE_BACK.getValue())
|| StringUtils.equals(data.getState(),CollectManifestStateEnum.CERT_BACK.getValue())
);
return flag;
}).collect(Collectors.toList());
double collectingCount = (double) collectingPcmEoList.size();
collectingMap.put("amount",collectingCount);
//已提交
List<ParamsCollectManifestEO> submitPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.SUBMIT.getValue())
|| StringUtils.equals(data.getState(), CollectManifestStateEnum.CHANGE.getValue())
);
return flag;
}).collect(Collectors.toList());
double submitCount = (double) submitPcmEoList.size();
submitMap.put("amount",submitCount);
//已同步至上报库
List<ParamsCollectManifestEO> syncReporPcmEoList = datas.stream().filter(data -> {
boolean flag = (
StringUtils.equals(data.getState(), CollectManifestStateEnum.SYNC_REPORT.getValue())