土工平台修改

src/main/java/com/patzn/cloud/service/lims/soil/service/impl/SoilExperimentServiceImpl.java

@@ -736,6 +736,7 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
                             XSSFCell cell101 =   sheet.getRow(10).getCell(1);
                             cell101.setCellFormula("10^(B8*LOG10(25)+B9)");
+                            GenerateChart(sheet,"'界限含水率 (碟式液限仪多点法)'!$D$"+xBegin1+":"+"$D$"+xBegin3,"'界限含水率 (碟式液限仪多点法)'!$J$"+xBegin1+":$J$"+xBegin3);
 
                             xBegin1+=xStep;
                             xBegin2+=xStep;
@@ -1226,12 +1227,12 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
 
         XSSFChart chart = drawing.createChart(anchor);
 
-        chart.setTitleText("预选赛项目得分分布图");
+        chart.setTitleText("含水率与击数关系曲线");
         chart.setAutoTitleDeleted(false);
 
         CTChart ctChart = chart.getCTChart();
         ctChart.addNewPlotVisOnly().setVal(true);
-        ctChart.addNewDispBlanksAs().setVal(STDispBlanksAs.Enum.forInt(2));
+        ctChart.addNewDispBlanksAs().setVal(STDispBlanksAs.GAP);
         ctChart.addNewShowDLblsOverMax().setVal(false);
 
 
@@ -1252,6 +1253,16 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         ctCatAx.addNewCrossAx().setVal(123457);
         ctCatAx.addNewTickLblPos().setVal(STTickLblPos.NEXT_TO);
 
+        CTTitle title =ctCatAx.addNewTitle();
+        CTTx tx = title.addNewTx();
+        CTTextBody rich = tx.addNewRich();
+        rich.addNewBodyPr();  // body properties must exist, but can be empty
+        CTTextParagraph para = rich.addNewP();
+        CTRegularTextRun r = para.addNewR();
+        r.setT("击数（N）次");
+        ctCatAx.setTitle(title);
+
+
 
         CTValAx ctValAx = ctPlotArea.addNewValAx();
         ctValAx.addNewAxId().setVal(123457);
@@ -1261,6 +1272,15 @@ public class SoilExperimentServiceImpl extends BaseServiceImpl<SoilExperimentMap
         ctValAx.addNewAxPos().setVal(STAxPos.B);
         ctValAx.addNewCrossAx().setVal(123456);
 
+        CTTitle ctTitleY =   ctValAx.addNewTitle();
+        CTTx txY = ctTitleY.addNewTx();
+        CTTextBody richY = txY.addNewRich();
+        richY.addNewBodyPr();
+        CTTextParagraph paragraphY= richY.addNewP();
+        CTRegularTextRun runY=   paragraphY.addNewR();
+        runY.setT("含水率WL(L下角标)（%）");
+        ctValAx.setTitle(ctTitleY);
+
         CTShapeProperties ctShapeProperties = ctValAx.addNewMajorGridlines().addNewSpPr();
         CTLineProperties ctLineProperties = ctShapeProperties.addNewLn();
         ctLineProperties.setW(9525);

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;
 import com.patzn.cloud.service.soil.vo.SoilItemVO;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.CellType;
 import org.apache.poi.ss.usermodel.DataFormatter;
 import org.apache.poi.ss.usermodel.FormulaEvaluator;
 import org.apache.poi.xssf.usermodel.XSSFCell;
@@ -386,7 +387,14 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                     Integer itemValueIndex = collectEntity.getItemMegerRow();
                     if (null == itemValueIndex || itemValueIndex ==sampleMergerNum){
                         XSSFCell itemCell = xssfRow.getCell(collectEntity.getColumnPlace());
-                        String value = formatter.formatCellValue(itemCell, evaluator);
+                        String value = "";
+                        if (itemCell.getCellType().equals(CellType.FORMULA)){
+                            value =  HSSFWorkbookUtil.getJavaValue(itemCell).toString();
+                        }else {
+                            value = formatter.formatCellValue(itemCell, evaluator);
+                        }
+
+
                         String itemName = collectEntity.getItemName();
                         if (StringUtils.isBlank(value)){
                             continue;
@@ -426,7 +434,12 @@ public class SoilOriginalTemplateServiceImpl extends BaseServiceImpl<SoilOrigina
                                 if (null == itemCell){
                                     continue;
                                 }
-                                String value = formatter.formatCellValue(itemCell, evaluator);
+                                String value = "";
+                                if (itemCell.getCellType().equals(CellType.FORMULA)){
+                                    value =  HSSFWorkbookUtil.getJavaValue(itemCell).toString();
+                                }else {
+                                    value = formatter.formatCellValue(itemCell, evaluator);
+                                }
 
 
                                 String itemName = collectEntity.getItemName();