From 670b142d5c9650a6d1aabf2f766512d5d17a179e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 03 二月 2026 10:30:18 +0800
Subject: [PATCH] yys  导入销售台账同步生成生产订单

---
 src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
index 0c1f1d1..05f1ae7 100644
--- a/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
+++ b/src/main/java/com/ruoyi/safe/service/impl/SafeTrainingServiceImpl.java
@@ -10,6 +10,7 @@
 import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
 import com.ruoyi.production.pojo.ProductOrder;
 import com.ruoyi.production.pojo.ProductWorkOrder;
+import com.ruoyi.project.system.domain.SysNotice;
 import com.ruoyi.safe.dto.SafeTrainingDetailsDto;
 import com.ruoyi.safe.dto.SafeTrainingDto;
 import com.ruoyi.safe.mapper.SafeTrainingDetailsMapper;
@@ -21,15 +22,20 @@
 import com.ruoyi.safe.service.SafeTrainingService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -61,7 +67,7 @@
     @Override
     public int addOrUpdate(SafeTraining safeTraining) {
         if (ObjectUtils.isNull(safeTraining.getId())) {
-            String datePrefix = LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
+            String datePrefix ="KC-"+ LocalDate.now().format(DateTimeFormatter.ofPattern("yyMMdd"));
             // 鏌ヨ浠婃棩宸插瓨鍦ㄧ殑鏈�澶ц绋嬬紪鍙�
             QueryWrapper<SafeTraining> queryWrapper = new QueryWrapper<>();
             queryWrapper.likeRight("course_code", datePrefix)
@@ -81,7 +87,7 @@
                 }
             }
             // 鐢熸垚瀹屾暣鐨勮绋嬬紪鍙�
-            String no = "KC-" + String.format("%s%03d", datePrefix, sequenceNumber);
+            String no = String.format("%s%03d", datePrefix, sequenceNumber);
             safeTraining.setCourseCode(no);
         }
         //鏍规嵁鏃堕棿鍒ゆ柇鍩硅鐘舵��
@@ -106,13 +112,17 @@
     @Override
     public SafeTrainingDto getSafeTraining(Long id) {
         //涓昏〃鏁版嵁
-        SafeTrainingDto safeTrainingDto=safeTrainingMapper.getSafeTraining(id);
+        SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
         //闄勪欢
         List<SafeTrainingFile> safeTrainingFiles = safeTrainingFileMapper.selectList(Wrappers.<SafeTrainingFile>lambdaQuery().eq(SafeTrainingFile::getSafeTrainingId, id));
-        safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
+        if (safeTrainingFiles.size()>0){
+            safeTrainingDto.setSafeTrainingFileList(safeTrainingFiles);
+        }
         //鍩硅璁板綍璇︽儏
-        List<SafeTrainingDetailsDto> safeTrainingDetailsDto=safeTrainingDetailsMapper.getSafeTraining(id);
-        safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
+        List<SafeTrainingDetailsDto> safeTrainingDetailsDto = safeTrainingDetailsMapper.getSafeTraining(id);
+        if (safeTrainingDetailsDto.size()>0) {
+            safeTrainingDto.setSafeTrainingDetailsDtoList(safeTrainingDetailsDto);
+        }
         return safeTrainingDto;
     }
 
@@ -132,16 +142,16 @@
         //鍒犻櫎涓昏〃
         safeTrainingMapper.deleteBatchIds(ids);
         //鍒犻櫎闄勪欢
-        safeTrainingFileMapper.delete(Wrappers.<SafeTrainingFile>lambdaQuery().in(SafeTrainingFile::getSafeTrainingId,ids));
+        safeTrainingFileMapper.delete(Wrappers.<SafeTrainingFile>lambdaQuery().in(SafeTrainingFile::getSafeTrainingId, ids));
         //鍒犻櫎鍩硅璁板綍
-        safeTrainingDetailsMapper.delete(Wrappers.<SafeTrainingDetails>lambdaQuery().in(SafeTrainingDetails::getSafeTrainingId,ids));
+        safeTrainingDetailsMapper.delete(Wrappers.<SafeTrainingDetails>lambdaQuery().in(SafeTrainingDetails::getSafeTrainingId, ids));
         return 0;
     }
 
     @Override
     public void export(HttpServletResponse response, Long id) {
         SafeTrainingDto safeTrainingDto = safeTrainingMapper.getSafeTraining(id);
-        List<SafeTrainingDetailsDto> safeTrainingDetailsDtoList=safeTrainingDetailsMapper.getSafeTraining(id);
+        List<SafeTrainingDetailsDto> safeTrainingDetailsDtoList = safeTrainingDetailsMapper.getSafeTraining(id);
         InputStream inputStream = this.getClass().getResourceAsStream("/static/safe-training.docx");
         Configure configure = Configure.builder()
                 .bind("safeTrainingDetailsDtoList", new HackLoopTableRenderPolicy())
@@ -155,7 +165,7 @@
         try {
             response.setContentType("application/msword");
             String fileName = URLEncoder.encode(
-                    safeTrainingDto.getCourseCode()+"鍩硅涓庤�冩牳璁″垝", "UTF-8");
+                    safeTrainingDto.getCourseCode() + "鍩硅涓庤�冩牳璁″垝", "UTF-8");
             response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
             response.setHeader("Content-disposition",
                     "attachment;filename=" + fileName + ".docx");

--
Gitblit v1.9.3