表单公式

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

@@ -2106,7 +2106,7 @@ public class ExcelTabController extends BladeController {
     }
 
 
-    @PostMapping("/save_buss_data2")
+    @PostMapping("/save_buss_data")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
     public R saveBussData2(@Valid @RequestBody JSONObject dataInfo) throws Exception {
@@ -2135,7 +2135,7 @@ public class ExcelTabController extends BladeController {
                 JSONArray extra = new JSONArray();
                 for (Long pk : tableAllIds) {
                     if (!exclude.contains(pk)) {
-                        R bussDataInfo = this.excelTabService.getBussDataInfo(pk, 1,false);
+                        R bussDataInfo = this.excelTabService.getBussDataInfo(pk, 1,true);
                         @SuppressWarnings("unchecked")
                         Map<String, Object> jo = (Map<String, Object>) bussDataInfo.getData();
                         if (ObjectUtils.isNotEmpty(jo)) {
@@ -3843,7 +3843,7 @@ public class ExcelTabController extends BladeController {
      * @return
      * @throws Exception
      */
-    @PostMapping("/save_buss_data")
+    @PostMapping("/save_buss_data2")
     @ApiOperationSupport(order = 13)
     @ApiOperation(value = "填报页面数据保存", notes = "填报页面数据保存")
     public R saveBussData(@Valid @RequestBody JSONObject dataInfo) throws Exception {

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ExcelTabServiceImpl.java

@@ -1238,7 +1238,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
 
     @Override
     public R getBussDataInfo(Long pkeyId, int type) {
-        return this.getBussDataInfo(pkeyId,type,true);
+        return this.getBussDataInfo(pkeyId,type,false);
     }
     @Override
     public R getBussDataInfo(Long pkeyId, int type,Boolean isFormLoading) {
@@ -1491,7 +1491,7 @@ public class ExcelTabServiceImpl extends BaseServiceImpl<ExcelTabMapper, ExcelTa
         }
         reData.put("tabGroupId", wbsTreeContract.getTabGroupId());
         /*表单公式*/
-        if(!isFormLoading) {
+        if(isFormLoading) {
             this.formulaService.paramFormula(wbsTreeContract, reData, document);
         }
         return R.data(reData);

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/FormulaServiceImpl.java

@@ -1168,7 +1168,7 @@ public class FormulaServiceImpl extends BaseServiceImpl<FormulaMapper, Formula>
         JSONArray dataArray = new JSONArray();
         for (NodeTable data : subTabList) {
             /*自动挂载附表情况下，装配TableInfo数据*/
-            R bussDataInfo = this.excelTabService.getBussDataInfo(data.getPKeyId(), 1,false);
+            R bussDataInfo = this.excelTabService.getBussDataInfo(data.getPKeyId(), 1);
             @SuppressWarnings("unchecked")
             Map<String, Object>  data1 = (Map<String, Object>) bussDataInfo.getData();
             data1.put("pkeyId",data.getPKeyId());