1.保安公司查询修改 2.报名列表修改 3.考试列表查询修改 4.保安员导入修改

Administrator

2021-11-23 d4ad4cd6c127aa5944685c4aa098e0015139e1a4

 src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java

@@ -181,15 +181,25 @@
    * @return
    */
   private String getReplyDeptName(WorkReportVo detail) {
      List<String> replyDeptIds = Arrays.asList(detail.getReplyDeptIds().split(","));
      StringBuilder replyDeptNameInfo = new StringBuilder();
      for (String deptId : replyDeptIds) {
         //查询接收人单位信息
         Dept deptDetail = deptService.getById(Long.parseLong(deptId));
         replyDeptNameInfo = replyDeptNameInfo.append(deptDetail.getDeptName()).append(",");

      if (null!=detail.getReplyDeptIds() && detail.getReplyDeptIds()!="" && !detail.getReplyDeptIds().isEmpty()) {
         List<String> replyDeptIds = Arrays.asList(detail.getReplyDeptIds().split(","));
         StringBuilder replyDeptNameInfo = new StringBuilder();
         if (replyDeptIds.size()>0) {
            for (String deptId : replyDeptIds) {
               //查询接收人单位信息
               Dept deptDetail = deptService.getById(Long.parseLong(deptId));
               if (null!= deptDetail) {
                  replyDeptNameInfo = replyDeptNameInfo.append(deptDetail.getDeptName()).append(",");
               }
            }
            if (replyDeptNameInfo.length()>0) {
               //截取
               return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
            }
         }
      }
      //截取
      return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
      return null;
   }

   /**
@@ -203,7 +213,9 @@
      for (String userId : userIds) {
         //查询接收人单位信息
         User userDetail = userService.getById(userId);
         list.add(userDetail.getDeptId());
         if (null!=userDetail){
            list.add(userDetail.getDeptId());
         }
      }
      //去重
      List<String> collect = list.stream().distinct().collect(Collectors.toList());
@@ -226,10 +238,16 @@
//         user.setCardid(idCardNo);
//         User userDetail = userService.getOne(Condition.getQueryWrapper(user));
         User userDetail = userService.getById(userId);
         replyRealNameInfo = replyRealNameInfo.append(userDetail.getRealName()).append(",");
         if(null!=userDetail) {
            replyRealNameInfo = replyRealNameInfo.append(userDetail.getRealName()).append(",");
         }

      }
      //截取
      return replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1);
      if (replyRealNameInfo.toString().length()>0) {
         return replyRealNameInfo.substring(0, replyRealNameInfo.length() - 1);
      }
      return null;
   }

}