导出-委托单进展统计

cement-business/src/main/java/cn/wise/sc/cement/business/mapper/xml/DataStatisticsMapper.xml

@@ -166,7 +166,7 @@
         left join project p on p.id = e.project_id
         left join client c on c.id = e.client_id
         left join sys_user su on su.id = e.user_id
-        where e.status != 0 and e.project_type is not null
+        where e.status != 0   and e.status < 9  and e.project_type is not null
         <if test="params.clientId != null">
             and e.clientId = #{clientId}
         </if>
@@ -261,7 +261,7 @@
         left join client c on c.id = e.client_id
         left join sys_user su on su.id = e.user_id
         ,(select @i:=0)aa
-        where e.status != 0 and e.project_type is not null
+        where e.status != 0  and e.status &lt; 9  and e.project_type is not null
         <if test="params.clientId != null">
             and e.clientId = #{clientId}
         </if>

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/DataStatisticsServiceImpl.java

@@ -399,11 +399,13 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
 		QueryWrapper<Sample> queryWrapper = new QueryWrapper<>();
 		queryWrapper.in("entrust_id", queryList);
 		List<Sample> sampleList = sampleService.list(queryWrapper);
+		List<Integer> sampleIdList = sampleList.stream().filter(x -> x.getCementCode().equals(x.getParallelCode())).map(Sample::getId).collect(Collectors.toList());
 		//4.查询所有的派发检测项
 		QueryWrapper<SampleDistribution> sdqueryWrapper = new QueryWrapper<>();
 		sdqueryWrapper.in("entrust_id", queryList);
-		sdqueryWrapper.in("sample_id", sampleList.stream().filter(x -> x.getCementCode().equals(x.getParallelCode())).map(Sample::getId).collect(Collectors.toList()));
+		sdqueryWrapper.in("sample_id", sampleIdList);
 		List<SampleDistribution> sampleDistributions = sampleDistributionService.list(sdqueryWrapper);
+
 		//5.分组并统计
 		Map<Integer, List<SampleDistribution>> groupByEntrustId = sampleDistributions.stream().collect(Collectors.groupingBy(SampleDistribution::getEntrustId, Collectors.toList()));
 		//6.开始填充数据。首先填充表头
@@ -432,28 +434,28 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
 		//填充数据,从第二行开始
 		int rownum = 2;
 		for (int j = 0; j < entrustList.size(); j++) {
-
 			Map<String, Object> entrust = entrustList.get(j);
 			int entrustId = Integer.parseInt(entrust.get("entrustId").toString());
-			if (groupByEntrustId.get(entrustId) != null) {
-				XSSFRow row0 = sheet.createRow(rownum++);
-				Map<Integer, List<SampleDistribution>> sampleDistribuGroup = groupByEntrustId.get(entrustId).stream().collect(Collectors.groupingBy(SampleDistribution::getTeamId, Collectors.toList()));
-				//处理委托人信息表头
-				for (int i = 0; i < infoHeader.size(); i++) {
-					XSSFCell tempCell = row0.createCell(i);
-					if(infoHeader.get(i).equals("实际产值")){
-						Double outPutValue = sampleList
-								.stream()
-								.filter(x -> x.getCementCode().equals(x.getParallelCode()) && x.getEntrustId() == entrustId )
-								.mapToDouble(item -> item.getOutputValue().doubleValue()).sum();
-						tempCell.setCellValue(outPutValue == null ? "" : outPutValue.toString());
-						tempCell.setCellStyle(style);
-					}else{
-						tempCell.setCellValue(entrust.get(infoHeader.get(i)) == null ? "" : entrust.get(infoHeader.get(i)).toString());
-						tempCell.setCellStyle(style);
-					}
+			//只要评审通过的单子 都可以导出
+			XSSFRow row0 = sheet.createRow(rownum++);
+			//处理委托人信息表头
+			for (int i = 0; i < infoHeader.size(); i++) {
+				XSSFCell tempCell = row0.createCell(i);
+				if(infoHeader.get(i).equals("实际产值")){
+					Double outPutValue = sampleList
+							.stream()
+							.filter(x -> x.getCementCode().equals(x.getParallelCode()) && x.getEntrustId() == entrustId )
+							.mapToDouble(item -> item.getOutputValue().doubleValue()).sum();
+					tempCell.setCellValue(outPutValue == null ? "" : outPutValue.toString());
+					tempCell.setCellStyle(style);
+				}else{
+					tempCell.setCellValue(entrust.get(infoHeader.get(i)) == null ? "" : entrust.get(infoHeader.get(i)).toString());
+					tempCell.setCellStyle(style);
 				}
+			}
 
+			if (groupByEntrustId.get(entrustId) != null) {
+				Map<Integer, List<SampleDistribution>> sampleDistribuGroup = groupByEntrustId.get(entrustId).stream().collect(Collectors.groupingBy(SampleDistribution::getTeamId, Collectors.toList()));
 				//处理检测项总产值表头
 				for (int i = infoHeader.size(); i < teamList.size() + infoHeader.size(); i++) {
 					XSSFCell tempCell = row0.createCell(i);
@@ -479,6 +481,7 @@ public class DataStatisticsServiceImpl implements IDataStatisticsService {
 					tempCell2.setCellStyle(style);
 				}
 			}
+
 		}
 		ExcelUtil.excelExportNew(fileName == null || fileName.trim().length() <= 0 ? "委托单进展统计" : fileName, wb, response);