From 6c4d6d425cfb5a2012df98aed8ff0314bb586ff1 Mon Sep 17 00:00:00 2001
From: xueqingkun <xueqingkun@126.com>
Date: Thu, 15 Aug 2024 14:59:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/NoteRecordSplitServiceImpl.java       | 10 ++++------
 .../com/supervision/police/vo/NoteRecordReqVO.java     |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java
index cc76564..e494c0d 100644
--- a/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java
+++ b/src/main/java/com/supervision/police/service/impl/NoteRecordSplitServiceImpl.java
@@ -166,12 +166,10 @@ public class NoteRecordSplitServiceImpl extends ServiceImpl<NoteRecordSplitMappe
             return caseTaskRecordService.save(newCaseTaskRecord);
         } else if (0 == splitSize) {
             // 如果笔录对为0,就直接不需要拆分,直接认为任务成功
-            CaseTaskRecord newCaseTaskRecord = new CaseTaskRecord();
-            newCaseTaskRecord.setCaseId(caseId);
-            newCaseTaskRecord.setRecordId(recordId);
-            newCaseTaskRecord.setStatus(2);
-            newCaseTaskRecord.setSubmitTime(LocalDateTime.now());
-            caseTaskRecordService.save(newCaseTaskRecord);
+            CaseTaskRecord caseTaskRecord = caseTaskRecordOpt.get();
+            caseTaskRecord.setStatus(2);
+            caseTaskRecord.setSubmitTime(LocalDateTime.now());
+            caseTaskRecordService.saveOrUpdate(caseTaskRecord);
             return false;
         } else {
             // 如果存在,则校验时间是否已经超过1天,如果超过了1天还没有执行完毕,就重新提交这个任务
diff --git a/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java b/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java
index e5bfff3..dc87681 100644
--- a/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java
+++ b/src/main/java/com/supervision/police/vo/NoteRecordReqVO.java
@@ -44,7 +44,7 @@ public class NoteRecordReqVO {
     /**
      * 供述材料
      */
-    private Integer confessionMaterial;
+    private String confessionMaterial;
 
     /**
      * 询问人
@@ -71,7 +71,7 @@ public class NoteRecordReqVO {
         }
         noteRecord.setName(name);
         noteRecord.setRole(role);
-        noteRecord.setConfessionMaterial(confessionMaterial);
+        //noteRecord.setConfessionMaterial(confessionMaterial);
         noteRecord.setLawAsker(lawAsker);
         noteRecord.setConfessionStartTime(confessionStartTime);
         noteRecord.setConfessionEndTime(confessionEndTime);