土工优化

src/main/java/com/patzn/cloud/service/lims/original/OriginalUtil.java

@@ -17,7 +17,7 @@ import java.util.Map;
 
 public final class OriginalUtil {
 
-    public static void doForValue(int sampleMergerNum, XSSFSheet sheetOne, int beginRow, SoilOriginalTemplateConfig config, String name, List<SoilItemVO> soilItemVOS ){
+    public final static void doForValue(int sampleMergerNum, XSSFSheet sheetOne, int beginRow, SoilOriginalTemplateConfig config, String name, List<SoilItemVO> soilItemVOS ){
         if (CollectionUtils.isEmpty(soilItemVOS)){
             return;
         }
@@ -41,7 +41,7 @@ public final class OriginalUtil {
     }
 
 
-    public static boolean skipDoExcel(SoilOriginalTemplateConfig config){
+    public final static boolean skipDoExcel(SoilOriginalTemplateConfig config){
 
            if (StringUtils.isBlank(config.getFormula())||
                    null == config.getColumnPlace()||
@@ -53,7 +53,7 @@ public final class OriginalUtil {
     }
 
 
-    public static boolean skipMerge(SoilOriginalTemplateConfig config){
+    public final static boolean skipMerge(SoilOriginalTemplateConfig config){
 
         if (null == config.getMergeBegin()){
             return true;

src/main/resources/mapper/soil/SoilAppendixMapper.xml

@@ -10,6 +10,7 @@
         a.type,
         a.sample_code,
         a.uname,
+        a.object_key,
         a.ctime,
         a.remark,
         e.borehole_name,

src/main/resources/mapper/soil/SoilExpReportMapper.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="com.patzn.cloud.service.lims.soil.mapper.SoilExpReportMapper">
     <select id="selectVOList" resultType="com.patzn.cloud.service.soil.vo.SoilExpReportVO">
-          SELECT r.id,r.exp_name,r.remark,r.uname,r.ctime,e.borehole_name,e.entrust_code
+          SELECT r.id,r.exp_name,r.remark,r.uname,r.ctime,r.object_key,e.borehole_name,e.entrust_code
           FROM soil_exp_report r JOIN soil_entrust e ON r.entrust_id = e.id
 
           WHERE r.deleted = 0