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

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -276,6 +276,7 @@ public class WbsTreeContractController extends BladeController {
                 }
             } else {
                 htmlUrl = tab.getHtmlUrl();
+//                htmlUrl = "C:\\Users\\泓创研发01\\Desktop\\fsdownload\\1783774897227431936.html";
                 fileName = ObjectUtil.isNotEmpty(tab.getFullName()) ? tab.getFullName() : tab.getNodeName();
             }
 
@@ -332,17 +333,17 @@ public class WbsTreeContractController extends BladeController {
                     setBlackBorder(cellStyle); //设置边框
                     cell.setCellStyle(cellStyle);
 
-                    if (info.hasMergedRegion()) { //修改合并单元格边框线
-                        CellRangeAddress mergedRegion = info.getMergedRegion();
-                        RegionUtil.setBorderTop(BorderStyle.THIN, mergedRegion, poiSheet);
-                        RegionUtil.setTopBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
-                        RegionUtil.setBorderBottom(BorderStyle.THIN, mergedRegion, poiSheet);
-                        RegionUtil.setBottomBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
-                        RegionUtil.setBorderLeft(BorderStyle.THIN, mergedRegion, poiSheet);
-                        RegionUtil.setLeftBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
-                        RegionUtil.setBorderRight(BorderStyle.THIN, mergedRegion, poiSheet);
-                        RegionUtil.setRightBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
-                    }
+//                    if (info.hasMergedRegion()) { //修改合并单元格边框线
+//                        CellRangeAddress mergedRegion = info.getMergedRegion();
+//                        RegionUtil.setBorderTop(BorderStyle.THIN, mergedRegion, poiSheet);
+//                        RegionUtil.setTopBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
+//                        RegionUtil.setBorderBottom(BorderStyle.THIN, mergedRegion, poiSheet);
+//                        RegionUtil.setBottomBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
+//                        RegionUtil.setBorderLeft(BorderStyle.THIN, mergedRegion, poiSheet);
+//                        RegionUtil.setLeftBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
+//                        RegionUtil.setBorderRight(BorderStyle.THIN, mergedRegion, poiSheet);
+//                        RegionUtil.setRightBorderColor(IndexedColors.BLACK.getIndex(), mergedRegion, poiSheet);
+//                    }
                 }
 
                 //返回响应

blade-service/blade-meter/src/main/java/org/springblade/meter/mapper/ChangeTokenFormMapper.xml

@@ -92,7 +92,7 @@
                IFNULL((select sum(build_picture_total) from s_inventory_form_meter ifm
                        where ifm.contract_id = #{contractId} and ifm.is_deleted = 0 and ifm.contract_form_id = cif.id),0) as currentChangeTotal
         from s_contract_inventory_form cif
-        where contract_id = #{contractId} and is_deleted = 0 and is_form_node = 1
+        where contract_id = #{contractId} and is_deleted = 0 and is_form_node = 1 and build_change_total is not null
           and id in(SELECT contract_form_id FROM s_inventory_form_meter
                         WHERE contract_id = #{contractId} and is_deleted = 0
                         and contract_meter_id in ( SELECT id FROM s_meter_tree_contract mtc WHERE contract_id = #{contractId} and is_deleted = 0