From a30ecee6a527f7ee28521bdf8069ab7b64c05de1 Mon Sep 17 00:00:00 2001
From: musteven <1009173794@qq.com>
Date: Fri, 18 Apr 2025 20:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BD=9C=E4=B8=9A=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=95=8C=E9=9D=A2=E5=89=A9=E4=BD=99=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E4=B8=89=E4=B8=AA=E6=8E=A7=E4=BB=B6?=
 =?UTF-8?q?=E7=AD=89=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=BD=93=E6=88=90?=
 =?UTF-8?q?=E7=BB=A9=E4=B8=BA=E7=A9=BA=E6=97=B6=E6=9F=A5=E8=AF=A2=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=88=97=E8=A1=A8=E6=96=B9=E6=B3=95=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E9=97=AE=E9=A2=98=E3=80=82=20=E5=89=A9=E4=BD=99?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=AE=97=E6=B3=95=E5=92=8C=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AES-front/src/api/user.js                     |   9 +
 .../report-submit/components/leftparts.vue    |  83 ++++--
 .../components/report-actions.vue             | 127 ++++++++--
 .../report-submit/components/rightparts.vue   |  10 +-
 .../problem/controller/ProblemController.java |  82 +++++-
 .../aes/problem/dao/SubmitReportDaoI.java     |   6 +
 .../problem/dao/impl/SubmitReportDaoImpl.java | 237 +++++++++++++-----
 .../service/Impl/ProblemServiceImpl.java      |  36 ++-
 .../aes/problem/service/ProblemServiceI.java  |   6 +
 9 files changed, 496 insertions(+), 100 deletions(-)

diff --git a/AES-front/src/api/user.js b/AES-front/src/api/user.js
index ccb2a3d..3ba73cf 100644
--- a/AES-front/src/api/user.js
+++ b/AES-front/src/api/user.js
@@ -51,4 +51,13 @@ export default {
         url: `/downloadFile/downloadFile/${fileName}`,
         method: 'get',
       }),     // 文件下载
+
+    //保存文件名到数据库
+    saveInfoToProps: (data) => request.post('/problem/saveInfoToProps', data),
+
+    submitInfoToProps: (data) => request.post('/problem/submitInfoToProps', data),
+
+    withdrawInfoToProps: (data) => request.post('/problem/withdrawInfoToProps', data),
+
+
 }
diff --git a/AES-front/src/views/user/report-submit/components/leftparts.vue b/AES-front/src/views/user/report-submit/components/leftparts.vue
index 18fae11..66621ed 100644
--- a/AES-front/src/views/user/report-submit/components/leftparts.vue
+++ b/AES-front/src/views/user/report-submit/components/leftparts.vue
@@ -12,10 +12,18 @@
       <div slot="header" class="clearfix card-header">
         <span class="subtitle">瀹為獙鎻愪氦</span>
       </div>
+      <div v-if="attachment" class="file-list">
+        <span class="file-list-title">宸蹭繚瀛樼殑鏂囦欢锛�</span>
+        <ul>
+          <li>
+            {{ attachment }}
+          </li>
+        </ul>
+      </div>
       <br>
   <el-button size="small" type="success" @click="showUploadDialog">涓婁紶闄勪欢</el-button>
       <div v-if="fileUrls.length > 0" class="file-list">
-        <span class="file-list-title">宸蹭笂浼犳枃浠讹細</span>
+        <span class="file-list-title">宸蹭笂浼犳枃浠�(淇濆瓨杩囩殑鏂囦欢灏嗚瑕嗙洊淇濆瓨)锛�</span>
         <ul>
           <li v-for="(file, index) in fileUrls" :key="index">
             {{ file.name }}
@@ -35,6 +43,8 @@
           v-model:file-list="fileList"
           drag
           accept=".txt,.doc,.docx,.pdf"
+          :limit="1"
+          :on-exceed="handleExceed"
       >
         <i class="el-icon-upload"></i>
         <div class="el-upload__text">灏嗘枃浠舵嫋鍒版澶勶紝鎴�<em>鐐瑰嚮涓婁紶</em></div>
@@ -44,7 +54,15 @@
         <el-button type="primary" @click="uploadFile">纭畾</el-button>
       </span>
     </el-dialog>
-    <ReportActions class="bottom" />
+    <ReportActions
+        :fileUrls="fileUrls"
+        :ProblemId="ProblemId"
+        :adminuserId="adminuserId"
+        :attachment="attachment"
+        :disabled="isReportActionsDisabled"
+        @refreshAttachment="refreshAttachmentInfo"
+        class="bottom"
+    />
   </div>
 
 </template>
@@ -59,11 +77,15 @@ import ReportActions from "@/views/user/report-submit/components/report-actions.
 
 const route = useRoute();
 const ProblemId = route.params.examId;
+const examId = route.params.examId;
 const description = ref(""); // 瀹為獙鎻忚堪
+const adminuserId = ref(""); //甯冪疆瀹為獙鐨勬暀甯坕d
 const reportText = ref(""); // 瀹為獙鎶ュ憡鏂囨湰
 const uploadDialogVisible = ref(false); // 鎺у埗涓婁紶寮圭獥鐨勬樉绀�
 const fileList = ref([]); // 涓婁紶鐨勬枃浠跺垪琛�
 const fileUrls = ref([]); // 鏂囦欢鐨刄RL鍒楄〃
