新增 样品校验优化

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

@@ -107,9 +107,8 @@ public class ReportController {
         List<TenElementReport> list1 = iEntrustService.getTen1List(entrustId);
         beanParams.put("list1", list1);
 
-
         //十元素2导出
-        List<TenElementReport> list2 = new ArrayList<>();
+        List<TenElementReport> list2 = iEntrustService.getTen2List(entrustId);
         beanParams.put("list2", list2);
 
 

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

@@ -25,7 +25,7 @@ public interface SampleCheckMapper extends BaseMapper<SampleCheck> {
 	 * @param entrustId 项目id
 	 * @return SixElementReport
 	 */
-	List<TenElementReport> getSampleTenElementCheck(@Param("entrustId") Integer entrustId, @Param("teamNames") Set<String> teamNames);
+	List<TenElementReport> getSampleElementCheck(@Param("entrustId") Integer entrustId, @Param("teamNames") Set<String> teamNames);
 
 	/**
 	 * 获取样品工业检测结果

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="getSampleTenElementCheck" resultType="cn.wise.sc.cement.business.model.TenElementReport">
+    <select id="getSampleElementCheck" resultType="cn.wise.sc.cement.business.model.TenElementReport">
         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

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

 package cn.wise.sc.cement.business.model;
 
 /**
- * @description: 十元素1检测结果中的key
+ * @description: 十元素检测结果中的key
  * @author: qh
  * @create: 2020-10-15 14:03
  **/
 public enum TenElementKey {
 
-	//十元素1key
+	//十元素key
 	LOI("L.O.I"),
 	SiO2("SiO<sub>2</sub>"),
 	Al2O3AndTiO2("Al<sub>2</sub>O<sub>3</sub>+TiO<sub>2</sub>"),
@@ -18,7 +18,15 @@ public enum TenElementKey {
 	Na2O("Na<sub>2</sub>O"),
 	SO3("SO<sub>3</sub>"),
 	Cl("Cl<sup>-</sup>"),
-	FSiO2("f-SiO<sub>2</sub>");
+	FSiO2("f-SiO<sub>2</sub>"),
+	Al2O3("Al<sub>2</sub>O<sub>3</sub>"),
+	TiO2("TiO<sub>2</sub>"),
+	MnO("MnO"),
+
+
+
+
+	;
 
 	private String key;
 

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * @description: 六元素检测报告
+ * @description: 十元素检测报告
  * @author: ztw
  * @create: 2020-10-15 12:24
  **/
@@ -62,10 +62,10 @@ public class TenElementReport implements Serializable {
      */
     private String lastResult;
 
-    //下面为十元素1
+    //下面为十元素1 十元素2共有的
     private String loi ="";
     private String sio2 ="";
-    private String al2o3AndTio2 ="";
+
     private String fe2o3 ="";
     private String cao ="";
     private String mgo ="";
@@ -73,7 +73,14 @@ public class TenElementReport implements Serializable {
     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

@@ -140,6 +140,7 @@ public interface IEntrustService extends IService<Entrust> {
 
 	List<TenElementReport> getTen1List(Integer entrustId);
 
+	List<TenElementReport> getTen2List(Integer entrustId);
 
 
 

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

@@ -6222,7 +6222,7 @@
     <Cell ss:MergeAcross="16" ss:StyleID="s223"><NamedCell ss:Name="Print_Area"/></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="43.5">
-    <Cell ss:MergeAcross="15" ss:StyleID="s227"><Data ss:Type="String">检  测  报  告1</Data><NamedCell
+    <Cell ss:MergeAcross="15" ss:StyleID="s227"><Data ss:Type="String">检  测  报  告</Data><NamedCell
              ss:Name="Print_Area"/></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="15">
@@ -6247,9 +6247,9 @@
     <Cell ss:StyleID="s63"><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s425"><NamedCell ss:Name="Print_Area"/></Cell>
     <Cell ss:StyleID="s63"><NamedCell ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s290" ss:Formula="=首页!R[-2]C[-13]"><Data ss:Type="String">共2页 </Data><NamedCell
+    <Cell ss:StyleID="s290" ss:Formula="=首页!R[-2]C[-13]"><Data ss:Type="String">共9页 </Data><NamedCell
       ss:Name="Print_Area"/></Cell>
-    <Cell ss:StyleID="s291"><Data ss:Type="String">第3页 </Data><NamedCell
+    <Cell ss:StyleID="s291"><Data ss:Type="String">第9页 </Data><NamedCell
       ss:Name="Print_Area"/></Cell>
    </Row>
    <Row ss:AutoFitHeight="0" ss:Height="25.5">
@@ -6315,11 +6315,11 @@
     <Cell ss:StyleID="s264"><Data ss:Type="String">${item.cao}</Data></Cell>
     <Cell ss:StyleID="s264"><Data ss:Type="String">${item.mgo}</Data></Cell>
     <Cell ss:StyleID="s264"><Data ss:Type="String">${item.tio2}</Data></Cell>
-    <Cell ss:StyleID="s264"><Data ss:Type="String">-</Data></Cell>
-    <Cell ss:StyleID="s264"><Data ss:Type="String">-</Data></Cell>
+    <Cell ss:StyleID="s264"><Data ss:Type="String">${item.k2o}</Data></Cell>
+    <Cell ss:StyleID="s264"><Data ss:Type="String">${item.na2o}</Data></Cell>
     <Cell ss:StyleID="s264"><Data ss:Type="String">${item.so3}</Data></Cell>
     <Cell ss:StyleID="s265"><Data ss:Type="String">${item.cl}</Data></Cell>
-    <Cell ss:StyleID="s248"><Data ss:Type="String">-</Data></Cell>
+    <Cell ss:StyleID="s248"><Data ss:Type="String">${item.mno}</Data></Cell>
    </Row>
   </#list>
    <Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s223">