Skip to content

P
patzn-cloud-service-soil
Commit 39650c16 by wangweidong
Options

土工平台修改

parent a742dba5
Showing with 103 additions and 24 deletions
src/main/java/com/patzn/cloud/service/lims/collect/core/CollectDataType.java
...@@ -16,7 +16,8 @@ public class CollectDataType { ...@@ -16,7 +16,8 @@ public class CollectDataType {
private String ipAddress; private String ipAddress;
//采集命令 //采集命令
private String acquisitionCommand; private String acquisitionCommand;
//
private String boreholeName;
...@@ -148,4 +149,12 @@ public class CollectDataType { ...@@ -148,4 +149,12 @@ public class CollectDataType {
public void setSiteNo(String siteNo) { public void setSiteNo(String siteNo) {
this.siteNo = siteNo; this.siteNo = siteNo;
} }
public String getBoreholeName() {
return boreholeName;
}
public void setBoreholeName(String boreholeName) {
this.boreholeName = boreholeName;
}
} }
src/main/java/com/patzn/cloud/service/lims/collect/handle/PngReportHandle.java
...@@ -55,7 +55,6 @@ public class PngReportHandle implements ICollectHandler { ...@@ -55,7 +55,6 @@ public class PngReportHandle implements ICollectHandler {
for (SmbFile smbFile:list) { for (SmbFile smbFile:list) {
String name = StringHandleUtils.getFileNameNoEx(smbFile.getName()); String name = StringHandleUtils.getFileNameNoEx(smbFile.getName());
name = name.replace(request.getExperiment(),"");
if (!name.equals(checkNameSiteNo)&&!name.equals(checkNameSampleCode)){ if (!name.equals(checkNameSiteNo)&&!name.equals(checkNameSampleCode)){
continue; continue;
} }
......
src/main/java/com/patzn/cloud/service/lims/collect/handle/WuCollectHandle.java
...@@ -18,6 +18,7 @@ public class WuCollectHandle implements ICollectHandler { ...@@ -18,6 +18,7 @@ public class WuCollectHandle implements ICollectHandler {
String collectionAddress = request.getCollectionAddress(); String collectionAddress = request.getCollectionAddress();
String acquisitionCommand = request.getAcquisitionCommand(); String acquisitionCommand = request.getAcquisitionCommand();
String entrustCode = request.getEntrustCode(); String entrustCode = request.getEntrustCode();
String boreholeName = request.getBoreholeName();
String sampleCode = request.getSampleCode(); String sampleCode = request.getSampleCode();
String expName = request.getExperiment(); String expName = request.getExperiment();
String siteNo = request.getSiteNo(); String siteNo = request.getSiteNo();
...@@ -36,7 +37,7 @@ public class WuCollectHandle implements ICollectHandler { ...@@ -36,7 +37,7 @@ public class WuCollectHandle implements ICollectHandler {
} }
SmbFile[] list=null; SmbFile[] list=null;
try { try {
list= getShareFiles(collectionAddress+entrustCode+"/"); list= getShareFiles(collectionAddress+boreholeName+"/");
}catch (Exception e){ }catch (Exception e){
logger.error("PngReportHandle.process失败，原因："+e.getMessage()); logger.error("PngReportHandle.process失败，原因："+e.getMessage());
e.printStackTrace(); e.printStackTrace();
......
src/main/java/com/patzn/cloud/service/lims/common/CollectUtil.java
...@@ -127,7 +127,7 @@ public class CollectUtil { ...@@ -127,7 +127,7 @@ public class CollectUtil {
s=s.replace(" ",""); s=s.replace(" ","");
System.out.println(s); System.out.println(s);
if (s.contains("工程编号")){ if (s.contains("钻孔编号")){
String [] gcbhs = s.split(":"); String [] gcbhs = s.split(":");
if (gcbhs.length>1){ if (gcbhs.length>1){
gcbh = gcbhs[1].trim(); gcbh = gcbhs[1].trim();
......
src/main/java/com/patzn/cloud/service/lims/common/HSSFWorkbookUtil.java
...@@ -192,7 +192,7 @@ public class HSSFWorkbookUtil { ...@@ -192,7 +192,7 @@ public class HSSFWorkbookUtil {
o = cell.getStringCellValue(); o = cell.getStringCellValue();
} catch (IllegalStateException e) { } catch (IllegalStateException e) {
try { try {
o = cell.getRichStringCellValue().toString(); o = String.valueOf(cell.getNumericCellValue());
} catch (IllegalStateException e2) { } catch (IllegalStateException e2) {
o =""; o ="";
} }
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilEntrustServiceImpl.java
...@@ -44,6 +44,7 @@ import com.patzn.cloud.service.soil.vo.SoilSampleVO; ...@@ -44,6 +44,7 @@ import com.patzn.cloud.service.soil.vo.SoilSampleVO;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.format.CellFormat;
import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.BorderStyle;
import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.CellStyle;
import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.HorizontalAlignment;
...@@ -1759,7 +1760,14 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S ...@@ -1759,7 +1760,14 @@ public class SoilEntrustServiceImpl extends BaseServiceImpl<SoilEntrustMapper, S
continue; continue;
} }
XSSFCell cell= row.getCell(j); XSSFCell cell= row.getCell(j);
String cellValue = HSSFWorkbookUtil.getJavaValue(cell).toString().trim(); String cellValue = null;
try {
cellValue= CellFormat.getInstance(cell.getCellStyle().getDataFormatString()).apply(cell).text;
}catch (Exception e){
cellValue = HSSFWorkbookUtil.getJavaValue(cell).toString().trim();
}
if (StringUtils.isBlank(cellValue)){ if (StringUtils.isBlank(cellValue)){
continue; continue;
} }
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentRelEquipServiceImpl.java
...@@ -121,6 +121,7 @@ public class SoilExperimentRelEquipServiceImpl extends BaseServiceImpl<SoilExper ...@@ -121,6 +121,7 @@ public class SoilExperimentRelEquipServiceImpl extends BaseServiceImpl<SoilExper
collectDataType.setLabNum(equip.getLabNum()); collectDataType.setLabNum(equip.getLabNum());
collectDataType.setType(equip.getCollectionType()); collectDataType.setType(equip.getCollectionType());
collectDataType.setSampleCode(experimentVO.getSampleCode()); collectDataType.setSampleCode(experimentVO.getSampleCode());
collectDataType.setBoreholeName(experimentVO.getBoreholeName());
collectDataType.setSiteNo(experimentVO.getSiteNo()); collectDataType.setSiteNo(experimentVO.getSiteNo());
collectDataType.setEntrustCode(experimentVO.getEntrustCode()); collectDataType.setEntrustCode(experimentVO.getEntrustCode());
collectDataType.setExpId(equip.getExpId()); collectDataType.setExpId(equip.getExpId());
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java
...@@ -1208,11 +1208,14 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1208,11 +1208,14 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
sheet = xssfWorkbook.cloneSheet(0,sheetMy.getSheetName()+(templateSheetMum)); sheet = xssfWorkbook.cloneSheet(0,sheetMy.getSheetName()+(templateSheetMum));
} }
Map<String,String> mapReplaceMy = new HashMap<>(); Map<String,String> mapReplaceMy = new HashMap<>();
mapReplaceMy.put("#{reportCode}",entrust.getEntrustCode());
for (int i = 0; i < templateSampleNum; i++) { for (int i = 0; i < templateSampleNum; i++) {
mapReplaceMy.put("#{sampleCode"+i+"}",""); mapReplaceMy.put("#{sampleCode"+i+"}","");
mapReplaceMy.put("#{sampleDepth"+i+"}",""); mapReplaceMy.put("#{sampleDepth"+i+"}","");
mapReplaceMy.put("#{含水率"+i+"}",""); mapReplaceMy.put("#{含水率"+i+"}","");
mapReplaceMy.put("#{容重9.81"+i+"}",""); mapReplaceMy.put("#{容重9.81"+i+"}","");
mapReplaceMy.put("#{密度9.81"+i+"}","");
} }
mapReplaceMy.put("#{projectName}",entrust.getProjectName()); mapReplaceMy.put("#{projectName}",entrust.getProjectName());
...@@ -1229,6 +1232,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1229,6 +1232,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
mapReplaceMy.put("#{sampleCode"+j+"}",StringHandleUtils.getString(vo.getSampleCode())); mapReplaceMy.put("#{sampleCode"+j+"}",StringHandleUtils.getString(vo.getSampleCode()));
mapReplaceMy.put("#{sampleDepth"+j+"}",StringHandleUtils.getString(vo.getSampleDepth())); mapReplaceMy.put("#{sampleDepth"+j+"}",StringHandleUtils.getString(vo.getSampleDepth()));
mapReplaceMy.put("#{siteNo"+j+"}",StringHandleUtils.getString(vo.getSiteNo()));
List<SoilItemVO> itemVOList = sampleSoilItemVOMap.get(vo.getSampleId()); List<SoilItemVO> itemVOList = sampleSoilItemVOMap.get(vo.getSampleId());
if (CollectionUtils.isNotEmpty(itemVOList)){ if (CollectionUtils.isNotEmpty(itemVOList)){
...@@ -1257,6 +1261,34 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1257,6 +1261,34 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
} }
if (!mapReplaceMy.containsKey("#{密度}")){
mapReplaceMy.put("#{密度}","");
mapReplaceMy.put("#{密度9.81}","");
mapReplaceMy.put("#{密度"+j+"}","");
mapReplaceMy.put("#{密度9.81"+j+"}","");
}else{
String midu = mapReplaceMy.get("#{密度}");
if (StringUtils.isBlank(midu)){
mapReplaceMy.put("#{密度9.81}","");
mapReplaceMy.put("#{密度9.81"+j+"}","");
}else {
if (StringHandleUtils.validateNumber(midu)){
BigDecimal mi = new BigDecimal(midu);
BigDecimal chengshu = new BigDecimal("9.81");
BigDecimal ji = mi.multiply(chengshu);
mapReplaceMy.put("#{密度9.81}",ji.toString());
mapReplaceMy.put("#{密度9.81"+j+"}",ji.toString());
}else{
mapReplaceMy.put("#{密度9.81}","");
mapReplaceMy.put("#{密度9.81"+j+"}","");
}
}
}
if (!mapReplaceMy.containsKey("#{容重}")){ if (!mapReplaceMy.containsKey("#{容重}")){
mapReplaceMy.put("#{容重}",""); mapReplaceMy.put("#{容重}","");
mapReplaceMy.put("#{容重9.81}",""); mapReplaceMy.put("#{容重9.81}","");
...@@ -1291,6 +1323,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1291,6 +1323,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
int firstSize = firstList.size(); int firstSize = firstList.size();
Map<String,String> mapReplaceMy = new HashMap<>(); Map<String,String> mapReplaceMy = new HashMap<>();
mapReplaceMy.put("#{reportCode}",entrust.getEntrustCode());
for (int i = 0; i < templateSampleNum; i++) { for (int i = 0; i < templateSampleNum; i++) {
mapReplaceMy.put("#{sampleCode"+i+"}",""); mapReplaceMy.put("#{sampleCode"+i+"}","");
mapReplaceMy.put("#{sampleDepth"+i+"}",""); mapReplaceMy.put("#{sampleDepth"+i+"}","");
...@@ -1340,7 +1373,31 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1340,7 +1373,31 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
} }
if (!mapReplaceMy.containsKey("#{密度}")){
mapReplaceMy.put("#{密度}","");
mapReplaceMy.put("#{密度9.81}","");
mapReplaceMy.put("#{密度"+j+"}","");
mapReplaceMy.put("#{密度9.81"+j+"}","");
}else{
String rongzhong = mapReplaceMy.get("#{密度}");
if (StringUtils.isBlank(rongzhong)){
mapReplaceMy.put("#{密度9.81}","");
mapReplaceMy.put("#{密度9.81"+j+"}","");
}else {
if (StringHandleUtils.validateNumber(rongzhong)){
BigDecimal rong = new BigDecimal(rongzhong);
BigDecimal chengshu = new BigDecimal("9.81");
BigDecimal ji = rong.multiply(chengshu);
mapReplaceMy.put("#{密度9.81}",ji.toString());
mapReplaceMy.put("#{密度9.81"+j+"}",ji.toString());
}else{
mapReplaceMy.put("#{密度9.81}","");
mapReplaceMy.put("#{密度9.81"+j+"}","");
}
}
}
if (!mapReplaceMy.containsKey("#{容重}")){ if (!mapReplaceMy.containsKey("#{容重}")){
...@@ -1656,7 +1713,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -1656,7 +1713,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
List<SoilExperimentVO> voList = soilExperimentService.listVOByIds(ids); List<SoilExperimentVO> voList = soilExperimentService.listVOByIds(ids);
boolean chong = "检测报告（力学试验）落锥".equals(template.getName())||"检测报告（力学试验）实验室微型十字板".equals(template.getName()); boolean chong = "检测报告（力学试验）落锥".equals(template.getName())||"检测报告（力学试验）实验室微型十字板".equals(template.getName())||"检测报告（力学试验）无侧限".equals(template.getName());
if (CollectionUtils.isEmpty(voList)){ if (CollectionUtils.isEmpty(voList)){
...@@ -3644,12 +3701,12 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap ...@@ -3644,12 +3701,12 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
} }
for (SoilExperimentCollectDataVO collectDataVO : dataList) { for (SoilExperimentCollectDataVO collectDataVO : dataList) {
RestAssert.fail(StringUtils.isBlank(collectDataVO.getEntrustCode()),"委托编号不能为空！"); RestAssert.fail(StringUtils.isBlank(collectDataVO.getEntrustCode()),"钻孔编号不能为空！");
RestAssert.fail(StringUtils.isBlank(collectDataVO.getSiteNo()),"现场编号不能为空！"); RestAssert.fail(StringUtils.isBlank(collectDataVO.getSiteNo()),"现场编号不能为空！");
RestAssert.fail(StringUtils.isBlank(collectDataVO.getExpName()),"试验项目名称不能为空！"); RestAssert.fail(StringUtils.isBlank(collectDataVO.getExpName()),"试验项目名称不能为空！");
RestAssert.fail(StringUtils.isBlank(collectDataVO.getName()),"指标名称不能为空！"); RestAssert.fail(StringUtils.isBlank(collectDataVO.getName()),"指标名称不能为空！");
RestAssert.fail(StringUtils.isBlank(collectDataVO.getTestValue()),"指标值不能为空！"); RestAssert.fail(StringUtils.isBlank(collectDataVO.getTestValue()),"指标值不能为空！");
RestAssert.fail(!collectDataVO.getEntrustCode().equals(entrust.getEntrustCode()),"委托编号不匹配！"); RestAssert.fail(!collectDataVO.getEntrustCode().equals(entrust.getBoreholeName()),"钻孔编号不匹配！");
} }
......
src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilOriginalTemplateServiceImpl.java
...@@ -15,6 +15,7 @@ import com.patzn.cloud.service.soil.vo.SoilExperimentVO; ...@@ -15,6 +15,7 @@ import com.patzn.cloud.service.soil.vo.SoilExperimentVO;
import com.patzn.cloud.service.soil.vo.SoilItemVO; import com.patzn.cloud.service.soil.vo.SoilItemVO;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.format.CellFormat;
import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.DataFormatter; import org.apache.poi.ss.usermodel.DataFormatter;
import org.apache.poi.ss.usermodel.FormulaEvaluator; import org.apache.poi.ss.usermodel.FormulaEvaluator;
...@@ -321,8 +322,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -321,8 +322,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
for (SoilItemVO soilItemVO:indexList) { for (SoilItemVO soilItemVO:indexList) {
stringMap.put(soilItemVO.getSampleCode()+soilItemVO.getExperimentId()+soilItemVO.getName(),soilItemVO.getId()); stringMap.put(soilItemVO.getSampleCode()+soilItemVO.getExperimentId()+soilItemVO.getName(),soilItemVO.getId());
} }
FormulaEvaluator evaluator = xssfWorkbook.getCreationHelper().createFormulaEvaluator();
DataFormatter formatter = new DataFormatter();
if (null ==moreSheet || 0 == moreSheet){ if (null ==moreSheet || 0 == moreSheet){
int sampleBeginRow = template.getSampleBeginRow(); int sampleBeginRow = template.getSampleBeginRow();
int sampleMergerNum = template.getSampleMergerNum(); int sampleMergerNum = template.getSampleMergerNum();
...@@ -439,7 +439,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -439,7 +439,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
continue; continue;
} }
String valueElse = formatter.formatCellValue(cell, evaluator); String valueElse = CellFormat.getInstance(cell.getCellStyle().getDataFormatString()).apply(cell).text;
if (StringUtils.isNotBlank(valueElse)){ if (StringUtils.isNotBlank(valueElse)){
SoilItemCollectData soilItemCollectData = new SoilItemCollectData(); SoilItemCollectData soilItemCollectData = new SoilItemCollectData();
...@@ -458,13 +458,8 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -458,13 +458,8 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
if (null == itemValueIndex || itemValueIndex ==sampleMergerNum){ if (null == itemValueIndex || itemValueIndex ==sampleMergerNum){
XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace()); XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace());
String value = ""; String value = "";
// if (itemCell.getCellType().equals(CellType.FORMULA)){
// value = HSSFWorkbookUtil.getJavaValue(itemCell).toString();
// }else {
// value = formatter.formatCellValue(itemCell, evaluator);
// }
try { try {
value = formatter.formatCellValue(itemCell, evaluator); value = CellFormat.getInstance(itemCell.getCellStyle().getDataFormatString()).apply(itemCell).text;
}catch (Exception e){ }catch (Exception e){
value = HSSFWorkbookUtil.getJavaValue(itemCell).toString(); value = HSSFWorkbookUtil.getJavaValue(itemCell).toString();
} }
...@@ -525,7 +520,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -525,7 +520,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
} }
String value = ""; String value = "";
try { try {
value = formatter.formatCellValue(itemCell, evaluator); value =CellFormat.getInstance(itemCell.getCellStyle().getDataFormatString()).apply(itemCell).text;
}catch (Exception e){ }catch (Exception e){
value = HSSFWorkbookUtil.getJavaValue(itemCell).toString(); value = HSSFWorkbookUtil.getJavaValue(itemCell).toString();
} }
...@@ -559,9 +554,16 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -559,9 +554,16 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace()); XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace());
String value = null; String value = null;
try { try {
value = formatter.formatCellValue(itemCell, evaluator); value= CellFormat.getInstance(itemCell.getCellStyle().getDataFormatString()).apply(itemCell).text;
}catch (Exception e){ }catch (Exception e){
value =HSSFWorkbookUtil.getCellValue(itemCell).toString();
try {
value = CellFormat.getInstance(itemCell.getCellStyle().getDataFormatString()).apply(itemCell).text;
}catch (Exception w){
value =HSSFWorkbookUtil.getCellValue(itemCell).toString();
}
} }
String itemName = collectEntity.getItemName(); String itemName = collectEntity.getItemName();
if (StringUtils.isBlank(value)){ if (StringUtils.isBlank(value)){
...@@ -765,7 +767,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -765,7 +767,7 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
XSSFCell cellN = valueNRow.getCell(config.getMergeBegin()); XSSFCell cellN = valueNRow.getCell(config.getMergeBegin());
String valueN = null; String valueN = null;
try { try {
valueN = formatter.formatCellValue(cellN, evaluator); valueN = CellFormat.getInstance(cellN.getCellStyle().getDataFormatString()).apply(cellN).text;
}catch (Exception e){ }catch (Exception e){
valueN =HSSFWorkbookUtil.getCellValue(cellN).toString(); valueN =HSSFWorkbookUtil.getCellValue(cellN).toString();
} }
...@@ -837,8 +839,10 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina ...@@ -837,8 +839,10 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
try { try {
value = formatter.formatCellValue(valueCell, evaluator); value= CellFormat.getInstance(valueCell.getCellStyle().getDataFormatString()).apply(valueCell).text;
}catch (Exception e){ }catch (Exception e){
value = HSSFWorkbookUtil.getCellValue(valueCell).toString(); value = HSSFWorkbookUtil.getCellValue(valueCell).toString();
} }
......
src/main/resources/mapper/soil/SoilExperimentMapper.xml
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
<select id="selectListVOByIds" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO"> <select id="selectListVOByIds" resultType="com.patzn.cloud.service.soil.vo.SoilExperimentVO">
SELECT t.id,t.name,t.short_name,s.sample_code,s.site_no,s.sample_depth,s.sample_pack,e.entrust_code,e.id AS "entrustId",e.borehole_name,t.sample_id,t.test_method FROM soil_experiment t SELECT t.id,t.name,t.short_name,s.sample_code,s.site_no,s.sample_depth,s.sample_pack,e.entrust_code,e.borehole_name,e.id AS "entrustId",e.borehole_name,t.sample_id,t.test_method FROM soil_experiment t
JOIN soil_sample s ON t.sample_id = s.id JOIN soil_sample s ON t.sample_id = s.id
JOIN soil_entrust e ON s.entrust_id = e.id JOIN soil_entrust e ON s.entrust_id = e.id
......
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