设备维护--设备报表，表头顺序混乱的bug

src/main/java/org/rcisoft/business/device/report/dao/ReportRepository.java

@@ -22,8 +22,8 @@ public interface ReportRepository {
      */
     @Select("<script>select b.DEV_NUM,b.DEV_NM,bp.PARAM,dp.P_SOURCE,dp.PARAM_NM " +
             "from bus_device_param bp,bus_devicetp_param dp,bus_device b " +
-            "where bp.PARAM_CODE=dp.PARAM_CODE and b.PRO_ID=dp.PRO_ID and bp.DEV_NUM=b.DEV_NUM and b.PRO_ID=#{proId}" +
-            "order by b.DEV_NUM,dp.P_SOURCE</script>")
+            "where bp.PARAM_CODE=dp.PARAM_CODE and b.PRO_ID=dp.PRO_ID and bp.DEV_NUM=b.DEV_NUM and b.PRO_ID=#{proId} " +
+            "order by b.DEV_NUM,dp.P_SOURCE,bp.PARAM</script>")
     @ResultMap(value = "report")
     List<Report> reportList(Params params);
 

src/main/java/org/rcisoft/business/device/report/service/impl/ReportServiceImpl.java

@@ -157,7 +157,7 @@ public class ReportServiceImpl implements ReportService {
                     row.createCell(size + 1, CellType.STRING).setCellValue(original.getElec());
                     row.createCell(size + 2, CellType.STRING).setCellValue(original.getGas());
                     //用完删除当前行的数据
-                    originalList.remove(i--);
+//                    originalList.remove(i--);
                 }
             }
         });

src/main/resources/logback-spring.xml

@@ -24,7 +24,7 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径-->
-            <fileNamePattern>/zhny/logs/info.%d.log</fileNamePattern>
+            <fileNamePattern>/home/zhny/logs/info.%d.log</fileNamePattern>
         </rollingPolicy>
     </appender>
 
@@ -45,7 +45,7 @@
         <!--滚动策略-->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--路径-->
-            <fileNamePattern>/zhny/logs/error.%d.log</fileNamePattern>
+            <fileNamePattern>/home/zhny/logs/error.%d.log</fileNamePattern>
         </rollingPolicy>
     </appender>
     <!--
@@ -64,7 +64,7 @@
     </springProfile>
 
     <springProfile name="prod">
-        <root level="info">
+        <root level="warn">
             <appender-ref ref="consoleLog" />
             <appender-ref ref="fileInfoLog" />
             <appender-ref ref="fileErrorLog" />