Selaa lähdekoodia

质检-表单
1、表单加载时,回显电签角色名称、调整查询逻辑

LHB 1 päivä sitten
vanhempi
commit
4dcfff72de

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

@@ -68,6 +68,7 @@ import org.springblade.manager.enums.ExecuteType;
 import org.springblade.manager.formula.KeyMapper;
 import org.springblade.manager.formula.NodeTable;
 import org.springblade.manager.mapper.ExcelTabMapper;
+import org.springblade.manager.mapper.TextdictInfoMapper;
 import org.springblade.manager.mapper.WbsTreeContractMapper;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.*;
@@ -197,6 +198,9 @@ public class ExcelTabController extends BladeController {
     StringRedisTemplate RedisTemplate;
 
     private final WbsTreeContractExtendService wbsTreeContractExtendService;
+    @Autowired
+    private TextdictInfoMapper textdictInfoMapper;
+
     /**
      * 详情
      */
@@ -1037,13 +1041,20 @@ public class ExcelTabController extends BladeController {
                     });
                 }
             }
+
             // 电签显示文件
-            List<TextdictInfo> textdictInfos = textdictInfoService.getTextdictListInfoByPkeyId(wbsTreeContract.getIsTypePrivatePid()+"",wbsTreeContract.getProjectId()+"");
-            if(textdictInfos != null && textdictInfos.size() > 0){
-                for (TextdictInfo textdictInfoVO : textdictInfos) {
-                    Elements keyNames = table.getElementsByAttributeValue("keyname", textdictInfoVO.getColKey());
-                    keyNames.attr("placeholder", textdictInfoVO.getSigRoleName());
-                }
+            Elements dqids = doc.getElementsByAttribute("dqid");
+            List<String> dqid = new ArrayList<>();
+            for(Element ek:dqids){
+                dqid.addAll(Func.toStrList("\\|\\|",ek.attr("dqid")));
+            }
+            List<TextdictInfoVO> textdict = new ArrayList<>();
+            if (!dqid.isEmpty()) {
+                textdict = textdictInfoMapper.selectTextdictBYIds(dqid,wbsTreeContract.getProjectId());
+            }
+            for (TextdictInfoVO textdictInfoVO : textdict) {
+                Elements keyNames = table.getElementsByAttributeValue("keyname", textdictInfoVO.getColKey());
+                keyNames.attr("placeholder", textdictInfoVO.getSigRoleName());
             }
             setTableTips(wbsTreeContract, table);
             fileInputStream.close();