Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

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

@@ -98,7 +98,7 @@
   public R submit(@RequestBody WorkReport workReport){
      boolean status = false;
      if (null==workReport.getId()){
         workReport.setReportTime(new Date());
//         workReport.setReportTime(new Date());
         workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
         //新增
         status = workReportService.save(workReport);
@@ -120,26 +120,26 @@
      }else {
         workReport.setReplyDeptIds(getReplyDeptIds(workReport.getReceivedIds()));
         if (null==workReport.getReplyTime()){
            workReport.setReplyTime(new Date());
//            workReport.setReplyTime(new Date());
         }

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

         //内网同步
         String s1 =
            "update sys_work_report set type = " + "'" + workReport.getType() + "'" +
               ",content = " + "'" + workReport.getContent() + "'" +
               ",work_desc = " + "'" + workReport.getWorkDesc() + "'" +
               ",received_ids = " + "'" + workReport.getReceivedIds() + "'" +
               ",reply_content = " + "'" + workReport.getReplyContent() + "'" +
               ",reply_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(workReport.getReplyTime()) + "'" +
               ",dept_id = " + "'" + workReport.getDeptId() + "'" +
               ",reply_dept_ids = " + "'" + workReport.getReplyDeptIds() + "'" +
               ",category = " + "'" + workReport.getCategory() + "'" +
               ",user_id = " + "'" + workReport.getUserId() + "'" +
               " " +"where id = " + "'" + workReport.getId() + "'";
         FtpUtil.sqlFileUpload(s1);
//         String s1 =
//            "update sys_work_report set type = " + "'" + workReport.getType() + "'" +
//               ",content = " + "'" + workReport.getContent() + "'" +
//               ",work_desc = " + "'" + workReport.getWorkDesc() + "'" +
//               ",received_ids = " + "'" + workReport.getReceivedIds() + "'" +
//               ",reply_content = " + "'" + workReport.getReplyContent() + "'" +
//               ",reply_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(workReport.getReplyTime()) + "'" +
//               ",dept_id = " + "'" + workReport.getDeptId() + "'" +
//               ",reply_dept_ids = " + "'" + workReport.getReplyDeptIds() + "'" +
//               ",category = " + "'" + workReport.getCategory() + "'" +
//               ",user_id = " + "'" + workReport.getUserId() + "'" +
//               " " +"where id = " + "'" + workReport.getId() + "'";
//         FtpUtil.sqlFileUpload(s1);
      }
      return R.status(status);
   }