zhulu 2 dni temu
rodzic
commit
4d8568e081

+ 4 - 0
project_data/sql/1.0.14/soc/soc.sql

@@ -1,6 +1,10 @@
 -- v 1.0.14 版本升级脚本
 
 -- 2025-11-5 18:41:59 :旧表备份
+DROP TABLE IF EXISTS core_introduce_letter_2025_11_20;
+CREATE TABLE core_introduce_letter_2025_11_20 LIKE core_introduce_letter;
+INSERT INTO core_introduce_letter_2025_11_20 SELECT * FROM core_introduce_letter;
+
 DROP TABLE IF EXISTS core_out_in_record_2025_11_20;
 CREATE TABLE core_out_in_record_2025_11_20 LIKE core_out_in_record;
 INSERT INTO core_out_in_record_2025_11_20 SELECT * FROM core_out_in_record;

+ 7 - 6
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/letter/export/CoreIntroduceLetterOutInRequestExcelVo.java

@@ -58,14 +58,14 @@ public class CoreIntroduceLetterOutInRequestExcelVo {
      * 有效开始时间
      */
     @ExcelProperty(value = {"${cellWriterValue}","有效开始时间"})
-    @ApiModelProperty(value = "有效开始时间")
+    @ApiModelProperty(value = "有效开始日期")
     @DateTimeFormat("yyyy-MM-dd")
     private Date startTime;
 
     /**
      * 有效结束时间
      */
-    @ExcelProperty(value = {"${cellWriterValue}","有效结束时间"})
+    @ExcelProperty(value = {"${cellWriterValue}","有效截止日期"})
     @ApiModelProperty(value = "有效结束时间")
     @DateTimeFormat("yyyy-MM-dd")
     private Date endTime;
@@ -139,15 +139,16 @@ public class CoreIntroduceLetterOutInRequestExcelVo {
 //    @ExcelProperty(value = {"${cellWriterValue}","备注图片"})
 //    private String remarkImage;
 
-    @ApiModelProperty(value = "人员姓名")
-    @ExcelProperty(value = {"${cellWriterValue}","人员姓名"})
-    private String userName;
-
     /** 出入人员单位名称 */
     @ApiModelProperty(value = "申请单位")
     @ExcelProperty(value = {"${cellWriterValue}","申请单位"})
     private String companyName;
 
+    @ApiModelProperty(value = "人员姓名")
+    @ExcelProperty(value = {"${cellWriterValue}","人员姓名"})
+    private String userName;
+
+
     /** 证件类型 */
     @ExcelProperty(value = {"${cellWriterValue}","证件类型"},converter = IdTypeConverter.class)
     private String idType;

+ 1 - 1
soc-modules/soc-modules-file/src/main/java/com/xunmei/file/utils/PdfUtil.java

@@ -713,7 +713,7 @@ public class PdfUtil {
                 createOutInPDFCell(tableFont, table, item.getCompanyName(), Element.ALIGN_MIDDLE, 2, 1);
 
 //
-                createOutInPDFCell(tableFont, table, "出入人员", Element.ALIGN_MIDDLE, 1, 1);
+                createOutInPDFCell(tableFont, table, "人员姓名", Element.ALIGN_MIDDLE, 1, 1);
                 createOutInPDFCell(tableFont, table, item.getUserName(), Element.ALIGN_MIDDLE, 2, 1);
 //第二行 30
                 createOutInPDFCell(tableFont, table, "证件类型", Element.ALIGN_MIDDLE, 1, 1);