检测报告 优化

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

@@ -4,11 +4,11 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.wise.sc.cement.business.entity.EntityEnclosure;
-import cn.wise.sc.cement.business.entity.Sample;
 import cn.wise.sc.cement.business.model.*;
 import cn.wise.sc.cement.business.enumation.FileExt;
 import cn.wise.sc.cement.business.model.query.SampleHandleEnclosureQuery;
 import cn.wise.sc.cement.business.model.vo.EntrustVo;
+import cn.wise.sc.cement.business.model.vo.TenElementReport;
 import cn.wise.sc.cement.business.service.IEntityEnclosureService;
 import cn.wise.sc.cement.business.service.IEntrustService;
 import cn.wise.sc.cement.business.util.WordUtil;
@@ -21,7 +21,6 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -34,7 +33,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @description: 报告管理
@@ -106,15 +104,20 @@ public class ReportController {
         //十元素1导出
         List<TenElementReport> list1 = iEntrustService.getTen1List(entrustId);
         beanParams.put("list1", list1);
+        //工艺性能
+        //物理性能
+        //颗粒分析
+        //煤的工业分析
+        List<IndustrialReport> list3 = iEntrustService.getIndustrialList(entrustId);
+        beanParams.put("list3", list3);
+
+
 
+        //事项-----不用处理
         //十元素2导出
         List<TenElementReport> list2 = iEntrustService.getTen2List(entrustId);
         beanParams.put("list2", list2);
-
-
-        //化学工业导出
-        List<IndustrialReport> list3 = iEntrustService.getSampleIndustrialCheck(entrustId);
-        beanParams.put("list3", list3);
+        //品质-----不用处理
 
         WordUtil.writeWordReport(rts.getProjectName() + "(报告)", "report_new.ftl",
                 beanParams, response, FileExt.EXCL);

cement-business/src/main/java/cn/wise/sc/cement/business/entity/EntrustReport.java

@@ -6,8 +6,8 @@ import java.util.Date;
 
 /**
  * @description: 委托报告
- * @author: qh
- * @create: 2020-09-25 20:36
+ * @author: ztw
+ * @create: 2021-3-19
  **/
 @Data
 public class EntrustReport {

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

@@ -2,7 +2,7 @@ package cn.wise.sc.cement.business.mapper;
 
 import cn.wise.sc.cement.business.entity.SampleCheck;
 import cn.wise.sc.cement.business.model.IndustrialReport;
-import cn.wise.sc.cement.business.model.TenElementReport;
+import cn.wise.sc.cement.business.model.ElementReport;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -20,12 +20,12 @@ import java.util.Set;
 public interface SampleCheckMapper extends BaseMapper<SampleCheck> {
 
 	/**
-	 * 获取样品十元素1检测结果
+	 * 获取样品检测结果
 	 *
 	 * @param entrustId 项目id
 	 * @return SixElementReport
 	 */
-	List<TenElementReport> getSampleElementCheck(@Param("entrustId") Integer entrustId, @Param("teamNames") Set<String> teamNames);
+	List<ElementReport> getSampleElementCheck(@Param("entrustId") Integer entrustId, @Param("teamNames") Set<String> teamNames);
 
 	/**
 	 * 获取样品工业检测结果

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

@@ -330,20 +330,6 @@
         </where>
     </sql>
 
-   <!-- <select id="getReportDetail" resultType="cn.wise.sc.cement.business.entity.EntrustReport">
-        SELECT e.id,e.project_name,e.send_name,e.client_id,e.entrust_code,e.project_type,sscct.* FROM entrust e
-        RIGHT JOIN
-        (SELECT id,entrust_id,team_ids,method_numbers,name,scct.check_id,
-        scct.equipment_name,scct.user_id,create_time as send_time,scct.equipment_id FROM sample s
-        RIGHT JOIN
-        (SELECT check_id,equipment_name,sample_id,user_id,equipment_id FROM sample_check_team sct
-        RIGHT JOIN
-        (SELECT entrust_id,id FROM sample_check WHERE entrust_id = #{entrustId}) sc
-        ON sct.check_id = sc.id ) scct
-        ON s.id = scct.sample_id) sscct
-        ON sscct.entrust_id = e.id
-        WHERE e.id IS NOT NULL
-    </select>-->
 
     <select id="getReportDetail" resultType="cn.wise.sc.cement.business.entity.EntrustReport">
        SELECT e.id,e.project_name,e.send_name,e.client_id,e.entrust_code,e.project_type,s_tab.*
@@ -356,7 +342,7 @@
             RIGHT JOIN(
                     SELECT sd.id,sd.check_id,sd.sample_id,sd.user_id,
                     sde.equipment_id,sde.equipment_name FROM sample_distribution sd
-                    left JOIN sample_distribution_equipment sde ON sde.distribution_id = sd.id where sd.entrust_id = 90
+                    left JOIN sample_distribution_equipment sde ON sde.distribution_id = sd.id where sd.entrust_id = #{entrustId}
             )sd_tab
                 ON s.id = sd_tab.sample_id
             ) s_tab
@@ -381,8 +367,6 @@
 
 
 
-
-
     <select id="getSampleReturnHandlePage" resultType="cn.wise.sc.cement.business.model.vo.SampleReturnHandleVo">
         select t.id as id, e.id as entrustId,  e.entrust_code as entrustCode,p.id as projectId, p.name as projectName, p.code as projectCode,
         e.client_id as  clientId, c.name as clientName, e.is_urgent as isUrgent, e.project_type as projectType,

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.cement.business.mapper.SampleCheckMapper">
 
-    <select id="getSampleElementCheck" resultType="cn.wise.sc.cement.business.model.TenElementReport">
+    <select id="getSampleElementCheck" resultType="cn.wise.sc.cement.business.model.ElementReport">
         select s.id,s.name as sampleName,s.sample_form as sampleForm,s.sample_code as sampleCode,s.weight as weight,
         s.weight_type as weightType,s.cement_code as cementCode,
         t.name as teamName,IF(ISNULL(sdc.last_result),'—',sdc.last_result) as lastResult
@@ -19,7 +19,6 @@
     </select>
 
     <select id="getSampleIndustrialCheck" resultType="cn.wise.sc.cement.business.model.IndustrialReport">
-
         SELECT * FROM (SELECT count_results,entrust_id,team_group_name,sct.sample_id FROM sample_check sc
         LEFT JOIN
         (SELECT check_id,sample_id FROM sample_check_team) sct

cement-business/src/main/java/cn/wise/sc/cement/business/model/TenElementKey.java → cement-business/src/main/java/cn/wise/sc/cement/business/model/ElementKey.java

 package cn.wise.sc.cement.business.model;
 
 /**
- * @description: 十元素检测结果中的key
- * @author: qh
- * @create: 2020-10-15 14:03
+ * @description: 检测结果中的key
+ * @author: ztw
+ * @create: 2021-3-19
  **/
-public enum TenElementKey {
+public enum ElementKey {
 
 	//十元素key
 	LOI("L.O.I"),
@@ -23,14 +23,15 @@ public enum TenElementKey {
 	TiO2("TiO<sub>2</sub>"),
 	MnO("MnO"),
 
-
-
+	//煤的工业分析key
+	Gyfx("工业分析"),
+	Stad("St,ad"),
+	Km("可磨")
 
 	;
-
 	private String key;
 
-	TenElementKey(String key) {
+	ElementKey(String key) {
 		this.key = key;
 	}
 

cement-business/src/main/java/cn/wise/sc/cement/business/model/TenElementReport.java → cement-business/src/main/java/cn/wise/sc/cement/business/model/ElementReport.java

 package cn.wise.sc.cement.business.model;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
- * @description: 十元素检测报告
+ * @description:  样品检测报告
  * @author: ztw
- * @create: 2020-10-15 12:24
+ * @create: 2021-3-19
  **/
 @Data
-public class TenElementReport implements Serializable {
+public class ElementReport implements Serializable {
 
     private static final long serialVersionUID = 42L;
 
-
     /**
      * 样品id
      */
@@ -62,25 +57,4 @@ public class TenElementReport implements Serializable {
      */
     private String lastResult;
 
-    //下面为十元素1 十元素2共有的
-    private String loi ="";
-    private String sio2 ="";
-
-    private String fe2o3 ="";
-    private String cao ="";
-    private String mgo ="";
-    private String k2o ="";
-    private String na2o ="";
-    private String so3 ="";
-    private String cl="";
-
-    //下面为十元素1
-    private String al2o3AndTio2 ="";
-    private String fsio2="";
-
-    //下面为十元素2
-    private String al2o3="";
-    private String tio2="";
-    private String mno="";
-
 }

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

@@ -4,52 +4,23 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * @description: 工业分析报告
+ * @description: 煤的工业分析报告
  * @author: qh
- * @create: 2020-10-16 14:06
+ * @create: 2021-3-19
  **/
 @Data
-public class IndustrialReport implements Serializable {
+public class IndustrialReport extends ElementReport implements Serializable {
 
     private static final long serialVersionUID = 42L;
 
-    /**
-     * 样品名称
-     */
-    private String sampleName;
-
-    /**
-     * 来样状态
-     */
-    private String sampleForm;
-
-    /**
-     * 来样编号
-     */
-    private String sampleCode;
-
-    /**
-     * 样品重量
-     */
-    private String weight;
-
-    /**
-     * 本所编号
-     */
-    private String cementCode;
-
-    /**
-     * 校核数据
-     */
-    private String countResults;
-
-    //下面是工业特性得检测项
-
-    private String mad;
-    private String aad;
-    private String vad;
-    private String mjkg;
-    private String jz;
-    private String qnetstad;
-    private String stad;
+    //下面是煤的工业分析检测项
+    private String mad ="";
+    private String aad ="";
+    private String vad ="";
+    private String qnetadmjkg ="";
+    private String jztx ="";
+    private String stad ="";
+    private String clad ="";
+    private String hgi ="";
+    private String cyl ="";
 }

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

+package cn.wise.sc.cement.business.model.vo;
+
+import cn.wise.sc.cement.business.model.ElementReport;
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * @description: 十元素检测报告
+ * @author: ztw
+ * @create: 2021-3-19
+ **/
+@Data
+public class TenElementReport extends ElementReport implements Serializable {
+
+    private static final long serialVersionUID = 42L;
+
+    //下面为十元素1 十元素2共有的
+    private String loi ="";
+    private String sio2 ="";
+    private String fe2o3 ="";
+    private String cao ="";
+    private String mgo ="";
+    private String k2o ="";
+    private String na2o ="";
+    private String so3 ="";
+    private String cl="";
+
+    //下面为十元素1
+    private String al2o3AndTio2 ="";
+    private String fsio2="";
+
+    //下面为十元素2
+    private String al2o3="";
+    private String tio2="";
+    private String mno="";
+
+}

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

@@ -142,15 +142,7 @@ public interface IEntrustService extends IService<Entrust> {
 
 	List<TenElementReport> getTen2List(Integer entrustId);
 
-
-
-	/**
-	 * 查询工业特性
-	 *
-	 * @param entrustId 委托id
-	 * @return 工业特征
-	 */
-	List<IndustrialReport> getSampleIndustrialCheck(Integer entrustId);
+	List<IndustrialReport> getIndustrialList(Integer entrustId);
 
 
 	//质量管理

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

@@ -138,6 +138,10 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 	private SampleDistributionCheckinputMapper sampleDistributionCheckinputMapper;
 	@Resource
 	private TitrationMapper titrationMapper;
+	@Resource
+	private ITeamService teamService;
+	@Resource
+	private ISampleDistributionService sampleDistributionService;
 
 	/**
 	 * 委托分页
@@ -429,16 +433,27 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 
 	public static void main(String[] args) {
 
-		BigDecimal displaySO3 = new BigDecimal(0.01);
-		BigDecimal count = displaySO3.multiply(new BigDecimal(2.5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
-		System.out.println(count.toString());
-
-		String URL = "https://lab.wisenergy.cn/lab-bangye?id=" + 12 + "&path=/blanche/entrustdetail&notice=" + 21;
+		/*String URL = "https://lab.wisenergy.cn/lab-bangye?id=" + 12 + "&path=/blanche/entrustdetail&notice=" + 21;
 		String a = URLUtil.encodeAll(URL);
 		String b = URLUtil.encode(URL).replaceAll("&", "%26");
 //        String a = URLUtil.encode(URL);
 		System.out.println(a);
-		System.out.println(b);
+		System.out.println(b);*/
+
+
+		String aa = "Mad=1.87  \n" +
+				" Aad=21.04  \n" +
+				" Vad=24.24  \n" +
+				" Qnet,ad MJ/kg=23.14  \n" +
+				" 焦渣=2";
+		String[] str = aa.split("\n");
+		Map<String,String> map = new HashMap<>();
+		for(String str2 : str){
+			String[] ele = str2.trim().split("=");
+			map.put(ele[0], ele[1]);
+		}
+		System.out.println(map);
+
 	}
 
 	/**
@@ -1280,120 +1295,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 	}
 
 
-	/**
-	 * 获取十元素1的检测信息
-	 * @param entrustId 委托id
-	 * @return
-	 */
-	@Override
-	public List<TenElementReport> getTen1List(Integer entrustId){
-		List<TenElementReport> list = getSampleTenElementCheck(entrustId);
-		Map<Integer, List<TenElementReport>> groupBySample = list.stream().collect(Collectors.groupingBy(TenElementReport::getId, Collectors.toList()));
-		List<TenElementReport> newList = new ArrayList<>();
-
-		for(Map.Entry<Integer,List<TenElementReport>> entry : groupBySample.entrySet()){
-			TenElementReport first = entry.getValue().get(0);
-			Map<String,TenElementReport> tenElementReportMap = entry.getValue().stream().collect(Collectors.toMap(TenElementReport::getTeamName, item -> item));
-			first.setLoi(tenElementReportMap.get(TenElementKey.LOI.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.LOI.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.LOI.getKey()).getLastResult());
-			first.setSio2(tenElementReportMap.get(TenElementKey.SiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.SiO2.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.SiO2.getKey()).getLastResult());
-			first.setAl2o3AndTio2(tenElementReportMap.get(TenElementKey.Al2O3AndTiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Al2O3AndTiO2.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Al2O3AndTiO2.getKey()).getLastResult());
-			first.setFe2o3(tenElementReportMap.get(TenElementKey.Fe2O3.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Fe2O3.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Fe2O3.getKey()).getLastResult());
-			first.setCao(tenElementReportMap.get(TenElementKey.CaO.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.CaO.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.CaO.getKey()).getLastResult());
-			first.setMgo(tenElementReportMap.get(TenElementKey.MgO.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.MgO.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.MgO.getKey()).getLastResult());
-			first.setK2o(tenElementReportMap.get(TenElementKey.K2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.K2O.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.K2O.getKey()).getLastResult());
-			first.setNa2o(tenElementReportMap.get(TenElementKey.Na2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Na2O.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Na2O.getKey()).getLastResult());
-			first.setSo3(tenElementReportMap.get(TenElementKey.SO3.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.SO3.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.SO3.getKey()).getLastResult());
-			first.setCl(tenElementReportMap.get(TenElementKey.Cl.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Cl.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Cl.getKey()).getLastResult());
-			first.setFsio2(tenElementReportMap.get(TenElementKey.FSiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.FSiO2.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.FSiO2.getKey()).getLastResult());
-			newList.add(first);
-		}
-		//将样品重量换算成kg
-		newList.stream().forEach(arg ->{
-			arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
-		});
-		return newList;
-	}
-
-	//获取十元素1的检测项检测信息
-	private List<TenElementReport> getSampleTenElementCheck(Integer entrustId) {
-		Set<String> list = new HashSet<>(11);
-		list.add("L.O.I");
-		list.add("SiO<sub>2</sub>");
-		list.add("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>");
-		list.add("Fe<sub>2</sub>O<sub>3</sub>");
-		list.add("CaO");
-		list.add("MgO");
-		list.add("K<sub>2</sub>O");
-		list.add("Na<sub>2</sub>O");
-		list.add("SO<sub>3</sub>");
-		list.add("Cl<sup>-</sup>");
-		list.add("f-SiO<sub>2</sub>");
-		return sampleCheckMapper.getSampleElementCheck(entrustId, list);
-	}
-
-
-	/**
-	 * 获取十元素2的检测信息
-	 * @param entrustId 委托id
-	 * @return
-	 */
-	@Override
-	public List<TenElementReport> getTen2List(Integer entrustId){
-		List<TenElementReport> list = getSampleTenElementCheck2(entrustId);
-		Map<Integer, List<TenElementReport>> groupBySample = list.stream().collect(Collectors.groupingBy(TenElementReport::getId, Collectors.toList()));
-		List<TenElementReport> newList = new ArrayList<>();
-
-		for(Map.Entry<Integer,List<TenElementReport>> entry : groupBySample.entrySet()){
-			TenElementReport first = entry.getValue().get(0);
-			Map<String,TenElementReport> tenElementReportMap = entry.getValue().stream().collect(Collectors.toMap(TenElementReport::getTeamName, item -> item));
-			first.setLoi(tenElementReportMap.get(TenElementKey.LOI.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.LOI.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.LOI.getKey()).getLastResult());
-			first.setSio2(tenElementReportMap.get(TenElementKey.SiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.SiO2.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.SiO2.getKey()).getLastResult());
-			first.setAl2o3(tenElementReportMap.get(TenElementKey.Al2O3.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Al2O3.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Al2O3.getKey()).getLastResult());
-			first.setFe2o3(tenElementReportMap.get(TenElementKey.Fe2O3.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Fe2O3.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Fe2O3.getKey()).getLastResult());
-			first.setCao(tenElementReportMap.get(TenElementKey.CaO.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.CaO.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.CaO.getKey()).getLastResult());
-			first.setMgo(tenElementReportMap.get(TenElementKey.MgO.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.MgO.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.MgO.getKey()).getLastResult());
-			first.setTio2(tenElementReportMap.get(TenElementKey.TiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.TiO2.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.TiO2.getKey()).getLastResult());
-			first.setK2o(tenElementReportMap.get(TenElementKey.K2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.K2O.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.K2O.getKey()).getLastResult());
-			first.setNa2o(tenElementReportMap.get(TenElementKey.Na2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Na2O.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Na2O.getKey()).getLastResult());
-			first.setSo3(tenElementReportMap.get(TenElementKey.SO3.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.SO3.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.SO3.getKey()).getLastResult());
-			first.setCl(tenElementReportMap.get(TenElementKey.Cl.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.Cl.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.Cl.getKey()).getLastResult());
-			first.setMno(tenElementReportMap.get(TenElementKey.MnO.getKey())==null || org.springframework.util.StringUtils.isEmpty(tenElementReportMap.get(TenElementKey.MnO.getKey()).getLastResult()) ?"—":tenElementReportMap.get(TenElementKey.MnO.getKey()).getLastResult());
-			newList.add(first);
-		}
-		//将样品重量换算成kg
-		newList.stream().forEach(arg ->{
-			arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
-		});
-		return newList;
-	}
-
-	//获取十元素2的检测项检测信息
-	private List<TenElementReport> getSampleTenElementCheck2(Integer entrustId) {
-		Set<String> list = new HashSet<>(12);
-		list.add("L.O.I");
-		list.add("SiO<sub>2</sub>");
-		list.add("Al<sub>2</sub>O<sub>3</sub>");
-		list.add("Fe<sub>2</sub>O<sub>3</sub>");
-		list.add("CaO");
-		list.add("MgO");
-		list.add("TiO<sub>2</sub>");
-		list.add("K<sub>2</sub>O");
-		list.add("Na<sub>2</sub>O");
-		list.add("SO<sub>3</sub>");
-		list.add("Cl<sup>-</sup>");
-		list.add("MnO");
-		return sampleCheckMapper.getSampleElementCheck(entrustId, list);
-	}
-
-
-
-
-	@Override
-	public List<IndustrialReport> getSampleIndustrialCheck(Integer entrustId) {
-
-		return sampleCheckMapper.getSampleIndustrialCheck(entrustId);
-	}
-
 	/**
 	 * 获取样品表里最大的平行样编号
 	 *
@@ -4883,6 +4784,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		return BaseResponse.okData(countResultMap);
 	}
 
+	//******************************报告************************************************************
+
 	/**
 	 * 检测报告分页列表
 	 * @param pageQuery
@@ -5030,6 +4933,201 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		return null;
 	}
 
+	/**
+	 * 获取十元素1的检测信息
+	 * @param entrustId 委托id
+	 * @return
+	 */
+	@Override
+	public List<TenElementReport> getTen1List(Integer entrustId){
+		List<TenElementReport> newList = null;
+		List<ElementReport> list = getSampleTenElementCheck(entrustId);
+		if(list != null && list.size() > 0){
+			newList = new ArrayList<>();
+		}
+		Map<Integer, List<ElementReport>> groupBySample = list.stream().collect(Collectors.groupingBy(ElementReport::getId, Collectors.toList()));
+		for(Map.Entry<Integer,List<ElementReport>> entry : groupBySample.entrySet()){
+			ElementReport first = entry.getValue().get(0);
+			TenElementReport report = new TenElementReport();
+			BeanUtils.copyProperties(first, report);
+			Map<String,ElementReport> reportMap = entry.getValue().stream().collect(Collectors.toMap(ElementReport::getTeamName, item -> item));
+			report.setLoi(reportMap.get(ElementKey.LOI.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.LOI.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.LOI.getKey()).getLastResult());
+			report.setSio2(reportMap.get(ElementKey.SiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.SiO2.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.SiO2.getKey()).getLastResult());
+			report.setAl2o3AndTio2(reportMap.get(ElementKey.Al2O3AndTiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Al2O3AndTiO2.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Al2O3AndTiO2.getKey()).getLastResult());
+			report.setFe2o3(reportMap.get(ElementKey.Fe2O3.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Fe2O3.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Fe2O3.getKey()).getLastResult());
+			report.setCao(reportMap.get(ElementKey.CaO.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.CaO.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.CaO.getKey()).getLastResult());
+			report.setMgo(reportMap.get(ElementKey.MgO.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.MgO.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.MgO.getKey()).getLastResult());
+			report.setK2o(reportMap.get(ElementKey.K2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.K2O.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.K2O.getKey()).getLastResult());
+			report.setNa2o(reportMap.get(ElementKey.Na2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Na2O.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Na2O.getKey()).getLastResult());
+			report.setSo3(reportMap.get(ElementKey.SO3.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.SO3.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.SO3.getKey()).getLastResult());
+			report.setCl(reportMap.get(ElementKey.Cl.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Cl.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Cl.getKey()).getLastResult());
+			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);
+		}
+		//将样品重量换算成kg
+		if(newList != null){
+			newList.stream().forEach(arg ->{
+				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
+			});
+		}
+		return newList;
+	}
+
+	//获取十元素1的检测项检测信息
+	private List<ElementReport> getSampleTenElementCheck(Integer entrustId) {
+		Set<String> list = new HashSet<>(11);
+		list.add("L.O.I");
+		list.add("SiO<sub>2</sub>");
+		list.add("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>");
+		list.add("Fe<sub>2</sub>O<sub>3</sub>");
+		list.add("CaO");
+		list.add("MgO");
+		list.add("K<sub>2</sub>O");
+		list.add("Na<sub>2</sub>O");
+		list.add("SO<sub>3</sub>");
+		list.add("Cl<sup>-</sup>");
+		list.add("f-SiO<sub>2</sub>");
+		return sampleCheckMapper.getSampleElementCheck(entrustId, list);
+	}
+
+
+	/**
+	 * 获取十元素2的检测信息
+	 * @param entrustId 委托id
+	 * @return
+	 */
+	@Override
+	public List<TenElementReport> getTen2List(Integer entrustId){
+		List<TenElementReport> newList = null;
+		List<ElementReport> list = getSampleTenElementCheck(entrustId);
+		if(list != null && list.size() > 0){
+			newList = new ArrayList<>();
+		}
+		Map<Integer, List<ElementReport>> groupBySample = list.stream().collect(Collectors.groupingBy(ElementReport::getId, Collectors.toList()));
+		for(Map.Entry<Integer,List<ElementReport>> entry : groupBySample.entrySet()){
+			ElementReport first = entry.getValue().get(0);
+			TenElementReport report = new TenElementReport();
+			BeanUtils.copyProperties(first, report);
+			Map<String,ElementReport> reportMap = entry.getValue().stream().collect(Collectors.toMap(ElementReport::getTeamName, item -> item));
+			report.setLoi(reportMap.get(ElementKey.LOI.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.LOI.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.LOI.getKey()).getLastResult());
+			report.setSio2(reportMap.get(ElementKey.SiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.SiO2.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.SiO2.getKey()).getLastResult());
+			report.setAl2o3(reportMap.get(ElementKey.Al2O3.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Al2O3.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Al2O3.getKey()).getLastResult());
+			report.setFe2o3(reportMap.get(ElementKey.Fe2O3.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Fe2O3.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Fe2O3.getKey()).getLastResult());
+			report.setCao(reportMap.get(ElementKey.CaO.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.CaO.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.CaO.getKey()).getLastResult());
+			report.setMgo(reportMap.get(ElementKey.MgO.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.MgO.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.MgO.getKey()).getLastResult());
+			report.setTio2(reportMap.get(ElementKey.TiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.TiO2.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.TiO2.getKey()).getLastResult());
+			report.setK2o(reportMap.get(ElementKey.K2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.K2O.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.K2O.getKey()).getLastResult());
+			report.setNa2o(reportMap.get(ElementKey.Na2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Na2O.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Na2O.getKey()).getLastResult());
+			report.setSo3(reportMap.get(ElementKey.SO3.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.SO3.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.SO3.getKey()).getLastResult());
+			report.setCl(reportMap.get(ElementKey.Cl.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Cl.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Cl.getKey()).getLastResult());
+			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);
+		}
+		//将样品重量换算成kg
+		if(newList != null){
+			newList.stream().forEach(arg ->{
+				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
+			});
+		}
+		return newList;
+	}
+
+	//获取十元素2的检测项检测信息
+	private List<ElementReport> getSampleTenElementCheck2(Integer entrustId) {
+		Set<String> list = new HashSet<>(12);
+		list.add("L.O.I");
+		list.add("SiO<sub>2</sub>");
+		list.add("Al<sub>2</sub>O<sub>3</sub>");
+		list.add("Fe<sub>2</sub>O<sub>3</sub>");
+		list.add("CaO");
+		list.add("MgO");
+		list.add("TiO<sub>2</sub>");
+		list.add("K<sub>2</sub>O");
+		list.add("Na<sub>2</sub>O");
+		list.add("SO<sub>3</sub>");
+		list.add("Cl<sup>-</sup>");
+		list.add("MnO");
+		return sampleCheckMapper.getSampleElementCheck(entrustId, list);
+	}
+
+
+	/**
+	 * 获取煤的工业分析的检测信息
+	 * @param entrustId 委托id
+	 * @return
+	 */
+	@Override
+	public List<IndustrialReport> getIndustrialList(Integer entrustId) {
+		List<IndustrialReport> newList = null;
+		List<ElementReport> list = getSampleIndustrialElementCheck(entrustId);
+		if(list != null && list.size() > 0){
+			newList = new ArrayList<>();
+		}
+		Map<Integer, List<ElementReport>> groupBySample = list.stream().collect(Collectors.groupingBy(ElementReport::getId, Collectors.toList()));
+		for(Map.Entry<Integer,List<ElementReport>> entry : groupBySample.entrySet()){
+			ElementReport first = entry.getValue().get(0);
+			IndustrialReport report = new IndustrialReport();
+			BeanUtils.copyProperties(first, report);
+			Map<String,ElementReport> reportMap = entry.getValue().stream().collect(Collectors.toMap(ElementReport::getTeamName, item -> item));
+			String gyfxLastResult = reportMap.get(ElementKey.Gyfx.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Gyfx.getKey()).getLastResult())?"":reportMap.get(ElementKey.Gyfx.getKey()).getLastResult();
+			if(StringUtils.isNotBlank(gyfxLastResult)){
+				Map<String,String> gyfxMap = getGyfxLastResult(gyfxLastResult);
+				report.setMad(gyfxMap==null || org.springframework.util.StringUtils.isEmpty(gyfxMap.get("Mad")) ?"—":gyfxMap.get("Mad"));
+				report.setAad(gyfxMap==null || org.springframework.util.StringUtils.isEmpty(gyfxMap.get("Aad")) ?"—":gyfxMap.get("Aad"));
+				report.setVad(gyfxMap==null || org.springframework.util.StringUtils.isEmpty(gyfxMap.get("Vad")) ?"—":gyfxMap.get("Vad"));
+				report.setQnetadmjkg(gyfxMap==null || org.springframework.util.StringUtils.isEmpty(gyfxMap.get("Qnet,ad MJ/kg")) ?"—":gyfxMap.get("Qnet,ad MJ/kg"));
+				report.setJztx(gyfxMap==null || org.springframework.util.StringUtils.isEmpty(gyfxMap.get("焦渣")) ?"—":gyfxMap.get("焦渣"));
+			}else{
+				report.setMad("—");
+				report.setAad("—");
+				report.setVad("—");
+				report.setQnetadmjkg("—");
+				report.setJztx("—");
+			}
+			report.setStad(reportMap.get(ElementKey.Stad.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Stad.getKey()).getLastResult()) ?"—":reportMap.get(ElementKey.Stad.getKey()).getLastResult());
+			report.setClad("—");
+			report.setHgi("—");
+			report.setCyl("—");
+			newList.add(report);
+		}
+		//将样品重量换算成kg
+		if(newList != null){
+			newList.stream().forEach(arg ->{
+				arg.setWeight(Sample.weight2Kg(arg.getWeight(), arg.getWeightType()));
+			});
+		}
+		return newList;
+	}
+
+	//获取煤的工业分析的检测项检测信息
+	private List<ElementReport> getSampleIndustrialElementCheck(Integer entrustId) {
+		Set<String> list = new HashSet<>(3);
+		list.add("工业分析");
+		list.add("St,ad");
+		list.add("可磨");
+		return sampleCheckMapper.getSampleElementCheck(entrustId, list);
+	}
+	//工业分析检测项最终结果拆分显示
+	private Map<String,String> getGyfxLastResult(String lastResult){
+		Map<String,String> map = new HashMap<>();
+		if(StringUtils.isNotBlank(lastResult)){
+			String[] str = lastResult.split("\n");
+			for(String str2 : str){
+				String[] ele = str2.trim().split("=");
+				map.put(ele[0], ele[1]);
+			}
+		}
+		return map;
+	}
+
+
+
+
+
+
+
+
+	//***********************************质量控制************************************
 	/**
 	 * 质量检测分页列表
 	 * @param pageQuery
@@ -5320,6 +5418,8 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		return rts;
 	}
 
+	//******************************导出****************************************
+
 	/**
 	 * 委托列表导出
 	 */
@@ -5434,11 +5534,6 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
 		}
 	}
 
-	@Resource
-	private ITeamService teamService;
-	@Resource
-	private ISampleDistributionService sampleDistributionService;
-
 	/**
 	 * 委托单进展导出（东哥写的例子）
 	 * @param cycle

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

@@ -3959,8 +3959,7 @@
    </Row>
 
    <!--检测依据  15 -->
-
-
+  <#--插入第一个检测依据-->
    <Row ss:AutoFitHeight="0" ss:Height="20">
        <Cell ss:MergeDown="14" ss:StyleID="s166"><Data ss:Type="String">检测依据</Data><NamedCell
                    ss:Name="_FilterDatabase"/></Cell>
@@ -3973,6 +3972,9 @@
        <Cell ss:StyleID="s122"/>
        <Cell ss:StyleID="s122"/>
    </Row>
+
+  <#--如果检测依据信息不为空-->
+   <#if methodNames??>
      <#list methodNames as item>
       <Row ss:AutoFitHeight="0" ss:Height="17.25">
        <Cell ss:Index="2" ss:StyleID="s167"><ss:Data ss:Type="String"
@@ -3996,8 +3998,8 @@
        <Cell ss:StyleID="s122"/>
        <Cell ss:StyleID="s122"/>
       </Row>
-
      </#list>
+
      <#if methodNames?size lte 13>
       <Row ss:AutoFitHeight="0" ss:Height="20">
           <Cell ss:Index="2" ss:MergeAcross="2" ss:StyleID="m2194692801716"><Data
@@ -4049,7 +4051,33 @@
              <Cell ss:StyleID="s122"/>
          </Row>
      </#if>
+   </#if>
+   <#--如果检测依据信息不为空-->
+   <#if ! methodNames??>
+       <#list 1..(2-12) as i>
+           <Row ss:AutoFitHeight="0" ss:Height="17.25">
+               <Cell ss:Index="2" ss:StyleID="s167"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+               <Cell ss:StyleID="s173"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+               <Cell ss:StyleID="s174"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+               <Cell ss:StyleID="s122"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+               <Cell ss:StyleID="s122"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+               <Cell ss:StyleID="s122"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+               <Cell ss:StyleID="s122"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+               <Cell ss:Index="11" ss:StyleID="Default"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+               <Cell ss:StyleID="s122"/>
+           </Row>
+       </#list>
+   </#if>
    <#--  仪器设备 9  -->
+   <#--插入第一个设备-->
    <Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s173">
     <Cell ss:MergeDown="8" ss:StyleID="s187"><Data ss:Type="String">主要仪器设备（编号）</Data><NamedCell
       ss:Name="_FilterDatabase"/></Cell>
@@ -4066,7 +4094,9 @@
     <Cell ss:StyleID="s122"/>
     <Cell ss:StyleID="s122"/>
    </Row>
-   <#--<#if equipmentNames??>-->
+
+   <#--如果设备信息不为空-->
+   <#if equipmentNames??>
    <#list equipmentNames as item>
      <Row ss:AutoFitHeight="0" ss:Height="18">
       <Cell ss:Index="2" ss:StyleID="s179">
@@ -4080,7 +4110,7 @@
       <Cell ss:Index="11" ss:StyleID="s173"/>
      </Row>
    </#list>
-   <#--</#if>-->
+
     <#if equipmentNames?size lte 8>
       <Row ss:AutoFitHeight="0" ss:Height="18">
         <Cell ss:Index="2" ss:StyleID="s179"><NamedCell ss:Name="_FilterDatabase"/></Cell>
@@ -4109,6 +4139,21 @@
          <Cell ss:StyleID="s122"/>
      </Row>
     </#if>
+   </#if>
+    <#--如果设备为空-->
+   <#if ! equipmentNames??>
+     <#list 1..(2-8) as i>
+        <Row ss:AutoFitHeight="0" ss:Height="18">
+            <Cell ss:Index="2" ss:StyleID="s179"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+            <Cell ss:Index="4" ss:StyleID="s563"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+            <Cell ss:Index="8" ss:StyleID="s122"><NamedCell ss:Name="_FilterDatabase"/></Cell>
+            <Cell ss:StyleID="s122"/>
+            <Cell ss:StyleID="s122"/>
+            <Cell ss:StyleID="s122"/>
+        </Row>
+     </#list>
+   </#if>
+
    <Row ss:AutoFitHeight="0" ss:Height="18" ss:StyleID="s107">
     <Cell ss:StyleID="s195"><Data ss:Type="String">项目名称</Data><NamedCell
              ss:Name="_FilterDatabase"/></Cell>
@@ -4333,51 +4378,86 @@
    </Row>
 
    <!-- 需要循环补充的列表   14行 -->
-  <!-- <#list list1 as item> -->
+  <#--如果list1不为空-->
+  <#if  list1??>
+      <!-- <#list list1 as item1> -->
        <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s225">
-    <Cell ss:StyleID="s260"><Data ss:Type="String">${item.sampleName}</Data><NamedCell
+        <Cell ss:StyleID="s260"><Data ss:Type="String">${item1.sampleName}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.sampleForm}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.sampleForm}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.sampleCode}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.sampleCode}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.weight}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.weight}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.cementCode}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.cementCode}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.loi}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.loi}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.sio2}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.sio2}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.al2o3AndTio2}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.al2o3AndTio2}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.fe2o3}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.fe2o3}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.cao}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.cao}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.mgo}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.mgo}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s248"><Data ss:Type="String">${item.k2o}</Data><NamedCell
+        <Cell ss:StyleID="s248"><Data ss:Type="String">${item1.k2o}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s248"><Data ss:Type="String">${item.na2o}</Data><NamedCell
+        <Cell ss:StyleID="s248"><Data ss:Type="String">${item1.na2o}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s261"><Data ss:Type="String">${item.so3}</Data><NamedCell
+        <Cell ss:StyleID="s261"><Data ss:Type="String">${item1.so3}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s262"><Data ss:Type="String">${item.cl}</Data><NamedCell
+        <Cell ss:StyleID="s262"><Data ss:Type="String">${item1.cl}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s248"><Data ss:Type="String">${item.fsio2}</Data><NamedCell
+        <Cell ss:StyleID="s248"><Data ss:Type="String">${item1.fsio2}</Data><NamedCell
           ss:Name="Print_Area"/></Cell>
         <Cell ss:StyleID="s259"/>
        </Row>
        <!-- 别表结束 -->
       </#list>
+
        <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s223">
           <Cell ss:MergeAcross="15" ss:StyleID="m1898254380784"><Data ss:Type="String">以下空白</Data><NamedCell
                   ss:Name="Print_Area"/></Cell>
           <Cell ss:StyleID="s257"/>
       </Row>
-   <#if  list1??>
-       <#list 0..13 as i>
+
+      <#if list1?size lte 13>
+       <#list 1..(list1?size+1 - 13) as i>
+           <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s225">
+               <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s265"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s259"/>
+           </Row>
+       </#list>
+      </#if>
+  </#if>
+   <#--如果list1空-->
+   <#if ! list1??>
+           <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s223">
+               <Cell ss:MergeAcross="15" ss:StyleID="m1898254380784"><Data ss:Type="String">以下空白</Data><NamedCell
+                       ss:Name="Print_Area"/></Cell>
+               <Cell ss:StyleID="s257"/>
+           </Row>
+
+           <#list 1..13 as i>
               <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s225">
               <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
               <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
@@ -5895,9 +5975,9 @@
     <Cell ss:StyleID="s289"><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s283"><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s392"><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s290" ss:Formula="=首页!R[-2]C[-10]"><Data ss:Type="String">共2页 </Data><NamedCell
+    <Cell ss:StyleID="s290" ss:Formula="=首页!R[-2]C[-10]"><Data ss:Type="String">共9页 </Data><NamedCell
       ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s291"><Data ss:Type="String"> 第5页 </Data><NamedCell
+    <Cell ss:StyleID="s291"><Data ss:Type="String"> 第6页 </Data><NamedCell
       ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s283"/>
    </Row>
@@ -5938,32 +6018,39 @@
     <Cell ss:StyleID="Default"/>
    </Row>
    <!--   煤工业分析 13行 -->
-   <!-- <#list list3 as item> -->
+
+<#--如果list1不为空-->
+    <#if  list3??>
+         <!-- <#list list3 as item3> -->
                   <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s400">
-    <Cell ss:StyleID="s263"><Data ss:Type="String">${item.sampleName}</Data></Cell>
-    <Cell ss:StyleID="s263"><Data ss:Type="String">${item.sampleForm}</Data></Cell>
-    <Cell ss:StyleID="s263"><Data ss:Type="String">${item.sampleCode}</Data></Cell>
-    <Cell ss:StyleID="s263"><Data ss:Type="String">${item.weight}</Data></Cell>
-    <Cell ss:StyleID="s263"><Data ss:Type="String">${item.cementCode}</Data></Cell>
-    <Cell ss:StyleID="s306"><Data ss:Type="String">${item.mad}</Data></Cell>
-    <Cell ss:StyleID="s306"><Data ss:Type="String">${item.aad}</Data></Cell>
-    <Cell ss:StyleID="s306"><Data ss:Type="String">${item.vad}</Data></Cell>
-    <Cell ss:StyleID="s248"><Data ss:Type="String">—</Data><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s248"><Data ss:Type="String">${item.jz}</Data></Cell>
-    <Cell ss:StyleID="s264"><Data ss:Type="String">${item.stad}</Data></Cell>
-    <Cell ss:StyleID="s248"><Data ss:Type="String">—</Data><NamedCell
-      ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s403"><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
+                      <Cell ss:StyleID="s263"><Data ss:Type="String">${item3.sampleName}</Data></Cell>
+                      <Cell ss:StyleID="s263"><Data ss:Type="String">${item3.sampleForm}</Data></Cell>
+                      <Cell ss:StyleID="s263"><Data ss:Type="String">${item3.sampleCode}</Data></Cell>
+                      <Cell ss:StyleID="s263"><Data ss:Type="String">${item3.weight}</Data></Cell>
+                      <Cell ss:StyleID="s263"><Data ss:Type="String">${item3.cementCode}</Data></Cell>
+                      <Cell ss:StyleID="s306"><Data ss:Type="String">${item3.mad}</Data></Cell>
+                      <Cell ss:StyleID="s306"><Data ss:Type="String">${item3.aad}</Data></Cell>
+                      <Cell ss:StyleID="s306"><Data ss:Type="String">${item3.vad}</Data></Cell>
+                      <Cell ss:StyleID="s248"><Data ss:Type="String">${item3.qnetadmjkg}</Data><NamedCell
+                              ss:Name="Print_Area"/></Cell>
+                      <Cell ss:StyleID="s248"><Data ss:Type="String">${item3.jztx}</Data></Cell>
+                      <Cell ss:StyleID="s264"><Data ss:Type="String">${item3.stad}</Data></Cell>
+                      <Cell ss:StyleID="s248"><Data ss:Type="String">${item3.clad}</Data><NamedCell
+                              ss:Name="Print_Area"/></Cell>
+                      <Cell ss:StyleID="s403"><Data ss:Type="String">${item3.hgi}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+                      <Cell ss:StyleID="s248"><Data ss:Type="String">${item3.cyl}</Data><NamedCell ss:Name="Print_Area"/></Cell>
                       <Cell ss:StyleID="Default"/>
                   </Row>
          <!-- </#list> -->
+
             <Row ss:AutoFitHeight="0" ss:Height="25.5">
                 <Cell ss:MergeAcross="13" ss:StyleID="m1898249065096"><Data ss:Type="String">以下空白</Data><NamedCell
                         ss:Name="Print_Area"/></Cell>
                 <Cell ss:StyleID="s397"/>
             </Row>
+
+            <#if list3?size lte 12>
+               <#list 1..(list3?size+1 - 12) as i>
                  <Row ss:AutoFitHeight="0" ss:Height="25.5">
                      <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
                      <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
@@ -5981,7 +6068,37 @@
                      <Cell ss:StyleID="s405"><NamedCell ss:Name="Print_Area"/></Cell>
                      <Cell ss:StyleID="s400"/>
                  </Row>
+               </#list>
+            </#if>
+    </#if>
+  <#--如果list3空-->
+   <#if ! list3??>
+       <Row ss:AutoFitHeight="0" ss:Height="25.5">
+           <Cell ss:MergeAcross="13" ss:StyleID="m1898249065096"><Data ss:Type="String">以下空白</Data><NamedCell
+                   ss:Name="Print_Area"/></Cell>
+           <Cell ss:StyleID="s397"/>
+       </Row>
 
+      <#list 1..12 as i>
+               <Row ss:AutoFitHeight="0" ss:Height="25.5">
+                   <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s306"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s306"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s306"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s404"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s264"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s405"><NamedCell ss:Name="Print_Area"/></Cell>
+                   <Cell ss:StyleID="s400"/>
+               </Row>
+      </#list>
+   </#if>
    <Row ss:AutoFitHeight="0" ss:Height="25.5">
     <Cell ss:MergeAcross="13" ss:StyleID="m2194692801300"><Data ss:Type="String">注：出样率小于 45% 时，可磨性结果仅供参考。</Data><NamedCell
       ss:Name="Print_Area"/></Cell>
@@ -6300,7 +6417,7 @@
     <Cell ss:StyleID="s234"><Data ss:Type="String">MnO</Data><NamedCell
       ss:Name="Print_Area"/></Cell>
    </Row>
-    <!--        六元素2     14    -->
+    <!--        十元素2     14    -->
    <#list list2 as item>
    <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s225">
     <Cell ss:StyleID="s263"><Data ss:Type="String">${item.sampleName}</Data></Cell>