Merge branch 'refs/heads/dev' into test-merge

# Conflicts:
#	blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java
#	blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java
#	blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -172,13 +172,16 @@ public class TaskController extends BladeController {
             @ApiImplicitParam(name = "formDataId", value = "数据源", required = true),
             @ApiImplicitParam(name = "approvalType", value = "上报类型", required = true)
     })
-    public R<List<TaskApprovalVO>> getBatchApprovalTaskParameter(@RequestParam String formDataId, @RequestParam Integer approvalType) {
+    public R<List<TaskApprovalVO>> getBatchApprovalTaskParameter(@RequestParam String formDataId, @RequestParam String approvalType) {
         List<String> longs = Func.toStrList(formDataId);
+        List<String> apptype = Func.toStrList(approvalType);
         List<TaskApprovalVO> taskApprovalVOList = new ArrayList<>();
-        for (String aLong : longs) {
+        for (int i=0;i<longs.size();i++) {
+            String aLong = longs.get(i);
+            Integer approv = Integer.parseInt(apptype.get(i));
             TaskApprovalVO result = new TaskApprovalVO();
             result.setFormDataId(aLong);
-            result.setApprovalType(approvalType);
+            result.setApprovalType(approv);
             taskApprovalVOList.add(this.taskService.queryBusinessData(result));
         }
         return R.data(taskApprovalVOList);

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

@@ -843,8 +843,13 @@ public class ExcelTabController extends BladeController {
                 }
             }
             // 电签显示文件
-           // List<TextdictInfoVO> textdictInfos = textdictInfoService.getTextdictListInfoByPkeyId(wbsTreeContract.getIsTypePrivatePid()+"",wbsTreeContract.getProjectId()+"");
-
+            List<TextdictInfoVO> textdictInfos = textdictInfoService.getTextdictListInfoByPkeyId(wbsTreeContract.getIsTypePrivatePid()+"",wbsTreeContract.getProjectId()+"");
+            if(textdictInfos != null && textdictInfos.size() > 0){
+                for (TextdictInfoVO textdictInfoVO : textdictInfos) {
+                    Elements keyNames = table.getElementsByAttributeValue("keyname", textdictInfoVO.getColKey());
+                    keyNames.attr("placeholder", textdictInfoVO.getSigRoleName());
+                }
+            }
             fileInputStream.close();
             return R.data(table + "");
         } catch (Exception e) {

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

@@ -175,4 +175,5 @@ public interface WbsTreeContractMapper extends EasyBaseMapper<WbsTreeContract> {
      */
     List<APIWbsContractSubdivisionVo> getWbsContractSubdivisionParentNode(@Param("contractId") String contractId,
                                                                           @Param("ids") Set<Long> ids);
+
 }