质检-表单

1、表单加载时，回显电签角色名称

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

@@ -978,9 +978,9 @@ public class ExcelTabController extends BladeController {
                 }
             }
             // 电签显示文件
-            List<TextdictInfoVO> textdictInfos = textdictInfoService.getTextdictListInfoByPkeyId(wbsTreeContract.getIsTypePrivatePid()+"",wbsTreeContract.getProjectId()+"");
+            List<TextdictInfo> textdictInfos = textdictInfoService.getTextdictListInfoByPkeyId(wbsTreeContract.getIsTypePrivatePid()+"",wbsTreeContract.getProjectId()+"");
             if(textdictInfos != null && textdictInfos.size() > 0){
-                for (TextdictInfoVO textdictInfoVO : textdictInfos) {
+                for (TextdictInfo textdictInfoVO : textdictInfos) {
                     Elements keyNames = table.getElementsByAttributeValue("keyname", textdictInfoVO.getColKey());
                     keyNames.attr("placeholder", textdictInfoVO.getSigRoleName());
                 }

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

@@ -60,7 +60,7 @@ public interface TextdictInfoMapper extends EasyBaseMapper<TextdictInfo> {
 
     List<TextdictInfoVO> selectTextDictInfoByIdAndColKeyAndColName(@Param("list") List<TextdictInfo> textdictInfos);
     //通过表单Id 获取电签信息
-    List<TextdictInfoVO> getTextdictListInfoByPkeyId(@Param("tabId") String tabId,@Param("projectId") String projectId);
+    List<TextdictInfo> getTextdictListInfoByPkeyId(@Param("tabId") String tabId,@Param("projectId") String projectId);
 
     @Select("select * from m_textdict_info where project_id = #{treePrivate.projectId} and tab_id = #{treePrivate.pKeyId} and type in (2,6) and is_deleted = 0")
     List<TextdictInfoVO> selectTextDictInfoByProjectIdAndTabId(IPage<TextdictInfoVO> page, @Param("treePrivate") WbsTreePrivate treePrivate);

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

@@ -81,7 +81,8 @@
         update m_wbs_tree_contract set html_url = #{htmlUrl} where type = 2 and project_id = #{projectId} and is_type_private_pid = #{pKeyId};
     </update>
 
-    <select id="getTextdictListInfoByPkeyId" resultMap="textdictInfoVoResultMap">
-        SELECT a.* from m_textdict_info a where 1=0
+    <select id="getTextdictListInfoByPkeyId" resultMap="textdictInfoResultMap">
+        SELECT * from m_textdict_info
+        where project_id = #{projectId} and tab_id = #{tabId} and is_deleted = 0 and type in('2','6')
     </select>
 </mapper>

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

@@ -58,5 +58,5 @@ public interface ITextdictInfoService extends IService<TextdictInfo> {
     void saveHtmlDefault(TextdictBy345VO textdictInfo);
 
     //表单获取电签信息
-    List<TextdictInfoVO> getTextdictListInfoByPkeyId(String tabId,String projectId);
+    List<TextdictInfo> getTextdictListInfoByPkeyId(String tabId,String projectId);
 }

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

@@ -228,7 +228,7 @@ public class TextdictInfoServiceImpl extends ServiceImpl<TextdictInfoMapper, Tex
     }
 
     @Override
-    public List<TextdictInfoVO> getTextdictListInfoByPkeyId(String tabId,String projectId) {
+    public List<TextdictInfo> getTextdictListInfoByPkeyId(String tabId,String projectId) {
         return  baseMapper.getTextdictListInfoByPkeyId(tabId,projectId);
 
     }