From f7115db7eb622bcd2dd4ec62ce6f2b380a46bc08 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 14:50:52 +0800
Subject: [PATCH] 派遣，考试，工作汇报修改
---
src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java b/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
index 3c86c61..87402aa 100644
--- a/src/main/java/org/springblade/modules/workreport/controller/WorkReportController.java
+++ b/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);
}
--
Gitblit v1.9.3