出入登记簿的日期改为离开日期

project_data/sql/1.0.12_FJ/soc/soc.sql

@@ -33,6 +33,15 @@ END ??
 DELIMITER ;
 CALL schema_change();
 
+-- 清空 2025-01-15 凌晨以后 的所有 紧急类型出入记录 的登记簿记录
+DELETE FROM core_register_book_pdf WHERE file_url IN (
+    SELECT r.pdf_url from core_out_in_record r
+                              INNER JOIN  core_introduce_letter_out_in_request l ON r.out_in_request_id = l.id
+    WHERE r.departure_time IS NOT NULL
+      AND l.letter_type =3
+      AND r.pdf_url is not NULL
+      AND r.departure_time > '2025-01-15'
+);
 -- 清空 2025-01-15 凌晨以后 的所有 紧急类型出入记录 的pdf_url
 UPDATE core_out_in_record r
     INNER JOIN  core_introduce_letter_out_in_request l ON r.out_in_request_id = l.id
@@ -40,4 +49,8 @@ UPDATE core_out_in_record r
 WHERE r.departure_time IS NOT NULL
   AND l.letter_type =3
   AND r.pdf_url is not NULL
-  AND r.departure_time > '2025-01-15';
+  AND r.departure_time > '2025-01-15';
+
+
+-- 设立业务库的值是“否”,值守方式就设置为null
+UPDATE sys_org_extend set duty_mode =NULL WHERE business_library =0 AND duty_mode is not NULL;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/service/impl/CoreOutInRecordServiceImpl.java

@@ -247,11 +247,13 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         log.info("来访管理登记簿数据准备完成,开始生成登记簿:{}", JSON.toJSONString(data));
         String finalFileName = fileName;
         CompletableFuture.runAsync(() -> {
+//            log.info("来访管理登记簿数据准备完成,开始生成登记簿:{}", JSON.toJSONString(data));
             R<String> r = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.generateOutInPdf(data), ErrorMsgConstants.GENERATE_PDF_ERROR);
             if (null == r || null == r.getData()) {
                 log.info("来访管理登记簿数据生成失败,参数:{}", JSON.toJSONString(data));
                 throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
             }
+//            log.info("来访管理登记簿数据生成成功,文件系统返回值:{}", JSON.toJSONString(r));
             String pdfUrl = r.getData();
             LambdaUpdateWrapper<CoreOutInRecord> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(CoreOutInRecord::getId, id);
@@ -261,7 +263,7 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
             CoreRegisterBookPdf registerBookPdf = new CoreRegisterBookPdf();
             registerBookPdf.setId(id);
             registerBookPdf.setRegisterBookType(RegisterBookType.VISIT_RECORD.getNum());
-            registerBookPdf.setDate(new Date());
+            registerBookPdf.setDate(record.getDepartureTime());
             registerBookPdf.setOrgId(record.getOrgId());
             registerBookPdf.setOrgName(record.getOrgName());
             registerBookPdf.setOrgPath(sysOrg.getPath());