Merge branch 'main' of http://10.10.14.176:3000/huanghai/YunNanDsBase

src/main/java/com/dsideal/base/Tools/FillData/City/C11.java

@@ -77,10 +77,10 @@ public class C11 {
                     //学前教职工2022基数 小学教职工2022基数 初中教职工2022基数 高中用房2022年基数
                     //取出第一条数据，即2022年数据
                     List<String> firRow = source1.getFirst();
-                    int xqjzgJS = (int) Double.parseDouble(firRow.get(1)) * 10000;//学前教职工2022基数
-                    int xxjzgJS = (int) Double.parseDouble(firRow.get(2)) * 10000;//小学教职工2022基数
-                    int zxjzgJS = (int) Double.parseDouble(firRow.get(3)) * 10000;//初中教职工2022基数
-                    int gxjzgJS = (int) Double.parseDouble(firRow.get(4)) * 10000;//高中教职工2022基数
+                    int xqjzgJS = (int) (Double.parseDouble(firRow.get(1)) * 10000);//学前教职工2022基数
+                    int xxjzgJS = (int) (Double.parseDouble(firRow.get(2)) * 10000);//小学教职工2022基数
+                    int zxjzgJS = (int) (Double.parseDouble(firRow.get(3)) * 10000);//初中教职工2022基数
+                    int gxjzgJS = (int) (Double.parseDouble(firRow.get(4)) * 10000);//高中教职工2022基数
 
 
                     List<List<String>> source2 = ExcelKit.getChartData(file.getAbsolutePath(), secondChartNumber - 1, 1, 10);
@@ -101,10 +101,10 @@ public class C11 {
                         Row outRow = outSheet.createRow(++rowIndex);
 
                         //学前教职工数
-                        int xq_jzgs = (int) Double.parseDouble(r1.get(1)) * 10000;
-                        int xx_jzgs = (int) Double.parseDouble(r1.get(2)) * 10000;
-                        int cz_jzgs = (int) Double.parseDouble(r1.get(3));
-                        int gg_jzgs = (int) Double.parseDouble(r1.get(4));
+                        int xq_jzgs = (int) (Double.parseDouble(r1.get(1)) * 10000);
+                        int xx_jzgs = (int) (Double.parseDouble(r1.get(2)) * 10000);
+                        int cz_jzgs = (int) (Double.parseDouble(r1.get(3)) * 10000);
+                        int gz_jzgs = (int) (Double.parseDouble(r1.get(4)) * 10000);
 
                         //学前园舍面积
                         String xq_xsmj = String.format("%.2f", Double.parseDouble(r2.get(1)));
@@ -112,6 +112,7 @@ public class C11 {
                         String cz_xsmj = String.format("%.2f", Double.parseDouble(r2.get(3)));
                         String gz_xsmj = String.format("%.2f", Double.parseDouble(r2.get(4)));
 
+
                         ExcelKit.putData(outRow, new ArrayList<>(
                                 Arrays.asList(
                                         cityName,//城市名称
@@ -119,7 +120,7 @@ public class C11 {
 
                                         String.valueOf(xq_jzgs), //学前教职工
                                         String.valueOf(xqjzgJS),//2022基数
-                                        String.valueOf(xqjzgJS -xq_jzgs),//学前师资缺口
+                                        String.valueOf(xqjzgJS - xq_jzgs),//学前师资缺口
                                         xq_xsmj,//学前园舍面积
                                         xqjzgMJJS,//学前园舍面积2022年基数
                                         String.format("%.2f", Double.parseDouble(xqjzgMJJS) - Double.parseDouble(r2.get(1))),//学前占地面积，2022基数减去当前值，得到预测值
@@ -127,7 +128,7 @@ public class C11 {
                                         //小学
                                         String.valueOf(xx_jzgs),
                                         String.valueOf(xxjzgJS),
-                                        String.valueOf(xxjzgJS - Double.parseDouble(r1.get(2))),//小学教职工数，2022基数减去当前值，得到预测值
+                                        String.valueOf(xxjzgJS - xx_jzgs),//小学教职工数，2022基数减去当前值，得到预测值
                                         xx_xsmj,
                                         xxjzgMJJS,
                                         String.format("%.2f", Double.parseDouble(xxjzgMJJS) - Double.parseDouble(r2.get(2))),//小学占地面积，2023基数减去当前值，得到预测值
@@ -135,20 +136,21 @@ public class C11 {
                                         //初中
                                         String.valueOf(cz_jzgs),
                                         String.valueOf(zxjzgJS),
-                                        String.valueOf(zxjzgJS - Double.parseDouble(r1.get(3))),//初中教职工数，2022基数减去当前值，得到预测值
+                                        String.valueOf(zxjzgJS - cz_jzgs),//初中教职工数，2022基数减去当前值，得到预测值
                                         cz_xsmj,
                                         zxjzgMJJS,
                                         String.format("%.2f", Double.parseDouble(zxjzgMJJS) - Double.parseDouble(r2.get(3))),//初中占地面积，2023基数减去当前值，得到预测值
 
                                         //高中
-                                        String.valueOf(gg_jzgs),
+                                        String.valueOf(gz_jzgs),
                                         String.valueOf(gxjzgJS),
-                                        String.valueOf(gxjzgJS - Double.parseDouble(r1.get(4))),//高中教职工数，2022基数减去当前值，得到预测值
+                                        String.valueOf(gxjzgJS - gz_jzgs),//高中教职工数，2022基数减去当前值，得到预测值
                                         gz_xsmj,
                                         gxjzgMJJS,
                                         String.format("%.2f", Double.parseDouble(gxjzgMJJS) - Double.parseDouble(r2.get(4))),//高中占地面积，2023基数减去当前值，得到预测值
                                         "", "", "", "", "", "", "云南省"
                                 )), dataStyle);
+
                     }
                 }
             }

src/main/java/com/dsideal/base/Tools/FillData/City/C9.java

@@ -82,13 +82,13 @@ public class C9 {
 
                         double value = Double.parseDouble(r.get(1));
                         if (year < 2023) {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList( "云南省",cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), "")), dataStyle);
                         }
                         if (year > 2023) {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst().substring(0, 4), "", String.format("%.2f", value))), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省",cityName, r.getFirst().substring(0, 4), "", String.format("%.2f", value))), dataStyle);
                         }
                         if (year == 2023) {
-                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList(cityName, "云南省", r.getFirst().substring(0, 4), String.format("%.2f", value), String.format("%.2f", value))), dataStyle);
+                            ExcelKit.putData(outRow, new ArrayList<>(Arrays.asList("云南省",cityName, r.getFirst().substring(0, 4), String.format("%.2f", value), String.format("%.2f", value))), dataStyle);
                         }
                     }
                 }

src/main/java/com/dsideal/base/Tools/FillData/ExcelKit/ExcelKit.java

@@ -494,6 +494,7 @@ public class ExcelKit {
 
             //处理数据data
             //第一行认为是标准长度，从后往前找，发现长度小于第一行长度的就remove掉
+            if(data.isEmpty()) return data;
             int firstRowLength = data.getFirst().size();
             System.out.println("第一行长度：" + firstRowLength);
             for (int i = data.size() - 1; i >= 0; i--) {