LY

master/src/main/java/com/ruoyi/common/utils/file/ExcelUtils.java

@@ -89,7 +89,7 @@ public class ExcelUtils {
                     cellValue =  new SimpleDateFormat("yyyy-MM-dd").format(cell.getDateCellValue());
                 }else if("@".equals(cell.getCellStyle().getDataFormatString())){
                     cellValue = cell.getNumericCellValue() + "";
-                }else if(cell.getCellStyle().getDataFormatString().indexOf("0.0") > -1){
+                }else if(cell.getCellStyle().getDataFormatString().indexOf("0_") > -1){
                     //数字非日期
                     System.out.println("Excel值："+ cell.getNumericCellValue());
                     cellValue = cell.getNumericCellValue() + "";

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code asc , d.docno
+        order by d.plant_code asc , d.id
     </select>
 
     <select id="selectTSpecdevCcListByYear" parameterType="TSpecdevCc" resultMap="TSpecdevCcResult">

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit ,d.devno
+        order by d.plant_code, d.unit ,d.id
     </select>
 
     <select id="selectTSpecdevDtListByYear" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.devno
+        order by d.plant_code, d.unit, d.id
     </select>
     <select id="selectTSpecdevDzsbListByYear" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
         <include refid="selectTSpecdevDzsbVo"/>

master/src/main/resources/mybatis/sems/TSpecdevGlMapper.xml

@@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.devno
+        order by d.plant_code, d.unit, d.id
     </select>
 
     <select id="selectTSpecdevGlListByYear" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">

master/src/main/resources/mybatis/sems/TSpecdevYlgdMapper.xml

@@ -164,7 +164,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.devno
+        order by d.plant_code, d.unit, d.id
     </select>
 
 

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -137,7 +137,7 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScopePlant}
-        order by d.plant_code, d.unit, d.devno
+        order by d.plant_code, d.unit, d.id
     </select>
 
     <select id="selectTSpecdevYlrqListByYear" parameterType="TSpecdevYlrq" resultMap="TSpecdevYlrqResult">