|
@@ -139,11 +139,14 @@ public class EVisaTaskCheckController {
|
|
|
|
|
|
//获取电签配置
|
|
|
List<String> list = json.getJSONArray("privatePKeyId").toJavaList(String.class);
|
|
|
- Set<String> userNameFail = new HashSet<>();
|
|
|
+ Map<String, Set<String>> userNameFail = new HashMap<>();
|
|
|
for (String nodeId : list) {
|
|
|
+ //获取节点信息
|
|
|
WbsTreeContract contract = wbsTreeContractClient.getContractWbsTreeByPrimaryKeyId(Long.valueOf(nodeId));
|
|
|
+ //获取节点下每个填报表
|
|
|
List<WbsTreeContract> node = wbsTreeContractClient.queryChildByParentId(contract,"", "");
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
+ //获取每个填报表对应的wbs_tree_private的id
|
|
|
for (WbsTreeContract treeContract : node) {
|
|
|
// WbsTreePrivate wbsTreePrivate = wbsTreePrivateClient.queryPeersNodeByProjectIdAndId(treeContract.getProjectId(), treeContract.getId());
|
|
|
// ids.add(wbsTreePrivate.getPKeyId());
|
|
@@ -166,14 +169,27 @@ public class EVisaTaskCheckController {
|
|
|
for (JSONObject userRole : userRoleList) {
|
|
|
if (!eVisaRoleList.contains(userRole.getString("roleId"))) {
|
|
|
User user = this.userClient.userInfoById(userRole.getLong("userId")).getData();
|
|
|
- userNameFail.add(user.getRealName());
|
|
|
+ InformationQuery info = informationQueryService.getInfoByWbsId(nodeId);
|
|
|
+ if (userNameFail.containsKey(user.getRealName())){
|
|
|
+ Set<String> set = userNameFail.get(user.getRealName());
|
|
|
+ set.add(info.getName());
|
|
|
+ userNameFail.put(user.getRealName(),set);
|
|
|
+ }else {
|
|
|
+ Set<String> set = new HashSet<>();
|
|
|
+ set.add(info.getName());
|
|
|
+ userNameFail.put(user.getRealName(),set);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
//批量提示
|
|
|
if (userNameFail.size() > 0) {
|
|
|
- return R.data(300, false, "所选中的用户【" + StringUtils.join(userNameFail, ",") + "】不具备当前表格所需要的签字岗位,请联系维护人员处理或更换审批人员");
|
|
|
+ StringBuilder stringBuilder = new StringBuilder();
|
|
|
+ for (String key : userNameFail.keySet()) {
|
|
|
+ stringBuilder.append("所选中的用户【" +key+ "】不具备【"+ StringUtils.join(userNameFail.get(key),",")+"】表格所需要的签字岗位,请联系维护人员处理或更换审批人员");
|
|
|
+ }
|
|
|
+ return R.data(300, false, stringBuilder.toString());
|
|
|
}
|
|
|
|
|
|
//均满足
|