公式相关

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

@@ -95,7 +95,7 @@ public class FormulaController {
                  efm.setProjectId(f.getProjectId());
                  this.elementFormulaMappingService.save(efm);
                  /*假如不存在projectId则认为是系统级模版公式，必须同步给所有项目TODO*/
-                 return R.success("新增成功");
+                 return R.data(fa.getId(),"新增成功");
              }else{
                  return R.status(this.service.updateById(fa));
              }

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

@@ -208,7 +208,24 @@ public class WbsTreeController extends BladeController {
         return R.data(wbsFormElements, "未查询到元素");
     }
 
+    @GetMapping("/get-table-formula-elements")
+    @ApiOperationSupport(order = 8)
+    @ApiOperation(value = "根据表单id查询所有元素", notes = "传入表单id")
+    @ApiImplicitParam(name = "id", value = "表单id", required = true)
+    public R<List<WbsFormElementVO>> selectFormElements4Formula(@RequestParam("id") String id,String search) {
+        List<WbsFormElementVO> wbsFormElements = null;
+        if (StringUtils.isNotEmpty(id)) {
+            wbsFormElements = wbsTreeService.selectFormElements4Formula(id);
+            if (wbsFormElements.size() > 0) {
+                if(StringUtils.isNotEmpty(search)){
+                    wbsFormElements=wbsFormElements.stream().filter(e->e.getEName().contains(search)).collect(Collectors.toList());
+                }
+                return R.data(wbsFormElements);
+            }
+        }
 
+        return R.data(wbsFormElements, "未查询到元素");
+    }
     /**
      * 新增表单与元素
      */

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.xml

@@ -91,6 +91,7 @@
         <result column="tableElementKey" property="tableElementKey"/>
         <result column="initTableName" property="initTableName"/>
         <result column="nodeId" property="nodeId"/>
+        <result column="globalFormula" property="globalFormula"/>
     </resultMap>
 
     <insert id="addFormElement" parameterType="org.springblade.manager.dto.WbsFormElementDTO">
@@ -373,13 +374,7 @@
         where b.id=#{id} and a.is_deleted=0
     </select>
     <select id="selectFormElements4TableId" resultMap="wbsFormElementMap">
-        select f_id,e_key,c.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName from m_table_info a INNER JOIN m_wbs_tree b on a.tab_en_name=b.init_table_name INNER JOIN m_wbs_form_element c on c.f_id=b.init_table_id
-        where a.id =#{id} and c.is_deleted=0
-        union   select f_id,e_key,c.id,e_name,e_type,e_length,e_allow_deviation,e_Inspection_method,CONCAT(b.init_table_name,':',e_key) as tableElementKey,init_table_name as initTableName from m_table_info a INNER JOIN (SELECT j.* from m_table_info k INNER JOIN m_wbs_tree_private j on k.tab_en_name=j.init_table_name
-        where k.id=#{id} limit 1) b on a.tab_en_name=b.init_table_name INNER JOIN m_wbs_form_element c on c.f_id=b.init_table_id  where a.id =#{id} and c.is_deleted=0
-    </select>
-    <select id="selectFormElements4Formula" resultMap="wbsFormElementMap">
-        select  * from m_wbs_form_element a
+        select  a.id,a.e_name,IF(b.formula_id>0,1,0)globalFormula from m_wbs_form_element a LEFT JOIN (select element_id ,formula_id from m_element_formula_mapping where scope=1 )b on a.id=b.element_id
         where a.f_id=#{id} and a.is_deleted=0
     </select>
     <select id="selectPrivateFormElements" resultMap="wbsFormElementMap">

blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -34,6 +34,7 @@ public interface IWbsTreeService extends BaseService<WbsTree> {
     boolean removeTableById(String id);
 
     List<WbsFormElementVO> selectFormElements(String id,Long nodeId);
+    List<WbsFormElementVO> selectFormElements4Formula(String id);
     // 项目级
     List<WbsFormElementVO> selectPrivateFormElements(String id);
 

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

@@ -352,6 +352,10 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return wbsFormElements;
     }
 
+    @Override
+    public List<WbsFormElementVO> selectFormElements4Formula(String id) {
+        return this.wbsTreeMapper.selectFormElements4TableId(id);
+    }
 
     @Override
     public List<WbsFormElementVO> selectPrivateFormElements(String id) {