From 3c689b16c3258becbfec457876f9dbd25dffebe7 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Tue, 30 Dec 2025 21:50:06 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95]=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/StudyFormPreServiceImpl.java      | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
index ed818ee..d8910da 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
@@ -1,5 +1,6 @@
 package com.hxhq.business.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -92,15 +93,24 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
      */
     @Override
     public void tj(StudyFormPre studyFormPre){
-        StudyFormPre studyFormPreOld=this.getById(studyFormPre.getId());
-        if(studyFormPreOld==null){
-            throw  new SecurityException("信息不存在或已删除");
-        }
-        if(SecurityUtils.getUserId().equals(studyFormPreOld.getUserId())){
-            throw  new SecurityException("只能操作自己的表单");
+        if(studyFormPre.getId()!=null){
+            StudyFormPre studyFormPreOld=this.getById(studyFormPre.getId());
+            if(studyFormPreOld==null){
+                throw  new SecurityException("信息不存在或已删除");
+            }
+            if(SecurityUtils.getUserId().equals(studyFormPreOld.getUserId())){
+                throw  new SecurityException("只能操作自己的表单");
+            }
+            studyFormPre.setBdzt(StudyFormPreBdztEnum.ytj.getValue());
+            studyFormPre.setTjsj(new Date());
+            this.updateById(studyFormPre);
+        }else{
+            studyFormPre.setUserId(SecurityUtils.getUserId());
+            studyFormPre.setTjsj(new Date());
+            studyFormPre.setUserMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            studyFormPre.setBdzt(StudyFormPreBdztEnum.ytj.getValue());
+            this.save(studyFormPre);
         }
-        studyFormPre.setBdzt(StudyFormPreBdztEnum.ytj.getValue());
-        this.updateById(studyFormPre);
         //稽查轨迹 todo
 
     }