From 02645bcc57bf228d4e15797a56e08f57afc0bc83 Mon Sep 17 00:00:00 2001
From: lroyia <lirh@chinaweal.com.cn>
Date: Mon, 30 Mar 2026 16:02:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BA=A0=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TBizRemPunishmentNController.java           | 5 ++++-
 .../punishment/service/ITBizRemPunishmentService.java      | 1 +
 .../service/impl/TBizRemPunishmentServiceImpl.java         | 7 +++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentNController.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentNController.java
index 0cde40b..482e663 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentNController.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/controller/TBizRemPunishmentNController.java
@@ -13,10 +13,11 @@ import com.chinaweal.aiccs.aiccs.punishment.entity.TBizRemPunishment;
 import com.chinaweal.aiccs.aiccs.punishment.service.ICrECaseService;
 import com.chinaweal.aiccs.aiccs.punishment.service.IQgCasePubNbaseinfoService;
 import com.chinaweal.aiccs.aiccs.punishment.service.ITBizRemPunishmentService;
-import com.chinaweal.aiccs.aiccs.punishment.service.TswrittemplateService;
 import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
+import com.chinaweal.aiccs.aiccs.writs.service.TswrittemplateService;
 import com.chinaweal.aiccs.common.base.controller.BaseController;
 import com.chinaweal.aiccs.common.constant.BaseDataConstant;
+import com.chinaweal.aiccs.common.constant.Constant;
 import com.chinaweal.aiccs.common.util.*;
 import com.chinaweal.aiccs.config.CommonConfig;
 import com.chinaweal.aiccs.common.util.filestorage.FileStorageService;
@@ -31,12 +32,14 @@ import com.chinaweal.youfool.framework.sso.util.SSOUtil;
 import com.github.xiaoymin.knife4j.annotations.ApiSort;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/ITBizRemPunishmentService.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/ITBizRemPunishmentService.java
index 7f69d4b..e0b2cc4 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/ITBizRemPunishmentService.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/ITBizRemPunishmentService.java
@@ -1,5 +1,6 @@
 package com.chinaweal.aiccs.aiccs.punishment.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.chinaweal.aiccs.aiccs.business.entity.TSTaskList;
 import com.chinaweal.aiccs.aiccs.punishment.entity.TBizRemPunishment;
 import com.chinaweal.aiccs.aiccs.writs.entity.Tswrittemplate;
diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
index 6578503..0da9d6b 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/punishment/service/impl/TBizRemPunishmentServiceImpl.java
@@ -373,9 +373,8 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
 
         // 修复日期
         LocalDateTime localDateTimeRepairDate = tBizRemPunishment.getRepairDate();
-        Date repairDate = Date.from(localDateTimeRepairDate.atZone(ZoneId.systemDefault()).toInstant());
-        LocalDate localDate = tBizRemPunishment.getApplyDate();
-        Date applyDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+        LocalDate repairDate = localDateTimeRepairDate.toLocalDate();
+        LocalDate applyDate = tBizRemPunishment.getApplyDate();
 
         crECase.setRepairdate(applyDate)
                 .setRepauth(tBizRemPunishment.getRepairOrg())
@@ -387,7 +386,7 @@ public class TBizRemPunishmentServiceImpl extends BaseServiceImpl<TBizRemPunishm
                 .setPenauth(qgCasePubNbaseinfo != null ? qgCasePubNbaseinfo.getPenAuth() : "")
                 .setPenauthcn(qgCasePubNbaseinfo != null ? qgCasePubNbaseinfo.getPenAuthCn() : "")
                 .setPendecno(qgCasePubNbaseinfo != null ? qgCasePubNbaseinfo.getPenDecNo() : "")
-                .setRepairno(tBizRemPunishment.getRepairNo())
+//                .setRepairno(tBizRemPunishment.getRepairNo())
                 .setSExtDatetime(now);
 
         crECaseService.save(crECase);