Skip to content

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

新增 样品校验优化

parent da3c172a
Show whitespace changes
Inline Side-by-side
Showing with 114 additions and 43 deletions
cement-business/src/main/java/cn/wise/sc/cement/business/controller/ReportController.java
View file @ 7d9c3fe8
......@@ -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
View file @ 7d9c3fe8
......@@ -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
View file @ 7d9c3fe8
......@@ -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
View file @ 7d9c3fe8
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
View file @ 7d9c3fe8
......@@ -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
View file @ 7d9c3fe8
......@@ -140,6 +140,7 @@ public interface IEntrustService extends IService<Entrust> {
List<TenElementReport> getTen1List(Integer entrustId);
List<TenElementReport> getTen2List(Integer entrustId);
......
cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/EntrustServiceImpl.java
View file @ 7d9c3fe8
......@@ -294,21 +294,9 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
Entrust entrust = new Entrust();
BeanUtils.copyProperties(query, entrust);
//生成委托编号
// String entrustCode = commonService.createNo("WT", entrustMapper.counts());
entrust.setEntrustCode(null)
.setUserId(loginUser.getId())
.setStatus(0)
.setIsDelete(1)
.setIsHandle(0)
.setIsDistribution(0)
.setCreateTime(LocalDateTime.now())
.setUpdateTime(entrust.getCreateTime())
.setSampleNum(query.getSampleTmpList().size())
.setIsTop(0);
//对样品进行过校验
if (query.getSampleTmpList() != null && query.getSampleTmpList().size() > 0) {
List<SampleTmp> sampleTmpList = new ArrayList<>();
for (SampleTmpQuery sampleTmpQuery : query.getSampleTmpList()) {
if (StringUtils.isEmpty(sampleTmpQuery.getName())) {
return BaseResponse.errorMsg("请填写样品名");
......@@ -331,6 +319,24 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
if (StringUtils.isEmpty(sampleTmpQuery.getOrigin())) {
return BaseResponse.errorMsg("请选择样品产地");
}
}
}
//生成委托编号
// String entrustCode = commonService.createNo("WT", entrustMapper.counts());
entrust.setEntrustCode(null)
.setUserId(loginUser.getId())
.setStatus(0)
.setIsDelete(1)
.setIsHandle(0)
.setIsDistribution(0)
.setCreateTime(LocalDateTime.now())
.setUpdateTime(entrust.getCreateTime())
.setSampleNum(query.getSampleTmpList().size())
.setIsTop(0);
entrustMapper.insert(entrust);
if (query.getSampleTmpList() != null && query.getSampleTmpList().size() > 0) {
List<SampleTmp> sampleTmpList = new ArrayList<>();
for (SampleTmpQuery sampleTmpQuery : query.getSampleTmpList()) {
SampleTmp sampleTmp = new SampleTmp();
BeanUtils.copyProperties(sampleTmpQuery, sampleTmp);
String teamIds = sampleTmpQuery.getTeamIds(); //选择的检测项id集合
......@@ -385,7 +391,7 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
return BaseResponse.errorMsg("样品及检测项不可为空");
}
entrustMapper.insert(entrust);
logsService.saveLog(SysLogs.ObjType.ENTRUST_LOG, entrust.getId(), "提交了委托单", null);
//消息推送
List<Integer> approvalIdList = sysApprovalMapper.getApprovalId("委托评审");
......@@ -1287,18 +1293,18 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
for(Map.Entry<Integer,List<TenElementReport>> entry : groupBySample.entrySet()){
TenElementReport first = entry.getValue().get(0);
Map<String,TenElementReport> sixElementReportMap = entry.getValue().stream().collect(Collectors.toMap(TenElementReport::getTeamName, item -> item));
first.setLoi(sixElementReportMap.get(TenElementKey.LOI.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.LOI.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.LOI.getKey()).getLastResult());
first.setSio2(sixElementReportMap.get(TenElementKey.SiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.SiO2.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.SiO2.getKey()).getLastResult());
first.setAl2o3AndTio2(sixElementReportMap.get(TenElementKey.Al2O3AndTiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.Al2O3AndTiO2.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.Al2O3AndTiO2.getKey()).getLastResult());
first.setFe2o3(sixElementReportMap.get(TenElementKey.Fe2O3.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.Fe2O3.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.Fe2O3.getKey()).getLastResult());
first.setCao(sixElementReportMap.get(TenElementKey.CaO.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.CaO.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.CaO.getKey()).getLastResult());
first.setMgo(sixElementReportMap.get(TenElementKey.MgO.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.MgO.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.MgO.getKey()).getLastResult());
first.setK2o(sixElementReportMap.get(TenElementKey.K2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.K2O.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.K2O.getKey()).getLastResult());
first.setNa2o(sixElementReportMap.get(TenElementKey.Na2O.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.Na2O.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.Na2O.getKey()).getLastResult());
first.setSo3(sixElementReportMap.get(TenElementKey.SO3.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.SO3.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.SO3.getKey()).getLastResult());
first.setCl(sixElementReportMap.get(TenElementKey.Cl.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.Cl.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.Cl.getKey()).getLastResult());
first.setFsio2(sixElementReportMap.get(TenElementKey.FSiO2.getKey())==null || org.springframework.util.StringUtils.isEmpty(sixElementReportMap.get(TenElementKey.FSiO2.getKey()).getLastResult()) ?"—":sixElementReportMap.get(TenElementKey.FSiO2.getKey()).getLastResult());
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
......@@ -1322,12 +1328,62 @@ public class EntrustServiceImpl extends ServiceImpl<EntrustMapper, Entrust> impl
list.add("SO<sub>3</sub>");
list.add("Cl<sup>-</sup>");
list.add("f-SiO<sub>2</sub>");
return sampleCheckMapper.getSampleTenElementCheck(entrustId, list);
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);
}
......
cement-business/src/main/resources/templates/report_new.ftl
View file @ 7d9c3fe8
......@@ -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">
......
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