来访管理登记簿样式提交，增加审批人登记人签名

project_data/sql/0.0.7/soc/soc.sql

@@ -50,7 +50,7 @@ CREATE PROCEDURE schema_change () BEGIN
             ADD COLUMN `out_in_request_effective_end_time` datetime NULL COMMENT '出入申请生效结束时间' AFTER `out_in_request_effective_start_time`,
             ADD COLUMN `out_in_request_id` bigint NULL COMMENT '出入申请Id' AFTER `out_in_request_effective_end_time`,
             ADD COLUMN `out_in_request_user_id` bigint NULL COMMENT '出入人员在出入申请中的人员ID' AFTER `out_in_request_id`,
-            ADD COLUMN `submit_sign` bigint NULL COMMENT '登记人签名' AFTER `out_in_request_user_id`,
+            ADD COLUMN `submit_sign` varchar(125) NULL COMMENT '登记人签名' AFTER `out_in_request_user_id`,
             ADD COLUMN `update_by` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '修改人' AFTER `submit_sign`,
             ADD COLUMN `update_time` datetime(0) NULL DEFAULT NULL COMMENT '修改时间' AFTER `update_by`;
     END IF;

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

@@ -84,6 +84,7 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
     @Autowired
     @Qualifier(ThreadPoolConfig.SOC_EXECUTOR)
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
     @Override
     public TableDataInfo<CoreOutInRecordVo> selectPage(CoreOutInRecordRequestDto request) {
         //未删除
@@ -191,24 +192,23 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
     public int deleteCoreOutInRecordByIds(Long[] ids) {
         // 取消出入申请后，出入申请中对应的人员也删除，如申请下的人员都取消，申请也自动取消
         final List<CoreOutInRecord> letterOutInRecordList = coreOutInRecordMapper.findLetterOutInRecordList(ids);
-        letterOutInRecordList.forEach(x->{
+        letterOutInRecordList.forEach(x -> {
             deleteOutInRecordRequestUser(x);
         });
         return coreOutInRecordMapper.deleteBatchIds(Arrays.asList((ids)));
     }
 
-    private void deleteOutInRecordRequestUser(CoreOutInRecord record)
-    {
+    private void deleteOutInRecordRequestUser(CoreOutInRecord record) {
         final LambdaQueryWrapper<CoreIntroduceLetterOutInRequestUser> oqw1 = new LambdaQueryWrapper<CoreIntroduceLetterOutInRequestUser>();
         oqw1.eq(CoreIntroduceLetterOutInRequestUser::getId, record.getOutInRequestUserId());
         outInRequestUserMapper.delete(oqw1);
 
         final LambdaQueryWrapper<CoreIntroduceLetterOutInRequestUser> oqw2 = new LambdaQueryWrapper<CoreIntroduceLetterOutInRequestUser>();
-        oqw2.ne(CoreIntroduceLetterOutInRequestUser::getId,  record.getOutInRequestUserId())
-                .eq(CoreIntroduceLetterOutInRequestUser::getOutInRequestId,record.getOutInRequestId());
+        oqw2.ne(CoreIntroduceLetterOutInRequestUser::getId, record.getOutInRequestUserId())
+                .eq(CoreIntroduceLetterOutInRequestUser::getOutInRequestId, record.getOutInRequestId());
 
         final Long requestUserCount = outInRequestUserMapper.selectCount(oqw2);
-        if(requestUserCount==0L){
+        if (requestUserCount == 0L) {
             outInRequestMapper.deleteById(record.getOutInRequestId());
         }
     }
@@ -314,6 +314,18 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         //离开时间
         String outTime = DateUtil.format(record.getDepartureTime(), "yyyy年MM月dd日HH时mm分");
         data.put("outTime", outTime);
+        //审批人签名
+        List<String> approveSignList = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(record.getApproveSignImg())) {
+            approveSignList.add(record.getApproveSignImg());
+        }
+        data.put("approveSign", getFileRealPath(approveSignList, prefixPath, staticsPath));
+        //审批人签名
+        List<String> submitSignList = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(record.getSubmitSign())) {
+            submitSignList.add(record.getSubmitSign());
+        }
+        data.put("submitSign", getFileRealPath(submitSignList, prefixPath, staticsPath));
         //证件图片
         final String imgFile = record.getImgFile();
         if (ObjectUtil.isEmpty(imgFile)) {

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

@@ -292,8 +292,9 @@ public class PdfUtil {
         //第二行
         createPDFCell(tableFont, table, "来访事由", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("reasons").toString(), Element.ALIGN_MIDDLE, 2, 1);
-        createPDFCell(tableFont, table, "审批人", Element.ALIGN_MIDDLE, 1, 1);
-        createPDFCell(tableFont, table, data.get("approveUser").toString(), Element.ALIGN_MIDDLE, 2, 1);
+        createPDFCell(tableFont, table, "陪同人员", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, data.get("accompanyingPerson").toString(), Element.ALIGN_MIDDLE, 2, 1);
+
         //第三行
         createPDFCell(tableFont, table, "来访单位", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("outOrgName").toString(), Element.ALIGN_MIDDLE, 2, 1);
@@ -311,10 +312,16 @@ public class PdfUtil {
         createPDFCell(tableFont, table, data.get("outTime").toString(), Element.ALIGN_MIDDLE, 2, 1);
 
         //第六行
-        createPDFCell(tableFont, table, "陪同人员", Element.ALIGN_MIDDLE, 1, 1);
-        createPDFCell(tableFont, table, data.get("accompanyingPerson").toString(), Element.ALIGN_MIDDLE, 2, 1);
-        createPDFCell(tableFont, table, "登记人员", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, "审批人", Element.ALIGN_MIDDLE, 1, 1);
+        createPDFCell(tableFont, table, data.get("approveUser").toString(), Element.ALIGN_MIDDLE, 2, 1);
+        createPDFCell(tableFont, table, "登记人", Element.ALIGN_MIDDLE, 1, 1);
         createPDFCell(tableFont, table, data.get("createBy").toString(), Element.ALIGN_MIDDLE, 2, 1);
+
+        //第七行
+        createPDFCell(tableFont, table, "审批人签字", Element.ALIGN_MIDDLE, 1, 1);
+        dealImageCell((List<String>) data.get("approveSign"), table, 1, 50, 40,2,1);
+        createPDFCell(tableFont, table, "登记人签字", Element.ALIGN_MIDDLE, 1, 1);
+        dealImageCell((List<String>) data.get("submitSign"), table, 1, 50, 40,2,1);
 //           /statics/2023/12/05/20231205183106A001.png
         //证件图片
         createPDFCell(tableFont, table, "证件图片", Element.ALIGN_MIDDLE, 1, 1);