Merge branch 'zhuwei' into dev

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TreeNodeVOByTabType.java

@@ -25,5 +25,6 @@ public class TreeNodeVOByTabType extends BaseNode<TreeNode> {
 
     private String tableType;
     private String tableOwner;
+    private String isLinkTable;
 
 }

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

@@ -108,6 +108,7 @@
         <result column="excelId" property="excelId"/>
         <result column="table_type" property="tableType"/>
         <result column="table_owner" property="tableOwner"/>
+        <result column="is_link_table" property="isLinkTable"/>
     </resultMap>
 
 
@@ -967,7 +968,7 @@
 
     <!-- 项目级 表单类型分类 wbs树 -->
     <select id="tabTypeLazyTreeByProject" resultMap="treeNodeResultMapTabType">
-        SELECT a.exceIds AS excelIds,initTableName,a.exceIds as excelId,table_type, table_owner,
+        SELECT a.exceIds AS excelIds,initTableName,a.exceIds as excelId,table_type, table_owner,is_link_table,
         p_key_id as id,p_key_id as primaryKeyId,title,parent_id,fill_rate as fillRate,initTableId,p_key_id as pkeyId,
         (SELECT dict_value from blade_dict where code='table_type' and dict_key not in(-1,0) and dict_key=table_type )
         as tabType,
@@ -994,12 +995,12 @@
         ) AS "has_children"
         from (
         SELECT '12345678910' as p_key_id , '表单类型' as title, 0 as parent_id,0 as table_type,0 as fill_rate,0 as
-        table_owner,0 as initTableId,0 as exceIds,0 as initTableName
+        table_owner,0 as initTableId,0 as exceIds,0 as initTableName,0 as is_link_table
         union all
         SELECT dict_key as p_key_id ,dict_value as title,'12345678910' as parent_id,0 as table_type,0 as fill_rate,0 as
-        table_owner,0 as initTableId,0 as exceIsd,0 as initTableName from blade_dict where code='table_type' and dict_key not in(-1,0)
+        table_owner,0 as initTableId,0 as exceIsd,0 as initTableName,0 as is_link_table from blade_dict where code='table_type' and dict_key not in(-1,0)
         union all
-        SELECT p_key_id,node_name as title,table_type as parent_id,table_type,fill_rate,table_owner,init_table_id as initTableId,excel_id AS excelIds,init_table_name as  initTableName
+        SELECT p_key_id,node_name as title,table_type as parent_id,table_type,fill_rate,table_owner,init_table_id as initTableId,excel_id AS excelIds,init_table_name as  initTableName,is_link_table
         from m_wbs_tree_private WHERE project_id=#{projectId} and type in(2,10) and
         is_deleted=0 and table_type is not NULL GROUP BY node_name
         ) a where 1=1

blade-service/blade-manager/src/main/java/org/springblade/manager/utils/PdfAddimgUtil.java

@@ -56,12 +56,12 @@ public class PdfAddimgUtil {
                 PDFIndexInfo pdfIndexInfo = positions.get(i);
                 float[] position = pdfIndexInfo.getDataInfo();
                 TextdictInfo textdictInfo = textMap.get(Func.toLong(pdfIndexInfo.getPkeyid()));
-                float pyzbx = 0;
+                float pyzbx = -13;
                 float pyzby = 0;
                 String type ="2";
                 if(textdictInfo!=null){
-                    pyzbx = Func.toFloat(textdictInfo.getPyzbx());
-                    pyzby = Func.toFloat(textdictInfo.getPyzby());
+                    pyzbx = Func.toFloat(textdictInfo.getPyzbx()) +pyzbx;
+                    pyzby = Func.toFloat(textdictInfo.getPyzby()) +pyzby;
                     type = textdictInfo.getType()+"";
                 }
                 gaizhang(pdfFile, new File(pdfUrl), (int) position[0], position[1], position[2], signImg,pyzbx,pyzby,type);