Merge remote-tracking branch 'origin/developer_bw' into developer_bw

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/CommonServiceImpl.java

@@ -979,11 +979,18 @@ public class CommonServiceImpl {
         response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName+".zip", "UTF-8"));
         createZipFile(ziLiaoDir, "批量资料",response);
     }
-
+    private void autoSizeColumns(Sheet sheet) {
+        if (null != sheet.getRow(0) ){
+            for (int i = 0; i < sheet.getRow(0).getLastCellNum(); i++) {
+                sheet.autoSizeColumn(i);
+            }
+        }
+    }
     private void fillSheet(Sheet sheet, Object data) {
         if (Objects.isNull(data)){
             return;
         }
+        autoSizeColumns(sheet);
         int startRow = 1;
         for (int i = 0; i < sheet.getLastRowNum() + 1; i++) {
             Row row = sheet.getRow(i);

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/StatisticsHomepageServiceImpl.java

@@ -204,14 +204,14 @@ public class StatisticsHomepageServiceImpl {
                             realScale += (double) map.get("realScale");
                             iterator.remove();
                         }
-                        if ("施工资料已上传".equals(map.get("statusText"))) {
+                        if ("施工资料上传".equals(map.get("statusText"))) {
                             sgtotal += (long) map.get("total");
                             sgrealScale += (double) map.get("realScale");
                             iterator.remove();
                         }
                     }
                     maps.add(MapBuilder.<String, Object>create().put("statusText","审核中").put("total",total).put("realScale",new BigDecimal(realScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
-                    maps.add(MapBuilder.<String, Object>create().put("statusText","施工资料已上传").put("total",sgtotal).put("realScale",new BigDecimal(sgrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
+                    maps.add(MapBuilder.<String, Object>create().put("statusText","施工资料上传").put("total",sgtotal).put("realScale",new BigDecimal(sgrealScale).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()).build());
                     differenceValue(maps,workOrder);
                     resultMap.put("workOrder",maps);
                 }