+const attachment = ref(null);//宸蹭繚瀛樼殑鏂囦欢淇℃伅
+const isReportActionsDisabled = ref(false); // 鎺у埗ReportActions缁勪欢鐨勭鐢ㄧ姸鎬�
 const uploadComponent = ref(null); // 鐢ㄤ簬寮曠敤el-upload缁勪欢
 
 const getProblemInfo = async () => {
@@ -71,6 +93,7 @@ const getProblemInfo = async () => {
   try {
     const res = await api.findProblemById1({ params: { ProblemId } });
     description.value = res.data.description; // 鏇存柊浣滀笟鍚嶇О
+    adminuserId.value = res.data.adminuserId.toString(); // 鏇存柊鏁欏笀id
   } catch (error) {
     console.error("Failed to fetch problem info:", error);
   }
@@ -78,6 +101,10 @@ const getProblemInfo = async () => {
 
 // 鏄剧ず涓婁紶寮圭獥
 const showUploadDialog = () => {
+  if (fileUrls.value.length > 0) {
+    ElMessage.warning('鎮ㄥ凡缁忎笂浼犱簡鏂囦欢锛屼笉鑳藉啀娆′笂浼犮��');
+    return;
+  }
   uploadDialogVisible.value = true;
 };
 
@@ -89,11 +116,11 @@ const handleFileChange = (file, fileList) => {
 // 澶勭悊鏂囦欢涓婁紶鎴愬姛
 const handleUploadSuccess = (response, file, fileList) => {
   if (response.success) {
-    ElMessage.success('鏂囦欢涓婁紶鎴愬姛');
     // 鏇存柊鏂囦欢URL鍒楄〃
     fileUrls.value.push({ url: response.urls, name: response.data });
     uploadDialogVisible.value = false;
     fileList.value = [];
+    ElMessage.success('鏂囦欢涓婁紶鎴愬姛');
   } else {
     ElMessage.error('鏂囦欢涓婁紶澶辫触');
   }
@@ -105,6 +132,11 @@ const handleUploadError = (err, file, fileList) => {
   ElMessage.error('鏂囦欢涓婁紶澶辫触');
 };
 
+// 澶勭悊鏂囦欢鏁伴噺瓒呭嚭闄愬埗
+const handleExceed = (files, fileList) => {
+  ElMessage.error('鍙兘涓婁紶涓�涓檮浠�');
+};
+
 // 涓婁紶鏂囦欢
 const uploadFile = async () => {
   if (fileList.value.length === 0) {
@@ -119,38 +151,53 @@ const uploadFile = async () => {
   try {
     const response = await api.uploadFiles(formData); // 璋冪敤涓婁紶鏂囦欢鐨勬柟娉�
     console.log('Response from server:', response); // 鎵撳嵃鍝嶅簲鍐呭
-    if (response.code === 0) {
       ElMessage.success('鏂囦欢涓婁紶鎴愬姛');
       // 鏇存柊鏂囦欢URL鍒楄〃
       fileUrls.value.push({ url: response.urls, name: response.data });
       uploadDialogVisible.value = false;
       fileList.value = [];
-    } else {
-      ElMessage.error('鏂囦欢涓婁紶澶辫触1');
-    }
-  } catch (error) {
+
+  }catch (error) {
     console.error("Failed to upload files:", error);
     ElMessage.error('鏂囦欢涓婁紶澶辫触2');
   }
 };
 
-// 涓嬭浇鏂囦欢
-const downloadFile = (url) => {
-  const link = document.createElement('a');
-  link.href = url;
-  link.target = '_blank';
-  link.download = url.split('/').pop(); // 鎻愬彇鏂囦欢鍚�
-  document.body.appendChild(link);
-  link.click();
-  document.body.removeChild(link);
+
+const getSubmitReportInfo = async () => {
+  // 鏌ヨ宸蹭繚瀛樼殑鏂囦欢淇℃伅
+  try {
+    const res = await api.getSubmitReport({ params: { examId } });
+    if (res.data.attachment) {
+      attachment.value = res.data.attachment; // 鏇存柊闄勪欢淇℃伅
+    } else {
+      attachment.value = null;
+    }
+    if (res.data.score !== null && res.data.score !== undefined) {
+      isReportActionsDisabled.value = true; // 绂佺敤ReportActions缁勪欢
+    } else {
+      isReportActionsDisabled.value = false; // 鍚敤ReportActions缁勪欢
+    }
+  } catch (error) {
+
+  }
+};
+
+const refreshAttachmentInfo = async () => {
+  //鏇存柊宸蹭笂浼犵殑鏂囦欢淇℃伅
+  await getSubmitReportInfo();
 };
 
 // 鐢熷懡鍛ㄦ湡閽╁瓙
 onMounted(() => {
   getProblemInfo(); // 鎸傝浇鏃舵煡璇綔涓氫俊鎭�
+  getSubmitReportInfo();//鏌ヨ宸蹭繚瀛樼殑鏂囦欢淇℃伅
+
 });
 </script>
 
+
+
 <style scoped>
 .card-header {
   background-color: #f5f5f5; /* 鍔犳繁鐏拌壊鑳屾櫙 */
@@ -187,7 +234,7 @@ onMounted(() => {
 }
 
 .file-list {
-  margin-top: 20px;
+  margin-top: 10px;
 }
 
 .file-list-title {
diff --git a/AES-front/src/views/user/report-submit/components/report-actions.vue b/AES-front/src/views/user/report-submit/components/report-actions.vue
index 0e18981..41dadcc 100644
--- a/AES-front/src/views/user/report-submit/components/report-actions.vue
+++ b/AES-front/src/views/user/report-submit/components/report-actions.vue
@@ -1,31 +1,130 @@
 <template>
   <div class="button-container">
-    <n-button type="primary" size="small" @click="onSave">淇濆瓨</n-button>
-    <n-button type="success" size="small" @click="onSaveAndSubmit">淇濆瓨骞舵彁浜�</n-button>
-    <n-button type="warning" size="small" @click="onWithdraw">鐢宠鎾ゅ洖</n-button>
+    <n-button type="primary" size="small" @click="onSave" :disabled="props.disabled">淇濆瓨</n-button>
+    <n-button type="success" size="small" @click="onSaveAndSubmit" :disabled="props.disabled">淇濆瓨骞舵彁浜�</n-button>
+    <n-button type="warning" size="small" @click="onWithdraw" :disabled="props.disabled">鎾ゅ洖鎻愪氦</n-button>
   </div>
 </template>
 
 <script setup>
 import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import api from '@/api/user';
+import {ElMessage, ElMessageBox} from "element-plus";
 
+const route = useRoute();
 const isClicked = ref(false);
+const ProblemId = route.params.examId;
 
-const emit = defineEmits(['clickSave', 'clickSaveAndSubmit', 'clickWithdraw']);
+const props = defineProps({
+  fileUrls: Array,
+  adminuserId: [String],
+  attachment: [String],
+  disabled:Boolean
+});
 
-const onSave = () => {
-  // TODO: 瀹炵幇淇濆瓨閫昏緫
-  emit('clickSave');
+const emit = defineEmits(['clickSave', 'clickSaveAndSubmit', 'clickWithdraw', 'refreshAttachment']);
+
+const onSave = async () => {  //淇濆瓨
+  // 妫�鏌ユ槸鍚︽湁鏂囦欢淇℃伅涓旀暟缁勪笉涓虹┖
+  if (props.fileUrls && props.fileUrls.length > 0) {
+
+
+    // 璋冪敤 API 淇濆瓨鎻愪氦淇℃伅鍒版暟鎹簱锛屽寘鎷枃浠跺悕銆侀鐩甶d锛屽鐢焛d锛岃�佸笀id锛�
+    try {
+      const attachment = props.fileUrls[0].name;
+      const adminuserId =props.adminuserId;
+      const problemId = ProblemId;
+      const submitReport = {
+        attachment,
+        problemId,
+        adminuserId,
+      };
+      const res = await api.saveInfoToProps(submitReport);
+      // 澶勭悊鎴愬姛閫昏緫
+      emit('clickSave');
+      emit('refreshAttachment');
+      ElMessage.success('淇濆瓨鎴愬姛锛�');
+    } catch (error) {
+      // 澶勭悊閿欒閫昏緫
+      console.error("Failed to save Files:", error);
+      ElMessage.error('淇濆瓨鏂囦欢鏃跺彂鐢熼敊璇紒');
+    }
+  } else {
+    // 濡傛灉娌℃湁鏂囦欢淇℃伅锛屽湪杩欓噷澶勭悊
+    ElMessage.error('灏氭湭涓婁紶鏂扮殑鏂囦欢锛�');
+  }
 };
 
-const onSaveAndSubmit = () => {
-  // TODO: 瀹炵幇淇濆瓨骞舵彁浜ら�昏緫
-  emit('clickSaveAndSubmit');
-};
+const onSaveAndSubmit = async () => {//淇濆瓨骞舵彁浜�
+  let shouldSubmit = false;
+
+  // 妫�鏌ユ槸鍚︽湁鏂颁笂浼犵殑鏂囦欢
+  const hasNewFiles = props.fileUrls && props.fileUrls.length > 0;
+
+  if (props.attachment && !hasNewFiles) {
+    // 濡傛灉attachment涓嶄负绌轰笖娌℃湁鏂版枃浠讹紝鍑嗗鎻愪氦
+    shouldSubmit = true;
+  } else if (hasNewFiles) {
+    // 濡傛灉鏈夋柊涓婁紶鐨勬枃浠讹紝鏃犺attachment鏄惁涓虹┖锛岄兘鍏堜繚瀛樻柊鏂囦欢
+    await onSave(); // 鍏堣皟鐢ㄤ繚瀛橀�昏緫
+    shouldSubmit = true;
+  } else {
+    ElMessage.error('灏氭湭涓婁紶鏂囦欢锛�');
+    return;
+  }
+
+  if (shouldSubmit) {
+    // 寮瑰嚭纭鎻愪氦鐨勫璇濇
+    ElMessageBox.confirm('纭畾瑕佹彁浜ゅ悧锛熸彁浜ゆ椂灏嗕互褰撲笅宸蹭繚瀛樼殑鏂囦欢涓哄噯銆�', '纭鎻愪氦', {
+      confirmButtonText: '纭畾',
+      cancelButtonText: '鍙栨秷',
+      type: 'warning'
+    }).then(async () => {
+      try {//鎻愪氦閫昏緫
+        const adminuserId =props.adminuserId;
+        const problemId = ProblemId;
+        const submitReport1 = {
+          problemId,
+          adminuserId
+        };
+        const res = await api.submitInfoToProps(submitReport1);
+        emit('clickSaveAndSubmit');
+        emit('refreshAttachment');
+        ElMessage.success('鎻愪氦鎴愬姛锛�');
+      } catch (error) {
+        console.error("Failed to submit:", error);
+        ElMessage.error('鎻愪氦鏃跺彂鐢熼敊璇紒');
+      }
+    }).catch(() => {
+      // 鐢ㄦ埛鍙栨秷鎻愪氦
+    });
+  }
+};
+const onWithdraw = () => { //鎾ゅ洖鎻愪氦
+  ElMessageBox.confirm('纭畾鎾ゅ洖宸叉彁浜ょ殑鎶ュ憡鍚楋紵', '纭鎾ゅ洖', {
+    confirmButtonText: '纭畾',
+    cancelButtonText: '鍙栨秷',
+    type: 'warning'
+  }).then(async () => {
+    try {//鎾ゅ洖閫昏緫
+      const adminuserId =props.adminuserId;
+      const problemId = ProblemId;
+      const submitReport2 = {
+        problemId,
+        adminuserId
+      };
+      const res = await api.withdrawInfoToProps(submitReport2);
+      emit('clickWithdraw');
+      ElMessage.success('鎾ゅ洖鎴愬姛锛�');
+    } catch (error) {
+      console.error("Failed to Withdraw:", error);
+      ElMessage.error('鎾ゅ洖鏃跺彂鐢熼敊璇紒');
+    }
+  }).catch(() => {
+    // 鐢ㄦ埛鍙栨秷鎾ゅ洖
+  });
 
-const onWithdraw = () => {
-  // TODO: 瀹炵幇鐢宠鎾ゅ洖閫昏緫
-  emit('clickWithdraw');
 };
 </script>
 
diff --git a/AES-front/src/views/user/report-submit/components/rightparts.vue b/AES-front/src/views/user/report-submit/components/rightparts.vue
index ceb56ef..0811b63 100644
--- a/AES-front/src/views/user/report-submit/components/rightparts.vue
+++ b/AES-front/src/views/user/report-submit/components/rightparts.vue
@@ -18,6 +18,7 @@
 import { ref, onMounted } from 'vue';
 import api from '@/api/user';
 import { useRoute } from 'vue-router';
+import {ElMessage} from "element-plus";
 
 const route = useRoute();
 const examId = route.params.examId;
@@ -28,8 +29,13 @@ const getJudgeInfo = async () => {
   // 鏌ヨ鎵归槄鐩稿叧淇℃伅
   try {
     const res = await api.getSubmitReport({ params: { examId } });
-    comment.value = res.data.comment; // 鏇存柊鏁欏笀璇勮
-    plagiarismStatus.value = res.data.plagiarismStatus; // 鏇存柊鎶勮鐘舵��
+    if(res.data==null){
+      ElMessage.warning("灏氭湭鎻愪氦浣滀笟锛�")
+    }
+    else {
+      comment.value = res.data.comment; // 鏇存柊鏁欏笀璇勮
+      plagiarismStatus.value = res.data.plagiarismStatus; // 鏇存柊鎶勮鐘舵��
+    }
   } catch (error) {
     console.error("Failed to fetch problem info:", error);
   }
diff --git a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java
index 2258548..aa7371e 100644
--- a/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java
+++ b/AES/src/main/java/com/example/aes/problem/controller/ProblemController.java
@@ -7,11 +7,16 @@ import com.example.aes.problem.model.*;
 import com.example.aes.problem.model.DataGrid;
 import com.example.aes.problem.service.ProblemServiceI;
 import com.example.aes.user.model.Classstudents;
+import com.example.aes.user.model.PMUser;
 import com.example.aes.user.service.ClassesServiceI;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+
+import javax.persistence.criteria.CriteriaBuilder;
 import javax.servlet.http.HttpServletRequest;
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -295,7 +300,7 @@ public class ProblemController {
         //鏍规嵁鐝骇id鏌ヨ鎵�鏈変綔涓�
         List<PMProblem> pMproblems = problemServiceI.getProblemsByClassIds(classIds);
 
-        // 鏍规嵁瀛︾敓ID鍜屼綔涓氬垪琛ㄦ煡璇㈡彁浜ゆ姤鍛婄殑鐘舵�侊紝鍒嗕负鎻愪氦鐘舵�佸拰鏌ラ噸鐘舵��,骞舵洿鏂板埌pmproblem涓�
+        // 鏍规嵁瀛︾敓ID鍜屼綔涓氬垪琛ㄦ煡璇㈡彁浜ゆ姤鍛婄殑鐘舵�侊紝鍒嗕负鎻愪氦鐘舵�佸拰鏌ラ噸鐘舵��,骞舵洿鏂板埌pMproblems涓�
         problemServiceI.findStatusByStudentIdAndProblems(Integer.parseInt(userId), pMproblems);
 
         //鍒嗛〉澶勭悊
@@ -372,7 +377,7 @@ public class ProblemController {
         UReportSubmitted ureportsubmitted =
                 problemServiceI.findScoreAndRankByIds(examId, userId);
         if (ureportsubmitted != null) {
-            return RespBean.ok("鏌ヨ鎴愮哗鎺掑悕鎴愬姛锛�", ureportsubmitted);
+            return RespBean.ok("鏌ヨ浣滀笟淇℃伅鎴愬姛锛�", ureportsubmitted);
         } else {
             return RespBean.ok("灏氭湭鎻愪氦浣滀笟锛�");
         }
@@ -401,4 +406,77 @@ public class ProblemController {
             return RespBean.error("鑾峰彇鏁欏笀甯冪疆瀹為獙鍏蜂綋淇℃伅澶辫触锛�");
         }
     }
+
+
+    //瀛︾敓淇濆瓨鎶ュ憡
+    @PostMapping("/saveInfoToProps")
+    public RespBean saveInfoToProps(@RequestBody SubmitReport submitReport,HttpServletRequest request) {
+        DecodeToken decodeToken = new DecodeToken(request);
+        String UserId = decodeToken.getUserId();
+        int userId = Integer.parseInt(UserId);
+        LocalDateTime now = LocalDateTime.now();
+
+        submitReport.setStudentId(userId);
+        if(problemServiceI.findReportSubmitted(submitReport)){//濡傛灉涔嬪墠淇濆瓨杩囨暟鎹�,鏇存柊鏁版嵁
+            submitReport.setSubmissionTime(now);
+            boolean result = problemServiceI.updateSubmitInfoToProps(submitReport);
+            if (result) {
+                return RespBean.ok("淇℃伅鏇存柊鎴愬姛");
+            } else {
+                return RespBean.error("淇℃伅鏇存柊澶辫触");
+            }
+        }
+        else {  //鏂扮敓鎴愪竴鏉℃暟鎹�
+            submitReport.setPlagiarismStatus("0");//鏌ラ噸鐘舵�侀粯璁や负0
+            submitReport.setSubmissionStatus("0");//鎻愪氦鐘舵�佸湪淇濆瓨鏃惰缃负0
+            submitReport.setSubmissionTime(now);
+            boolean result = problemServiceI.saveSubmitInfoToProps(submitReport);
+            if (result) {
+                return RespBean.ok("淇℃伅娣诲姞鎴愬姛");
+            } else {
+                return RespBean.error("淇℃伅娣诲姞澶辫触");
+            }
+        }
+    }
+
+    //瀛︾敓鎻愪氦鎶ュ憡
+    @PostMapping("/submitInfoToProps")
+    public RespBean submitInfoToProps(@RequestBody SubmitReport submitReport,HttpServletRequest request) {
+        DecodeToken decodeToken = new DecodeToken(request);
+        String UserId = decodeToken.getUserId();
+        int userId = Integer.parseInt(UserId);
+        submitReport.setStudentId(userId);
+
+        if (problemServiceI.findReportSubmitted(submitReport)) {
+            boolean result = problemServiceI.updateSubmitInfoForSubmission(submitReport);
+            if (result) {
+                return RespBean.ok("鎻愪氦淇℃伅鏇存柊鎴愬姛");
+            } else {
+                return RespBean.error("鎻愪氦淇℃伅鏇存柊澶辫触");
+            }
+        }
+        else{
+            return RespBean.error("鏈壘鍒拌瀛︾敓鎻愪氦淇℃伅锛�");
+        }
+    }
+    //瀛︾敓鎾ゅ洖鎶ュ憡
+    @PostMapping("/withdrawInfoToProps")
+    public RespBean withdrawInfoToProps(@RequestBody SubmitReport submitReport,HttpServletRequest request) {
+        DecodeToken decodeToken = new DecodeToken(request);
+        String UserId = decodeToken.getUserId();
+        int userId = Integer.parseInt(UserId);
+        submitReport.setStudentId(userId);
+
+        if (problemServiceI.findReportSubmitted(submitReport)) {
+            boolean result = problemServiceI.withdrawSubmitInfo(submitReport);
+            if (result) {
+                return RespBean.ok("鎾ゅ洖淇℃伅鏇存柊鎴愬姛");
+            } else {
+                return RespBean.error("鎾ゅ洖淇℃伅鏇存柊澶辫触");
+            }
+        }
+        else{
+            return RespBean.error("鏈壘鍒拌瀛︾敓鎻愪氦淇℃伅锛�");
+        }
+    }
 }
\ No newline at end of file
diff --git a/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java b/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java
index 1bbc65d..b2f9d7d 100644
--- a/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java
+++ b/AES/src/main/java/com/example/aes/problem/dao/SubmitReportDaoI.java
@@ -18,4 +18,10 @@ public interface SubmitReportDaoI extends BaseDaoI<SubmitReport> {
     public List<Object[]> findScoreList(PMStudentSubmit pmStudentSubmit);
     public List<Integer> findNextId(int problemId);
 
+
+    public boolean saveSubmitInfo(SubmitReport submitReport);
+    public boolean getReportSubmitted(SubmitReport submitReport);
+    public boolean updateReportSubmitted(SubmitReport submitReport);
+    public boolean updateReportSubmittedForSubmission(SubmitReport submitReport);
+    public boolean withdrawReportSubmitted(SubmitReport submitReport);
 }
diff --git a/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java b/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java
index 2dab613..36bf4a6 100644
--- a/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java
+++ b/AES/src/main/java/com/example/aes/problem/dao/impl/SubmitReportDaoImpl.java
@@ -6,6 +6,8 @@ import com.example.aes.problem.model.PMStudentSubmit;
 import com.example.aes.problem.model.SubmitReport;
 import com.example.aes.user.dao.impl.BaseDaoImpl;
 import org.hibernate.Query;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
 import org.springframework.stereotype.Repository;
 
 import javax.persistence.criteria.CriteriaBuilder;
@@ -15,26 +17,26 @@ import java.util.List;
 @Repository("SubmitReportDao")
 public class SubmitReportDaoImpl extends BaseDaoImpl<SubmitReport> implements SubmitReportDaoI {
     @Override
-    public List<Object[]> findWeijiaoList(PMStudentSubmit pmStudentSubmit){
-int classId= pmStudentSubmit.getClassId();
-int problemId= pmStudentSubmit.getProblemId();
-String studentNo=
-        '%'+pmStudentSubmit.getStudentNo()+'%';
-String chineseName=
-        '%'+pmStudentSubmit.getChineseName()+'%';
-        String hql="SELECT u.chineseName," +
+    public List<Object[]> findWeijiaoList(PMStudentSubmit pmStudentSubmit) {
+        int classId = pmStudentSubmit.getClassId();
+        int problemId = pmStudentSubmit.getProblemId();
+        String studentNo =
+                '%' + pmStudentSubmit.getStudentNo() + '%';
+        String chineseName =
+                '%' + pmStudentSubmit.getChineseName() + '%';
+        String hql = "SELECT u.chineseName," +
                 "u.studentNo, sr" +
                 ".readTime," +
                 "sr.submissionStatus,u.id " +
                 "FROM Classstudents cs left " +
                 "join Users u on cs" +
-                ".userId=u.id "+
+                ".userId=u.id " +
                 "left join PostProblem pp on cs" +
-                ".classId=pp.classId "+
-                "left JOIN"+
+                ".classId=pp.classId " +
+                "left JOIN" +
                 " SubmitReport sr ON  " +
                 "sr" +
-                ".studentId=u.id"+
+                ".studentId=u.id" +
                 " WHERE cs.classId=:classId " +
                 "and " +
                 "pp.problemId " +
@@ -46,40 +48,42 @@ String chineseName=
                 "and u" +
                 ".chineseName like :chineseName";
         Query<Object[]> query =
-                this.getCurrentSession().createQuery(hql,Object[].class);
+                this.getCurrentSession().createQuery(hql, Object[].class);
         query.setParameter("classId", classId);
         query.setParameter("problemId", problemId);
-        query.setParameter("studentNo",studentNo);
+        query.setParameter("studentNo", studentNo);
         query.setParameter("chineseName",
                 chineseName);
-        int page= pmStudentSubmit.getPageNum();
-        int rows= pmStudentSubmit.getPageSize();
+        int page = pmStudentSubmit.getPageNum();
+        int rows = pmStudentSubmit.getPageSize();
         // 璁剧疆鍒嗛〉
         query.setFirstResult((page - 1) * rows); // 璁＄畻璧峰琛�
         query.setMaxResults(rows); // 璁剧疆姣忛〉琛屾暟
 
         return query.getResultList();
     }
+
     @Override
-    public int updateAddTime(LocalDateTime addTime,int problemId,int studentId){
-        String hql= "UPDATE SubmitReport sr SET" +
+    public int updateAddTime(LocalDateTime addTime, int problemId, int studentId) {
+        String hql = "UPDATE SubmitReport sr SET" +
                 " sr.addTime= :addTime "
                 + "WHERE sr.problemId = " +
                 ":problemId" +
                 " AND sr.studentId= :studentId";
         Query q = this.getCurrentSession().createQuery(hql);
-        q.setParameter("addTime",addTime);
-        q.setParameter("problemId",problemId);
-        q.setParameter("studentId",studentId);
+        q.setParameter("addTime", addTime);
+        q.setParameter("problemId", problemId);
+        q.setParameter("studentId", studentId);
         int num = q.executeUpdate();
         return num;
     }
+
     @Override
-    public int editScoreAndComment(PMReviewMessage pmReviewMessage){
-        Float score= pmReviewMessage.getScore();
-        String comment=
+    public int editScoreAndComment(PMReviewMessage pmReviewMessage) {
+        Float score = pmReviewMessage.getScore();
+        String comment =
                 pmReviewMessage.getComment();
-        String hql= "UPDATE SubmitReport sr SET" +
+        String hql = "UPDATE SubmitReport sr SET" +
                 " sr.score= :score,sr" +
                 ".comment=:comment,sr" +
                 ".submissionStatus='宸叉壒闃�' "
@@ -87,8 +91,8 @@ String chineseName=
                 ":problemId" +
                 " AND sr.studentId= :studentId";
         Query q = this.getCurrentSession().createQuery(hql);
-        q.setParameter("score",score);
-        q.setParameter("comment",comment);
+        q.setParameter("score", score);
+        q.setParameter("comment", comment);
         q.setParameter("problemId",
                 pmReviewMessage.getProblemId());
         q.setParameter("studentId",
@@ -96,9 +100,10 @@ String chineseName=
         int num = q.executeUpdate();
         return num;
     }
+
     @Override
-    public int redoReport(PMReviewMessage pmReviewMessage){
-        String hql= "UPDATE SubmitReport sr set" +
+    public int redoReport(PMReviewMessage pmReviewMessage) {
+        String hql = "UPDATE SubmitReport sr set" +
                 " sr.submissionStatus='宸查鍙�'," +
                 "sr.submissionTime=null " +
                 "WHERE sr.problemId = " +
@@ -112,15 +117,16 @@ String chineseName=
         int num = q.executeUpdate();
         return num;
     }
+
     @Override
-    public List<Object[]> findYijiaoList(PMStudentSubmit pmStudentSubmit){
-        int classId= pmStudentSubmit.getClassId();
-        int problemId= pmStudentSubmit.getProblemId();
-        String studentNo=
-                '%'+pmStudentSubmit.getStudentNo()+'%';
-        String chineseName=
-                '%'+pmStudentSubmit.getChineseName()+'%';
-        String hql="SELECT u.chineseName," +
+    public List<Object[]> findYijiaoList(PMStudentSubmit pmStudentSubmit) {
+        int classId = pmStudentSubmit.getClassId();
+        int problemId = pmStudentSubmit.getProblemId();
+        String studentNo =
+                '%' + pmStudentSubmit.getStudentNo() + '%';
+        String chineseName =
+                '%' + pmStudentSubmit.getChineseName() + '%';
+        String hql = "SELECT u.chineseName," +
                 "u.studentNo, sr" +
                 ".submissionTime," +
                 "sr.submissionStatus," +
@@ -129,13 +135,13 @@ String chineseName=
                 "AS finalScore ,u.id " +
                 "FROM Classstudents cs left " +
                 "join Users u on cs" +
-                ".userId=u.id "+
+                ".userId=u.id " +
                 "left join PostProblem pp on cs" +
-                ".classId=pp.classId "+
-                "left JOIN"+
+                ".classId=pp.classId " +
+                "left JOIN" +
                 " SubmitReport sr ON  " +
                 "sr" +
-                ".studentId=u.id"+
+                ".studentId=u.id" +
                 " WHERE cs.classId=:classId " +
                 "and " +
                 "pp.problemId " +
@@ -148,29 +154,30 @@ String chineseName=
                 "and u" +
                 ".chineseName like :chineseName";
         Query<Object[]> query =
-                this.getCurrentSession().createQuery(hql,Object[].class);
+                this.getCurrentSession().createQuery(hql, Object[].class);
         query.setParameter("classId", classId);
         query.setParameter("problemId", problemId);
-        query.setParameter("studentNo",studentNo);
+        query.setParameter("studentNo", studentNo);
         query.setParameter("chineseName",
                 chineseName);
-        int page= pmStudentSubmit.getPageNum();
-        int rows= pmStudentSubmit.getPageSize();
+        int page = pmStudentSubmit.getPageNum();
+        int rows = pmStudentSubmit.getPageSize();
         // 璁剧疆鍒嗛〉
         query.setFirstResult((page - 1) * rows); // 璁＄畻璧峰琛�
         query.setMaxResults(rows); // 璁剧疆姣忛〉琛屾暟
 
         return query.getResultList();
     }
+
     @Override
-    public List<Object[]> findScoreList(PMStudentSubmit pmStudentSubmit){
-        int classId= pmStudentSubmit.getClassId();
-        int problemId= pmStudentSubmit.getProblemId();
+    public List<Object[]> findScoreList(PMStudentSubmit pmStudentSubmit) {
+        int classId = pmStudentSubmit.getClassId();
+        int problemId = pmStudentSubmit.getProblemId();
 //        String studentNo=
 //                '%'+pmStudentSubmit.getStudentNo()+'%';
 //        String chineseName=
 //                '%'+pmStudentSubmit.getChineseName()+'%';
-        String hql="SELECT u.chineseName," +
+        String hql = "SELECT u.chineseName," +
                 "u.studentNo, sr" +
                 ".submissionTime," +
                 "sr.submissionStatus," +
@@ -179,13 +186,13 @@ String chineseName=
                 "AS finalScore ,u.id " +
                 "FROM Classstudents cs left " +
                 "join Users u on cs" +
-                ".userId=u.id "+
+                ".userId=u.id " +
                 "left join PostProblem pp on cs" +
-                ".classId=pp.classId "+
-                "left JOIN"+
+                ".classId=pp.classId " +
+                "left JOIN" +
                 " SubmitReport sr ON  " +
                 "sr" +
-                ".studentId=u.id"+
+                ".studentId=u.id" +
                 " WHERE cs.classId=:classId " +
                 "and " +
                 "pp.problemId " +
@@ -194,16 +201,17 @@ String chineseName=
                 " and sr" +
                 ".submissionTime is not null";
         Query<Object[]> query =
-                this.getCurrentSession().createQuery(hql,Object[].class);
+                this.getCurrentSession().createQuery(hql, Object[].class);
         query.setParameter("classId", classId);
         query.setParameter("problemId", problemId);
         return query.getResultList();
     }
+
     @Override
-    public List<Object[]> findProblemReview(PMReviewMessage pmReviewMessage){
-        int studentId= pmReviewMessage.getStudentId();
-        int problemId= pmReviewMessage.getProblemId();
-        String hql="select p.title," +
+    public List<Object[]> findProblemReview(PMReviewMessage pmReviewMessage) {
+        int studentId = pmReviewMessage.getStudentId();
+        int problemId = pmReviewMessage.getProblemId();
+        String hql = "select p.title," +
                 "p.description,u.chineseName," +
                 "u.studentNo,u.banji," +
                 "sr.attachment," +
@@ -220,14 +228,15 @@ String chineseName=
                 " " +
                 "p.id=:problemId";
         Query<Object[]> query =
-                this.getCurrentSession().createQuery(hql,Object[].class);
+                this.getCurrentSession().createQuery(hql, Object[].class);
         query.setParameter("studentId", studentId);
         query.setParameter("problemId", problemId);
         return query.getResultList();
     }
+
     @Override
-    public List<Integer> findNextId(int problemId){
-        String hql="SELECT " +
+    public List<Integer> findNextId(int problemId) {
+        String hql = "SELECT " +
                 "sr.studentId " +
                 "FROM Users u " +
                 "INNER JOIN " +
@@ -244,4 +253,108 @@ String chineseName=
         q.setParameter("problemId", problemId);
         return q.list();
     }
-}
+
+    @Override
+    public boolean saveSubmitInfo(SubmitReport submitReport) {
+        Session session = this.getCurrentSession();
+        try {
+            session.save(submitReport);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    @Override
+    public boolean getReportSubmitted(SubmitReport submitReport) {
+        Session session = this.getCurrentSession();
+        boolean isSubmitted = false;
+        try {
+            // 鏋勫缓鏌ヨ璇彞 鍙兘鎶ラ敊浣嗕笉褰卞搷
+            String hql = "FROM SubmitReport WHERE problemId = :problemId AND studentId = :studentId AND adminuserId = :adminuserId";
+
+            Query<SubmitReport> query = session.createQuery(hql, SubmitReport.class);
+            query.setParameter("problemId", submitReport.getProblemId());
+            query.setParameter("studentId", submitReport.getStudentId());
+            query.setParameter("adminuserId", submitReport.getAdminuserId());
+            SubmitReport result = query.uniqueResult();
+            isSubmitted = (result != null);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return isSubmitted;
+    }
+
+    @Override
+    public boolean updateReportSubmitted(SubmitReport submitReport) {
+        Session session = this.getCurrentSession();
+        try {
+
+            //鍙洿鏂皊ubmissionTime鍜宎ttachment
+            String hql = "UPDATE SubmitReport SET submissionTime = :submissionTime, attachment = :attachment " +
+                    "WHERE problemId = :problemId AND adminuserId = :adminuserId AND studentId = :studentId";
+
+            Query query = session.createQuery(hql);
+
+            query.setParameter("submissionTime", submitReport.getSubmissionTime());
+            query.setParameter("attachment", submitReport.getAttachment());
+            query.setParameter("problemId", submitReport.getProblemId());
+            query.setParameter("adminuserId", submitReport.getAdminuserId());
+            query.setParameter("studentId", submitReport.getStudentId());
+
+            int result = query.executeUpdate();
+
+            return result > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    @Override
+    public boolean updateReportSubmittedForSubmission(SubmitReport submitReport) {
+        Session session = this.getCurrentSession();
+        try {
+
+            String hql = "UPDATE SubmitReport SET submissionStatus = '1' " +
+                    "WHERE problemId = :problemId " +
+                    "AND adminuserId = :adminuserId " +
+                    "AND studentId = :studentId";
+
+            Query query = session.createQuery(hql);
+            query.setParameter("problemId", submitReport.getProblemId());
+            query.setParameter("adminuserId", submitReport.getAdminuserId());
+            query.setParameter("studentId", submitReport.getStudentId());
+
+            int result = query.executeUpdate();
+            return result > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    @Override
+    public boolean withdrawReportSubmitted(SubmitReport submitReport) {
+        Session session = this.getCurrentSession();
+        try {
+
+            String hql = "UPDATE SubmitReport SET submissionStatus = '2' " +
+                    "WHERE problemId = :problemId " +
+                    "AND adminuserId = :adminuserId " +
+                    "AND studentId = :studentId";
+
+            Query query = session.createQuery(hql);
+            query.setParameter("problemId", submitReport.getProblemId());
+            query.setParameter("adminuserId", submitReport.getAdminuserId());
+            query.setParameter("studentId", submitReport.getStudentId());
+
+            int result = query.executeUpdate();
+            return result > 0;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java
index 09dc715..af9578c 100644
--- a/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java
+++ b/AES/src/main/java/com/example/aes/problem/service/Impl/ProblemServiceImpl.java
@@ -154,14 +154,20 @@ public class ProblemServiceImpl implements ProblemServiceI {
             if (reportStatus != null && studentId.equals(reportStatus.getStudentId())) {
                 pmProblem.setSubmissionStatus(reportStatus.getSubmissionStatus());
                 pmProblem.setPlagiarismStatus(reportStatus.getPlagiarismStatus());
-                pmProblem.setScore(reportStatus.getScore());
+                if (reportStatus.getScore() != null) {
+                    pmProblem.setScore(reportStatus.getScore());
+                }
 
                 // 鏍规嵁submissionStatus璁剧疆status
                 if ("0".equals(reportStatus.getSubmissionStatus())) {
                     pmProblem.setStatus("鏈彁浜�");
-                } else if ("1".equals(reportStatus.getSubmissionStatus())) {
+                }
+                else if ("1".equals(reportStatus.getSubmissionStatus())) {
                     pmProblem.setStatus("宸叉彁浜�");
                 }
+                else if("2".equals(reportStatus.getSubmissionStatus())){
+                    pmProblem.setStatus("宸叉挙鍥�");
+                }
 
                 // 濡傛灉score涓嶄负绌猴紝鍒欏皢status璁剧疆涓簊core鐨勫叿浣撳��
                 if (reportStatus.getScore() != null) {
@@ -478,6 +484,32 @@ public int redoReport(PMReviewMessage pmReviewMessage){
         return studentSubmitDao.findNextId(problemId).get(0);
         else return 0;
     }
+
+    @Override
+    public boolean saveSubmitInfoToProps(SubmitReport submitReport) {
+        return studentSubmitDao.saveSubmitInfo(submitReport);
+    }
+
+    @Override
+    public boolean findReportSubmitted(SubmitReport submitReport) {
+        return studentSubmitDao.getReportSubmitted(submitReport);
+    }
+
+    @Override
+    public boolean updateSubmitInfoToProps(SubmitReport submitReport) {
+        return studentSubmitDao.updateReportSubmitted(submitReport);
+    }
+
+    @Override
+    public boolean updateSubmitInfoForSubmission(SubmitReport submitReport) {
+        return studentSubmitDao.updateReportSubmittedForSubmission(submitReport);
+    }
+
+    @Override
+    public boolean withdrawSubmitInfo(SubmitReport submitReport) {
+        return studentSubmitDao.withdrawReportSubmitted(submitReport);
+    }
+
     @Override
     public int editPostProblem(int classId,
                                int problemId,LocalDateTime startTime,LocalDateTime endTime,boolean allow){
diff --git a/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java b/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java
index 3d7fad7..4e6139a 100644
--- a/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java
+++ b/AES/src/main/java/com/example/aes/problem/service/ProblemServiceI.java
@@ -55,4 +55,10 @@ public interface ProblemServiceI {
 	public int redoReport(PMReviewMessage pmReviewMessage);
 	public List<Float> findScoreList(PMStudentSubmit pmStudentSubmit);
 	public int findNextId(int problemId);
+
+	boolean saveSubmitInfoToProps(SubmitReport submitReport);//瀛︾敓淇濆瓨鎶ュ憡锛堜繚瀛橈紝涔嬪墠鏈繚瀛樿繃锛�
+	boolean findReportSubmitted(SubmitReport submitReport);//鏌ヨ璇ュ鐢熶箣鍓嶆槸鍚﹀凡缁忔彁浜よ繃璇ラ棶棰樼殑鎶ュ憡
+	boolean updateSubmitInfoToProps(SubmitReport submitReport);//瀛︾敓鏇存柊鎶ュ憡淇℃伅锛堜繚瀛橈紝涔嬪墠淇濆瓨杩囷級
+	boolean updateSubmitInfoForSubmission(SubmitReport submitReport);//瀛︾敓鎻愪氦鎶ュ憡
+	boolean withdrawSubmitInfo(SubmitReport submitReport);//瀛︾敓鎾ゅ洖鎶ュ憡
 }