Merge remote-tracking branch 'origin/master'

mjava-lanyun/src/main/java/com/malk/lanyun/entity/Budget.java

@@ -16,51 +16,51 @@ public class Budget {
     @ExcelProperty("项               目")
     private String project;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("1月")
     private String january;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("2月")
     private String february;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("3月")
     private String march;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("4月")
     private String april;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("5月")
     private String may;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("6月")
     private String june;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("7月")
     private String july;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("8月")
     private String august;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("9月")
     private String september;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("10月")
     private String october;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("11月")
     private String november;
 
-    @NumberFormat("#")
+//    @NumberFormat("#")
     @ExcelProperty("12月")
     private String december;
 

mjava-lanyun/src/main/java/com/malk/lanyun/listener/BudgetListener.java

@@ -90,9 +90,9 @@ public class BudgetListener extends AnalysisEventListener<Budget> {
         System.out.println(list.size()+"条数据，开始存储数据库！");
 
         String[] keys={"getJanuary","getFebruary","getMarch","getApril","getMay","getJune","getJuly","getAugust","getSeptember","getOctober","getNovember","getDecember"};
-        String totalYearYs="0";
+        String totalYearYs=null;
         for (Budget budget:list){
-            String totalYs="0";
+            String totalYs=null;
             String kmdl=budget.getProject().split("-")[0];
             String kmmc=budget.getProject();
             for (int i = 0; i < 12; i++) {
@@ -100,20 +100,21 @@ public class BudgetListener extends AnalysisEventListener<Budget> {
                 String yearMonthStr=date.format(DateTimeFormatter.ofPattern("yyyy-MM"));
                 String yearMonth= String.valueOf(date.atStartOfDay().toInstant(ZoneOffset.of("+8")).toEpochMilli());
                 String data=ReflectUtil.invoke(budget, keys[i]);
-                if(data!=null&&!data.equals("")){
+                if(data!=null&&!data.equals("")&&!data.equals("-")){
+                    data=data.replaceAll(",","");
                     System.out.println("月份："+i+"科目编码："+budget.getKmbm()+"数据值："+data);
-                    totalYs= NumberUtil.add(totalYs,data.replaceAll(",","")).toString();
+                    totalYs= NumberUtil.add((totalYs==null?"0":totalYs),data).toString();
                     saveYearAndKmbmAndMonth(data,budget.getKmbm(),yearMonth,yearMonthStr,kmdl,kmmc);
                 }
             }
-            totalYearYs= NumberUtil.add(totalYearYs,totalYs).toString();
-//            if(!totalYs.equals("0")){
+            if(totalYs!=null){
+                totalYearYs= NumberUtil.add((totalYearYs==null?"0":totalYearYs),totalYs).toString();
                 saveYearAndKmbm(totalYs,budget.getKmbm(),kmdl,kmmc);
-//            }
+            }
         }
-//        if(!totalYearYs.equals("0")){
+        if(totalYearYs!=null){
             saveYear(totalYearYs);
-//        }
+        }
         System.out.println("存储数据库成功！");
     }
 

mjava-lanyun/src/main/java/com/malk/lanyun/listener/BudgetListenerForProject.java

@@ -95,7 +95,7 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
             String type1="0",type2="0",type3="0",type4="0",type5="0";// 收入、人工、材料、其他、设备
             for (Budget budget:list){
                 String data=ReflectUtil.invoke(budget, keys[i]);
-                if(data!=null&&!data.equals("")&&!data.equals("0")){
+                if(data!=null&&!data.equals("")&&!data.equals("0")&&!data.equals("-")){
                     System.out.println("月份："+i+"类型："+budget.getType()+"数据值："+data);
                     switch (budget.getType()){
                         case "收入":
@@ -185,5 +185,4 @@ public class BudgetListenerForProject extends AnalysisEventListener<Budget> {
                 .systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP").updateFormDataJson(JSON.toJSONString(UtilMap.map("tableField_lrru2tnq",table))).formInstanceId(formInstId)
                 .build(), YDConf.FORM_OPERATION.update);
     }
-
 }

mjava-lanyun/src/test/java/ysTest.java

@@ -25,15 +25,18 @@ public class ysTest {
     public void test(){
         String id= UUID.randomUUID().toString();
         String fileName = "/home/"+id+".xlsx";
-        String url=ydClient.convertTemporaryUrl("/ossFileHandle?appType=APP_ERBDTFS82HOVBPL3NFH0&fileName=APP_ERBDTFS82HOVBPL3NFH0_MDk1MzU4MDE2Ni0xNDE2MzIxNDg1XzlFQTY2OUQxMzFRUUgxWEI4MUJWWjc3ODE3TTcyWVIwQTE3NE1USg$$.xlsx&instId=&type=download");
+        String url=ydClient.convertTemporaryUrl("/ossFileHandle?appType=APP_ERBDTFS82HOVBPL3NFH0&fileName=APP_ERBDTFS82HOVBPL3NFH0_MDk1MzU4MDE2Ni0xNDE2MzIxNDg1X01IRDY2VTgxVEsyUjdQWk9FSU9NSzVSSUtBSEkyS1gxUk1RNE1PNw$$.xlsx&instId=&type=download");
         HttpUtil.downloadFile(url,fileName);
-        EasyExcel.read(fileName, Budget.class, new BudgetListener(ydClient,"测试","2048","2147512448000")).sheet().headRowNumber(3).doRead();
+        EasyExcel.read(fileName, Budget.class, new BudgetListener(ydClient,"信息技术部","2024","1704038400000")).sheet().headRowNumber(3).doRead();
     }
 
     @Test
     public void test2(){
-        String fileName = "/home/lanyunys预算模版信息部.xlsx";
-        EasyExcel.read(fileName, Budget.class, new BudgetListenerForProject(ydClient,"PM99006","2024")).sheet().headRowNumber(3).doRead();
+        String id= UUID.randomUUID().toString();
+        String fileName = "/home/"+id+".xlsx";
+        String url=ydClient.convertTemporaryUrl("/ossFileHandle?appType=APP_ERBDTFS82HOVBPL3NFH0&fileName=APP_ERBDTFS82HOVBPL3NFH0_MDk1MzU4MDE2Ni0xNDE2MzIxNDg1X01IRDY2VTgxVEsyUjdQWk9FSU9NSzVSSUtBSEkyS1gxUk1RNE1PNw$$.xlsx&instId=&type=download");
+        HttpUtil.downloadFile(url,fileName);
+        EasyExcel.read(fileName, Budget.class, new BudgetListenerForProject(ydClient,"PM00177","2024")).sheet().headRowNumber(3).doRead();
     }