注册登录，车辆，装备，枪支，招聘，培训考试修改

Administrator

2021-09-27 345d17cf82e1bbc1fbfbeec10193c2bed59cd674

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

@@ -97,7 +97,7 @@
   @PostMapping("/submit")
   public R submit(@RequestBody WorkReport workReport){
      boolean status = false;
      if (null!=workReport.getId()){
      if (null==workReport.getId()){
         workReport.setReportTime(new Date());
         workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
         //新增
@@ -119,9 +119,13 @@
         FtpUtil.sqlFileUpload(s1);
      }else {
         workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
         if (null!=workReport.getReplyTime()){
         if (null==workReport.getReplyTime()){
            workReport.setReplyTime(new Date());
         }

         //修改
         status = workReportService.updateById(workReport);

         //内网同步
         String s1 =
            "update sys_work_report set type = " + "'" + workReport.getType() + "'" +
@@ -177,15 +181,19 @@
    * @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();
         for (String deptId : replyDeptIds) {
            //查询接收人单位信息
            Dept deptDetail = deptService.getById(Long.parseLong(deptId));
            replyDeptNameInfo = replyDeptNameInfo.append(deptDetail.getDeptName()).append(",");
         }
         //截取
         return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
      }
      //截取
      return replyDeptNameInfo.substring(0, replyDeptNameInfo.length() - 1);
      return null;
   }

   /**
@@ -199,7 +207,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());
@@ -222,10 +232,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;
   }

}