出入登记簿代码提交

project_data/sql/0.0.4/soc/soc.sql

@@ -201,6 +201,17 @@ ALTER TABLE `sys_device` ADD COLUMN `definition` VARCHAR ( 2 ) NULL COMMENT '是
 
 END IF;
 
+    -- 处理记录增加登记簿url字段
+    IF NOT EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'core_out_in_record'
+                    AND column_name = 'pdf_url') THEN
+        ALTER TABLE  `core_out_in_record`
+            ADD COLUMN `pdf_url` varchar(255) NULL COMMENT '登记簿url' AFTER `check_image`;
+    END IF;
+
+
 END ??
 DELIMITER;
 CALL schema_change ();

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/letter/domain/CoreOutInRecord.java

@@ -2,6 +2,7 @@ package com.xunmei.common.core.domain.letter.domain;
 
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -108,39 +109,7 @@ public class CoreOutInRecord extends BaseEntity {
     @ApiModelProperty(value = "核验照片")
     private String checkImage;
 
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-
-
-                .append("id", getId())
-
-                .append("letterUserId", getLetterUserId())
-
-                .append("letterId", getLetterId())
-
-
-                .append("createBy", getCreateBy())
-
-
-                .append("createTime", getCreateTime())
-
-
-                .append("arrivalTime", getArrivalTime())
-
-
-                .append("departureTime", getDepartureTime())
-
-
-                .append("orgId", getOrgId())
-
-
-                .append("accompanyingPerson", getAccompanyingPerson())
-
-
-
-                .append("checkImage", getCheckImage())
-                .toString();
-    }
+    @TableField("pdf_url")
+    @ApiModelProperty(value = "登记簿url")
+    private String pdfUrl;
 }

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

@@ -170,6 +170,9 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
      */
     @Override
     public int updateCoreOutInRecord(CoreOutInRecord coreOutInRecord) {
+        if (ObjectUtil.isNotEmpty(coreOutInRecord.getDepartureTime())){
+            this.buildOutInRecordPdf(coreOutInRecord.getId());
+        }
         return coreOutInRecordMapper.updateById(coreOutInRecord);
     }
 
@@ -204,28 +207,28 @@ public class CoreOutInRecordServiceImpl extends ServiceImpl<CoreOutInRecordMappe
         Map<String, Object> data = this.getFtlEdu(record, orgList);
         data.put("fileName", fileName);
         data.put("id", id);
-      //  CompletableFuture.runAsync(() -> {
+        CompletableFuture.runAsync(() -> {
             R<String> r = RemoteCallHandlerExecutor.executeRemoteCall(() -> fileService.generateOutInPdf(data), ErrorMsgConstants.GENERATE_PDF_ERROR);
             if (null == r || null == r.getData()) {
                 throw new SystemException(ErrorMsgConstants.GENERATE_PDF_ERROR);
             }
-          /*  String pdfUrl = r.getData();
+            String pdfUrl = r.getData();
             LambdaUpdateWrapper<CoreOutInRecord> updateWrapper = new LambdaUpdateWrapper<>();
             updateWrapper.eq(CoreOutInRecord::getId, id);
-            updateWrapper.set(CoreEduTrainingTask::getPdfUrl, pdfUrl);
-            this.update(updateWrapper);*/
+            updateWrapper.set(CoreOutInRecord::getPdfUrl, pdfUrl);
+            this.update(updateWrapper);
 
             CoreRegisterBookPdf registerBookPdf = new CoreRegisterBookPdf();
             registerBookPdf.setId(id);
             registerBookPdf.setRegisterBookType(RegisterBookType.VISIT_RECORD.getNum());
             registerBookPdf.setDate(new Date());
-            registerBookPdf.setOrgId(record.getLetterOrgId());
+            registerBookPdf.setOrgId(record.getOrgId());
             registerBookPdf.setOrgName(record.getOrgName());
             registerBookPdf.setOrgPath(sysOrg.getPath());
-            /*registerBookPdf.setFileUrl(pdfUrl);
+            registerBookPdf.setFileUrl(pdfUrl);
             registerBookPdf.setFileName(StringUtils.substringAfterLast(pdfUrl, File.separator));
-            registerBookPdfService.save(registerBookPdf);*/
-       // }, threadPoolTaskExecutor);
+            registerBookPdfService.saveOrUpdate(registerBookPdf);
+        }, threadPoolTaskExecutor);
 
         return AjaxResult.success("正在生成pdf，请稍后刷新页面查看!");
     }