Skip to content

T
tianjin-cement
Commit 533d6841 authored by 竹天卫's avatar 竹天卫
Browse files
Options

启动profile修复2

parent cdd13688
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 242 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java
View file @ 533d6841
......@@ -112,13 +112,15 @@ public class ReportController {
//煤的工业分析
List<IndustrialReport> list3 = iEntrustService.getIndustrialList(entrustId);
beanParams.put("list3", list3);
//工艺性能
List<CraftReport> list4 = iEntrustService.getCraftList(entrustId);
beanParams.put("list4", list4);
//物理性能
//颗粒分析
......
cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java
View file @ 533d6841
......@@ -40,9 +40,9 @@ public class WeiXinController {
log.debug("=============================================");
try {
//测试服务器
return weiXinService.getTestToken(code);
// return weiXinService.getTestToken(code);
//正式服务器
// return weiXinService.getToken(code, "APP");
return weiXinService.getToken(code, "APP");
} catch (Exception e) {
log.debug("获取登录token{}", e);
}
......@@ -54,9 +54,9 @@ public class WeiXinController {
public BaseResponse getPCToken(String code) {
try {
//测试服务器
return weiXinService.getTestToken(code);
// return weiXinService.getTestToken(code);
//正式服务器
// return weiXinService.getToken(code, "PC");
return weiXinService.getToken(code, "PC");
} catch (Exception e) {
log.debug("获取登录token{}", e);
}
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ 533d6841
......@@ -5070,7 +5070,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
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)){
if(StringUtils.isNotBlank(gyfxLastResult) && gyfxLastResult.contains("=")){
Map<String,String> gyfxMap = splitLastResult(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"));
......@@ -5089,7 +5089,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//可磨性结果拆分
String kmLastResult = reportMap.get(ElementKey.Km.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Km.getKey()).getLastResult())?"":reportMap.get(ElementKey.Km.getKey()).getLastResult();
if(StringUtils.isNotBlank(kmLastResult)){
if(StringUtils.isNotBlank(kmLastResult) && kmLastResult.contains("=")){
Map<String,String> kmMap = splitLastResult(kmLastResult);
report.setHgi(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("HGI")) ?"—":kmMap.get("HGI"));
report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("出样率(%)")) ?"—":kmMap.get("出样率(%)"));
......@@ -5141,7 +5141,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//易磨性结果拆分
String ymxLastResult = reportMap.get(ElementKey.Ymx.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Ymx.getKey()).getLastResult())?"":reportMap.get(ElementKey.Ymx.getKey()).getLastResult();
if(StringUtils.isNotBlank(ymxLastResult)){
if(StringUtils.isNotBlank(ymxLastResult) && ymxLastResult.contains("=")){
Map<String,String> ymxMap = splitLastResult(ymxLastResult);
report.setMjt(ymxMap==null || org.springframework.util.StringUtils.isEmpty(ymxMap.get("易磨性(MJ/t)")) ?"—":ymxMap.get("易磨性(MJ/t)"));
report.setKwht(ymxMap==null || org.springframework.util.StringUtils.isEmpty(ymxMap.get("易磨性值")) ?"—":ymxMap.get("易磨性值"));
......@@ -5152,7 +5152,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//磨蚀性结果拆分
String fsxLastResult = reportMap.get(ElementKey.Fsx.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Fsx.getKey()).getLastResult())?"":reportMap.get(ElementKey.Fsx.getKey()).getLastResult();
if(StringUtils.isNotBlank(fsxLastResult)){
if(StringUtils.isNotBlank(fsxLastResult) && fsxLastResult.contains("=")){
Map<String,String> fsxMap = splitLastResult(fsxLastResult);
report.setAi(fsxMap==null || org.springframework.util.StringUtils.isEmpty(fsxMap.get("Ai(g)")) ?"—":fsxMap.get("Ai(g)"));
}else{
......@@ -5161,7 +5161,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//可磨性结果拆分
String kmLastResult = reportMap.get(ElementKey.Km.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Km.getKey()).getLastResult())?"":reportMap.get(ElementKey.Km.getKey()).getLastResult();
if(StringUtils.isNotBlank(kmLastResult)){
if(StringUtils.isNotBlank(kmLastResult) && kmLastResult.contains("=")){
Map<String,String> kmMap = splitLastResult(kmLastResult);
report.setHgi(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("HGI")) ?"—":kmMap.get("HGI"));
report.setCyl(kmMap==null || org.springframework.util.StringUtils.isEmpty(kmMap.get("出样率(%)")) ?"—":kmMap.get("出样率(%)"));
......@@ -5172,7 +5172,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
//辊磨结果拆分
String gmLastResult = reportMap.get(ElementKey.Gm.getKey())==null || org.springframework.util.StringUtils.isEmpty(reportMap.get(ElementKey.Gm.getKey()).getLastResult())?"":reportMap.get(ElementKey.Gm.getKey()).getLastResult();
if(StringUtils.isNotBlank(gmLastResult)){
if(StringUtils.isNotBlank(gmLastResult) && gmLastResult.contains("=")){
Map<String,String> gmMap = splitLastResult(gmLastResult);
report.setTmf(gmMap==null || org.springframework.util.StringUtils.isEmpty(gmMap.get("TMF")) ?"—":gmMap.get("TMF"));
report.setTwf(gmMap==null || org.springframework.util.StringUtils.isEmpty(gmMap.get("TWF(kg/t)")) ?"—":gmMap.get("TWF(kg/t)"));
......
cement-business/src/main/resources/templates/report_new.ftl
View file @ 533d6841
......@@ -4791,233 +4791,98 @@
<Cell ss:StyleID="s279"/>
<Cell ss:StyleID="s279"/>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<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="s302"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s302"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s303"><NamedCell ss:Name="_FilterDatabase"/><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s304"><NamedCell ss:Name="_FilterDatabase"/><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s304"><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="s305"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s302"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s302"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s305"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s302"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s302"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s305"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><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="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><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="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><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="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><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="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><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="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><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="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><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="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s263"><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="s263"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s307"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s308"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s307"><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>
</Row>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s248"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s309"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s310"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s310"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s304"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s234"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s311"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s312"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s311"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s305"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s305"><NamedCell ss:Name="Print_Area"/></Cell>
</Row>
<!-- 工艺性能 13行-->
<#--如果list4不为空-->
<#if list4??>
<!-- <#list list4 as item4> -->
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.sampleName}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.sampleForm}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.sampleCode}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.weight}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.cementCode}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.mjt}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.kwht}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.ai}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.hgi}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.cyl}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.tmf}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.twf}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.fcao1350}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.fcao1400}</Data></Cell>
<Cell ss:StyleID="s263"><Data ss:Type="String">${item4.fcao1450}</Data></Cell>
</Row>
<!-- </#list> -->
<Row ss:AutoFitHeight="0" >
<Cell ss:MergeAcross="14" ss:StyleID="m1898249065096"><Data ss:Type="String">以下空白</Data><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s397"/>
</Row>
<#if list4?size lte 12>
<#list 1..(list4?size+1 - 12) as i>
<Row ss:AutoFitHeight="0" ss:StyleID="s279">
<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="s302"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s302"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s303"><NamedCell ss:Name="_FilterDatabase"/><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s304"><NamedCell ss:Name="_FilterDatabase"/><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
</Row>
</#list>
</#if>
</#if>
<#--如果list4空-->
<#if ! list4??>
<Row ss:AutoFitHeight="0" >
<Cell ss:MergeAcross="14" 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:StyleID="s279">
<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="s302"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s302"><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s303"><NamedCell ss:Name="_FilterDatabase"/><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s304"><NamedCell ss:Name="_FilterDatabase"/><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="s248"><NamedCell ss:Name="Print_Area"/></Cell>
</Row>
</#list>
</#if>
<Row ss:AutoFitHeight="0" ss:Height="25.5" ss:StyleID="s279">
<Cell ss:MergeAcross="14" ss:StyleID="m2194692796932"><Data ss:Type="String">注：出样率小于 45% 时，可磨性结果仅供参考。</Data><NamedCell
ss:Name="Print_Area"/></Cell>
</Row>
<Row ss:AutoFitHeight="0">
<Cell ss:Index="16" ss:StyleID="s279"/>
<Cell ss:StyleID="s279"/>
......@@ -5133,7 +4998,7 @@
<Cell ss:StyleID="s330"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s289"><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[-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">第4页 </Data><NamedCell
ss:Name="Print_Area"/></Cell>
......@@ -5519,7 +5384,7 @@
<Cell ss:StyleID="s354"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s355"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s355"><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">第5页 </Data><NamedCell
ss:Name="Print_Area"/></Cell>
......@@ -6365,7 +6230,7 @@
<Cell ss:StyleID="s63"><NamedCell ss:Name="Print_Area"/></Cell>
<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">第9页 </Data><NamedCell
<Cell ss:StyleID="s291"><Data ss:Type="String">第8页 </Data><NamedCell
ss:Name="Print_Area"/></Cell>
</Row>
<Row ss:AutoFitHeight="0" ss:Height="25.5">
......@@ -6653,8 +6518,8 @@
<Cell ss:StyleID="s443"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s443"><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:MergeAcross="1" ss:StyleID="s445" ss:Formula="=首页!R[-2]C[-5]"><Data
ss:Type="String">共2页 </Data><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s447"><Data ss:Type="String">第3页 </Data><NamedCell
ss:Type="String">共9页 </Data><NamedCell ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s447"><Data ss:Type="String">第9页 </Data><NamedCell
ss:Name="Print_Area"/></Cell>
</Row>
<Row ss:AutoFitHeight="0" ss:Height="40.5">
......@@ -7332,7 +7197,7 @@
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s464"><Data ss:Type="String">≤600</Data><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:MergeAcross="5" ss:StyleID="s484"><Data ss:Type="String">—</Data><NamedCell
<Cell ss:MergeAcross="5" ss:StyleID="m2194692805936"><Data ss:Type="String">—</Data><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s354"/>
<Cell ss:StyleID="s354"/>
......@@ -7397,7 +7262,7 @@
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s464"><Data ss:Type="String">—</Data><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:MergeAcross="5" ss:StyleID="s484"><Data ss:Type="String">—</Data><NamedCell
<Cell ss:MergeAcross="5" ss:StyleID="m2194692805936"><Data ss:Type="String">—</Data><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s492"/>
<Cell ss:StyleID="s217"/>
......@@ -7420,7 +7285,7 @@
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s464"><Data ss:Type="String">—</Data><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:MergeAcross="5" ss:StyleID="s484"><Data ss:Type="String">—</Data><NamedCell
<Cell ss:MergeAcross="5" ss:StyleID="m2194692805936"><Data ss:Type="String">—</Data><NamedCell
ss:Name="Print_Area"/></Cell>
<Cell ss:StyleID="s492"/>
<Cell ss:StyleID="s400"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment