检测报告导出 优化 20210510 客户提出的问题

cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java

@@ -85,8 +85,9 @@ public class ReportController {
         beanParams.put("sender", rts.getSender());
         beanParams.put("sendDate", rts.getSendDate());
         beanParams.put("sampleNum", rts.getSampleNum());
-        beanParams.put("sampleNames", set2String(rts.getSampleNames()));
-        beanParams.put("teamNames", set2String(rts.getTeamNames()));
+        beanParams.put("sampleNames", List2String(rts.getSampleNames()));
+        beanParams.put("sampleNamesD", List2StringD(rts.getSampleNames()));
+        beanParams.put("teamNames", List2String(rts.getTeamNames()));
         beanParams.put("projectName", rts.getProjectName());
         beanParams.put("printDate", rts.getPrintDate());
 
@@ -95,9 +96,10 @@ public class ReportController {
         beanParams.put("day", DateUtil.dayOfMonth(DateUtil.date()));
         beanParams.put("reportNo", StrUtil.isEmpty(rts.getReportNo()) ? "" : rts.getReportNo());
 
-        beanParams.put("firstMethodName", getFirstSet(rts.getMethodNames()));
+        beanParams.put("firstMethodName", getFirstList(rts.getMethodNames()));
+        beanParams.put("methodNames", moveFirstList(rts.getMethodNames()));
+
         beanParams.put("firstEquipment", getFirstSet(rts.getEquipmentNames()));
-        beanParams.put("methodNames", moveFirst(rts.getMethodNames()));
         beanParams.put("equipmentNames", moveFirst(rts.getEquipmentNames()));
 
         //十元素1导出
@@ -127,7 +129,36 @@ public class ReportController {
 
     }
 
+    //检测依据 第一条记录
+    private String getFirstList(List<String> list) {
+        if(list != null && list.size()>0){
+            Iterator<String> iterator = list.iterator();
+            if (iterator.hasNext()) {
+                return iterator.next();
+            }
+        }
+        return "";
+    }
+
+    //检测依据 第一条之外的记录
+    private static List<String> moveFirstList(List<String> list) {
+        if(list != null && list.size()>0){
+            List<String> newSet = new ArrayList<>(list.size());
+            Iterator<String> iterator = list.iterator();
+            if (iterator.hasNext()) {
+                String next = iterator.next();
+                newSet.addAll(list);
+                newSet.remove(next);
+                return newSet;
+            }
+        }
+        return null;
+    }
+
 
+
+
+    //设备第一条记录
     private String getFirstSet(Set<String> set) {
         if(set != null && set.size()>0){
             Iterator<String> iterator = set.iterator();
@@ -135,10 +166,9 @@ public class ReportController {
                 return iterator.next();
             }
         }
-
         return "";
     }
-
+    //设备除第一条之外的记录
     private static Set<String> moveFirst(Set<String> set) {
         if(set != null && set.size()>0){
             Set<String> newSet = new HashSet<>(set.size());
@@ -153,13 +183,38 @@ public class ReportController {
         return null;
     }
 
-    private String set2String(Set<String> source) {
+
+    //首页 样品名称和检测项名称 转字符串
+    private String List2String(List<String> source) {
         if (source.size() == 0) {
             return "";
         }
         StringBuilder strBuilder = new StringBuilder();
+        int i=0;
         for (String target : source) {
             strBuilder.append("、").append(target);
+
+        }
+        return strBuilder.replace(0, 1, "").toString();
+    }
+
+    //封面的样品名称 转字符串 只显示前两个即可
+    private String List2StringD(List<String> source) {
+        if (source.size() == 0) {
+            return "";
+        }
+        StringBuilder strBuilder = new StringBuilder();
+        int i=0;
+        //2021.05.10 样品名称应该从委托单的第一个样品开始，最多两个即可，例如生料1、生料1-1等，用“等”字代替
+        for (String target : source) {
+            if(i<2){
+                strBuilder.append("、").append(target);
+            }else if(i == 2){
+                strBuilder.append(" 等");
+            }else{
+                break;
+            }
+            i = i+1;
         }
         return strBuilder.replace(0, 1, "").toString();
     }

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

@@ -16,6 +16,7 @@
             #{teamNames}
         </foreach>
         group by s.id, sdc.id,t.name
+        order by s.id asc
     </select>
 
     <select id="getSampleIndustrialCheck" resultType="cn.wise.sc.cement.business.model.vo.IndustrialReport">

cement-business/src/main/java/cn/wise/sc/cement/business/model/ReportDetailVo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 import java.util.Set;
 
 /**
@@ -29,13 +30,13 @@ public class ReportDetailVo implements Serializable {
 	@ApiModelProperty("样品数量")
 	private Integer sampleNum;
 	@ApiModelProperty("样品名称")
-	private Set<String> sampleNames;
+	private List<String> sampleNames;
 	@ApiModelProperty("检测类别")
 	private String type = "委托";
 	@ApiModelProperty("检测项目")
-	private Set<String> teamNames;
+	private List<String> teamNames;
 	@ApiModelProperty("检测依据")
-	private Set<String> methodNames;
+	private List<String> methodNames;
 	@ApiModelProperty("主要仪器设备(编号)")
 	private Set<String> equipmentNames;
 	@ApiModelProperty("项目名称")

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

@@ -5153,9 +5153,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 					methods.forEach(opt -> {
 						if (idStr.equals(opt.getNumber())) {
 							if (StrUtil.isBlank(arg.getMethodName())) {
-								arg.setMethodName(opt.getName() + "  " + opt.getStandard());
+								arg.setMethodName(opt.getStandard() + "  " + opt.getName());
 							} else {
-								arg.setMethodName(arg.getMethodName() + "、" + opt.getName() + "  " + opt.getStandard());
+								arg.setMethodName(arg.getMethodName() + "~~~、" + opt.getStandard() + "  " + opt.getName());
 							}
 						}
 					});
@@ -5174,6 +5174,121 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		return null;
 	}
 
+
+	/**
+	 * 根据样品检测列表获取报告管理首页
+	 *
+	 * @param source 样品检测
+	 * @return ReportDetailVo
+	 */
+	private ReportDetailVo initReportDetailVo(List<EntrustReport> source) {
+
+		if (source.size() == 0) {
+			return null;
+		}
+
+		ReportDetailVo rts = new ReportDetailVo();
+		EntrustReport firstReportDetail = source.get(0);
+		//初始化标准信息
+		rts.setPrintDate(DateUtil.format(new Date(), "yyyy年MM月dd日"));
+		rts.setSender(firstReportDetail.getSendName());
+		rts.setSendDate(DateUtil.format(firstReportDetail.getSendTime(), "yyyy年MM月dd日"));
+		rts.setProjectName(firstReportDetail.getProjectName());
+		rts.setReportNo(firstReportDetail.getEntrustCode());
+		rts.setSendName("\\");
+		//获取检测项目、检测仪器、检测依据
+		rts.setEquipmentNames(new HashSet<>(source.size()));
+		rts.setSampleNames(new ArrayList<>(source.size()));
+		rts.setMethodNames(new ArrayList<>(source.size()));
+		rts.setTeamNames(new ArrayList<>(source.size()));
+		Set<Integer> equipmentIds = new HashSet<>(source.size());
+		source.forEach(arg -> {
+			if(arg.getEquipmentId() != null){
+				equipmentIds.add(arg.getEquipmentId());
+			}
+			//获取使用的设备id view
+			//关联检测项目
+			if (StrUtil.isNotBlank(arg.getTeamName())) {
+				String[] teamSplits = arg.getTeamName().split("、");
+				for (String teamName : teamSplits) {
+					if(!rts.getTeamNames().contains(teamName)){
+						rts.getTeamNames().add(teamName);
+					}
+				}
+			}
+			//关联检测依据
+			if (StrUtil.isNotBlank(arg.getMethodName())) {
+				String[] methodSplits = arg.getMethodName().split("~~~、");
+				//依据先是GB、再是JC、最后TR的顺序。  ELSE
+				List<String> GBList= new ArrayList<>();
+				List<String> JCList= new ArrayList<>();
+				List<String> TRList= new ArrayList<>();
+				List<String> ELSEList= new ArrayList<>();
+				for (String methodName : methodSplits) {
+					if(!rts.getMethodNames().contains(methodName)){
+						if(methodName.startsWith("GB")){
+							GBList.add(methodName);
+						}else if(methodName.startsWith("JC")){
+							JCList.add(methodName);
+						}else if(methodName.startsWith("TR")){
+							TRList.add(methodName);
+						}else{
+							ELSEList.add(methodName);
+						}
+						rts.getMethodNames().add(methodName);
+					}
+
+				}
+				GBList.addAll(JCList);
+				GBList.addAll(TRList);
+				GBList.addAll(ELSEList);
+				rts.getMethodNames().clear();
+				rts.getMethodNames().addAll(GBList);
+			}
+			//关联样品名
+			if (StrUtil.isNotBlank(arg.getName())) {
+				if(!rts.getSampleNames().contains(arg.getName())){
+					rts.getSampleNames().add(arg.getName());
+				}
+			}
+
+		});
+		rts.setSampleNum(rts.getSampleNames().size());
+
+		//关联仪器名字 去重
+		if(equipmentIds != null && equipmentIds.size()>0){
+			List<String> equipmentNames = equipmentUseMapper.getEquipmentNamesByEquipmentIds(equipmentIds);
+			equipmentNames.forEach(arg -> rts.getEquipmentNames().add(arg));
+		}
+
+
+		//关联送样单位名字
+		String clientKey = "CACHE:CLIENT";
+		if (!redisUtil.existsKey(clientKey)) {
+			List<Client> clients = clientMapper.selectList(null);
+			redisUtil.setString(clientKey, JSON.toJSONString(clients), 60);
+		}
+		List<Client> clients = JSON.parseArray(redisUtil.getString(clientKey) + "", Client.class);
+		if (clients.size() == 0) {
+			log.error("=================送样单位表中没有任何数据!==================");
+		} else {
+			clients.stream().filter(arg -> arg.getId().intValue() == firstReportDetail.getClientId())
+					.findFirst().ifPresent(arg -> rts.setSendName(arg.getName()));
+		}
+		return rts;
+	}
+
+
+
+
+
+
+
+
+
+
+
+
 	/**
 	 * 获取十元素1的检测信息
 	 * @param entrustId 委托id
@@ -5205,14 +5320,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			report.setFsio2(reportMap.get(ElementKey.FSiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.FSiO2.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.FSiO2.getKey()).getLastResult());
 			newList.add(report);
 		}
+		List<TenElementReport> tmpList = new ArrayList<>();
 		//将样品重量换算成kg
 		if(newList != null){
-			newList.stream().forEach(arg ->{
-
+			tmpList = newList.stream().sorted(Comparator.comparing(TenElementReport::getId)).collect(Collectors.toList());
+			tmpList.stream().forEach(arg ->{
 				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
 			});
 		}
-		return newList;
+		return tmpList;
 	}
 
 	//获取十元素1的检测项检测信息
@@ -5265,13 +5381,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			report.setMno(reportMap.get(ElementKey.MnO.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.MnO.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.MnO.getKey()).getLastResult());
 			newList.add(report);
 		}
+		List<TenElementReport> tmpList = new ArrayList<>();
 		//将样品重量换算成kg
 		if(newList != null){
-			newList.stream().forEach(arg ->{
+			tmpList = newList.stream().sorted(Comparator.comparing(TenElementReport::getId)).collect(Collectors.toList());
+			tmpList.stream().forEach(arg ->{
 				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
 			});
 		}
-		return newList;
+		return tmpList;
 	}
 
 	//获取十元素2的检测项检测信息
@@ -5343,13 +5461,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 			newList.add(report);
 		}
+		List<IndustrialReport> tmpList = new ArrayList<>();
 		//将样品重量换算成kg
 		if(newList != null){
-			newList.stream().forEach(arg ->{
+			tmpList = newList.stream().sorted(Comparator.comparing(IndustrialReport::getId)).collect(Collectors.toList());
+			tmpList.stream().forEach(arg ->{
 				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
 			});
 		}
-		return newList;
+		return tmpList;
 	}
 
 	//获取煤的工业分析的检测项检测信息
@@ -5430,13 +5550,16 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			report.setFcao1450(reportMap.get(ElementKey.FCaO1450.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.FCaO1450.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.FCaO1450.getKey()).getLastResult());
 			newList.add(report);
 		}
+
+		List<CraftReport> tmpList = new ArrayList<>();
 		//将样品重量换算成kg
 		if(newList != null){
-			newList.stream().forEach(arg ->{
+			tmpList = newList.stream().sorted(Comparator.comparing(CraftReport::getId)).collect(Collectors.toList());
+			tmpList.stream().forEach(arg ->{
 				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
 			});
 		}
-		return newList;
+		return tmpList;
 	}
 
 	//获取工艺性能的检测项检测信息
@@ -5496,13 +5619,15 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			report.setHsl(reportMap.get(ElementKey.Sf.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Sf.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Sf.getKey()).getLastResult());
 			newList.add(report);
 		}
+		List<PhysicsReport> tmpList = new ArrayList<>();
 		//将样品重量换算成kg
 		if(newList != null){
-			newList.stream().forEach(arg ->{
+			tmpList = newList.stream().sorted(Comparator.comparing(PhysicsReport::getId)).collect(Collectors.toList());
+			tmpList.stream().forEach(arg ->{
 				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
 			});
 		}
-		return newList;
+		return tmpList;
 	}
 
 	//获取物理性能的检测项检测信息
@@ -5563,13 +5688,16 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 			report.setLjfbbt("—");
 			newList.add(report);
 		}
+		List<GrainReport> tmpList = new ArrayList<>();
 		//将样品重量换算成kg
 		if(newList != null){
-			newList.stream().forEach(arg ->{
+			tmpList = newList.stream().sorted(Comparator.comparing(GrainReport::getId)).collect(Collectors.toList());
+			tmpList.stream().forEach(arg ->{
 				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
 			});
 		}
-		return newList;
+		return tmpList;
+
 	}
 
 	//获取颗粒分析的检测项检测信息
@@ -5800,82 +5928,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		return rts;
 	}
 
-	/**
-	 * 根据样品检测列表获取报告管理首页
-	 *
-	 * @param source 样品检测
-	 * @return ReportDetailVo
-	 */
-	private ReportDetailVo initReportDetailVo(List<EntrustReport> source) {
-
-		if (source.size() == 0) {
-			return null;
-		}
-
-		ReportDetailVo rts = new ReportDetailVo();
-		EntrustReport firstReportDetail = source.get(0);
-		//初始化标准信息
-		rts.setPrintDate(DateUtil.format(new Date(), "yyyy年MM月dd日"));
-		rts.setSender(firstReportDetail.getSendName());
-		rts.setSendDate(DateUtil.format(firstReportDetail.getSendTime(), "yyyy年MM月dd日"));
-		rts.setProjectName(firstReportDetail.getProjectName());
-		rts.setReportNo(firstReportDetail.getEntrustCode());
-		rts.setSendName("\\");
-		//获取检测项目、检测仪器、检测依据
-		rts.setEquipmentNames(new HashSet<>(source.size()));
-		rts.setSampleNames(new HashSet<>(source.size()));
-		rts.setMethodNames(new HashSet<>(source.size()));
-		rts.setTeamNames(new HashSet<>(source.size()));
-		Set<Integer> equipmentIds = new HashSet<>(source.size());
-		source.forEach(arg -> {
-			if(arg.getEquipmentId() != null){
-				equipmentIds.add(arg.getEquipmentId());
-			}
-			//获取使用的设备id view
-			//关联检测项目
-			if (StrUtil.isNotBlank(arg.getTeamName())) {
-				String[] teamSplits = arg.getTeamName().split("、");
-				for (String teamName : teamSplits) {
-					rts.getTeamNames().add(teamName);
-				}
-			}
-			//关联检测依据
-			if (StrUtil.isNotBlank(arg.getMethodName())) {
-				String[] methodSplits = arg.getMethodName().split("、");
-				for (String methodName : methodSplits) {
-					rts.getMethodNames().add(methodName);
-				}
-			}
-			//关联样品名
-			if (StrUtil.isNotBlank(arg.getName())) {
-				rts.getSampleNames().add(arg.getName());
-			}
-
-		});
-		rts.setSampleNum(rts.getSampleNames().size());
-
-		//关联仪器名字 去重
-		if(equipmentIds != null && equipmentIds.size()>0){
-			List<String> equipmentNames = equipmentUseMapper.getEquipmentNamesByEquipmentIds(equipmentIds);
-			equipmentNames.forEach(arg -> rts.getEquipmentNames().add(arg));
-		}
-
-
-		//关联送样单位名字
-		String clientKey = "CACHE:CLIENT";
-		if (!redisUtil.existsKey(clientKey)) {
-			List<Client> clients = clientMapper.selectList(null);
-			redisUtil.setString(clientKey, JSON.toJSONString(clients), 60);
-		}
-		List<Client> clients = JSON.parseArray(redisUtil.getString(clientKey) + "", Client.class);
-		if (clients.size() == 0) {
-			log.error("=================送样单位表中没有任何数据!==================");
-		} else {
-			clients.stream().filter(arg -> arg.getId().intValue() == firstReportDetail.getClientId())
-					.findFirst().ifPresent(arg -> rts.setSendName(arg.getName()));
-		}
-		return rts;
-	}
 
 	//******************************导出****************************************
 

cement-business/src/main/java/cn/wise/sc/cement/business/util/CheckCountUtil.java

@@ -1137,9 +1137,12 @@ public class CheckCountUtil {
 	 */
 	public static String countYMXGrade(Map<String, String> resultMap) {
 		String count = "";
-		if( StringUtils.isNotBlank(resultMap.get("易磨性(kWh/t)"))
+		if( StringUtils.isNotBlank(resultMap.get("易磨性(MJ/t)"))&&
+				StringUtils.isNotBlank(resultMap.get("易磨性(kWh/t)"))
 			){
-			BigDecimal YMX_kWh_t  = getBigDecimal(resultMap.get("易磨性(kWh/t)"));
+			BigDecimal YMX_MJ_t  = getBigDecimal(resultMap.get("易磨性(MJ/t)").trim());
+			BigDecimal YMX_kWh_t  = getBigDecimal(resultMap.get("易磨性(kWh/t)").trim());
+
 			if(YMX_kWh_t.compareTo(new BigDecimal(18))==1){
 				count =  "E";
 			}else if(YMX_kWh_t.compareTo(new BigDecimal(13))==1){
@@ -1155,9 +1158,11 @@ public class CheckCountUtil {
 			if(YMX_kWh_t != null){
 				YMX_kWh_t_str = YMX_kWh_t.toString();
 			}
-
-
-			count = "易磨性值="+YMX_kWh_t_str+" \n 易磨性等级="+count;
+			String YMX_MJ_t_str = "";
+			if(YMX_MJ_t != null){
+				YMX_MJ_t_str = YMX_MJ_t.toString();
+			}
+			count = "易磨性(MJ/t)="+YMX_MJ_t_str+" \n 易磨性值="+YMX_kWh_t_str+" \n 易磨性等级="+count;
 		}
 		return count;
 

cement-business/src/main/resources/templates/report_new.ftl

@@ -3550,7 +3550,7 @@
     <Cell ss:StyleID="s86"><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s73"><Data ss:Type="String">样品名称：</Data><NamedCell
       ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s87"><Data ss:Type="String">${sampleNames}</Data><NamedCell
+    <Cell ss:StyleID="s87"><Data ss:Type="String">${sampleNamesD}</Data><NamedCell
       ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s88"><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s86"><NamedCell ss:Name="Print_Area"/></Cell>