From 7293f04d18fb2e882e152f962c3aa1d8fcb1f93e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 17 Nov 2021 15:46:35 +0800
Subject: [PATCH] 证书打印信息导出修改

---
 src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java b/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java
index 73306df..3d19de5 100644
--- a/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/accreditation/service/impl/AccreditationRecordsServiceImpl.java
@@ -6,6 +6,7 @@
 import lombok.AllArgsConstructor;
 import org.springblade.common.utils.QRCodeUtil;
 import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.accreditation.excel.ExportSecurityBookPaperExcel;
 import org.springblade.modules.accreditation.excel.ExportSecurityPaperExcel;
 import org.springblade.modules.accreditation.entity.AccreditationRecords;
 import org.springblade.modules.accreditation.mapper.AccreditationRecordsMapper;
@@ -57,17 +58,21 @@
 			records.setCreateTime(new Date());
 			records.setCreateUser(accreditationRecords.getCreateUser());
 			records.setStatus(1);
+			records.setAuditStatus(1);
+			records.setType(accreditationRecords.getType());
 			records.setUserId(Long.parseLong(id));
 			//新增
 			this.save(records);
 
 			//内网新增
-			String s = "insert into sys_apply(id,user_id,create_time,create_user,status) " +
+			String s = "insert into sys_accreditation_records(id,user_id,create_time,create_user,status,type,audit_status) " +
 				"values(" + "'" + records.getId() + "'" + ","
 				+ "'" + records.getUserId() + "'" + ","
 				+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(records.getCreateTime()) + "'" + ","
 				+ "'" + records.getCreateUser() +"'" + ","
-				+"'" + records.getStatus() + "'" + ")";
+				+ "'" + records.getStatus() +"'" + ","
+				+ "'" + records.getType() +"'" + ","
+				+"'" + records.getAuditStatus() + "'" + ")";
 			FtpUtil.sqlFileUpload(s);
 		});
 		return true;
@@ -135,4 +140,27 @@
 		}
 		return null;
 	}
+
+	/**
+	 * 导出证书制证信息
+	 * @param accreditationRecords
+	 * @return
+	 */
+	@Override
+	public List<ExportSecurityBookPaperExcel> exportSecurityBookPaper(AccreditationRecordsVo accreditationRecords) {
+		//查询数据
+		List<ExportSecurityBookPaperExcel> accreditationRecordsVos = baseMapper.exportSecurityBookPaper(accreditationRecords);
+		return accreditationRecordsVos;
+	}
+
+	/**
+	 * 导出证书制证信息(包含照片)
+	 */
+	@Override
+	public List<AccreditationRecordsVo> exportSecurityBookPapers(AccreditationRecordsVo accreditationRecords) {
+		//查询数据
+		List<AccreditationRecordsVo> accreditationRecordsVos = baseMapper.exportSecurityBookPapers(accreditationRecords);
+		System.out.println("accreditationRecordsVos = " + accreditationRecordsVos.size());
+		return accreditationRecordsVos;
+	}
 }

--
Gitblit v1.9.3