From efafaeb3ba1b38273fdcd7009beaaa41afa5a0a0 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 24 Sep 2021 11:05:49 +0800
Subject: [PATCH] 1.单位
---
src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
index 5035912..1567bbc 100644
--- a/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
+++ b/src/main/java/org/springblade/modules/resource/endpoint/OssEndpoint.java
@@ -446,7 +446,7 @@
String urls = "http://223.82.109.183:2081/zhba/" + newName;
//内网
- String inUrl = ip + newName;
+ String inUrl = ip +"/zhba/"+ newName;
//取出身份证号,查询用户信息，更新用户信息
String pictrueName = multipartFile.getName().substring(0, multipartFile.getName().lastIndexOf("."));
// String regex ="([1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx])|([1-9]\\d{5}\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3})";
@@ -458,6 +458,7 @@
if (null!=user){
ExamPayment examPayment = new ExamPayment();
examPayment.setWorkerId(user.getId().toString());
+ examPayment.setPaymentStatus(3);
examPayment.setCertificateUrl(urls);
examPayment.setType(1);
examPayment.setPaymentTime(new Date());
@@ -472,13 +473,13 @@
//数据推送
String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPayment.getPaymentTime());
- String s = "insert into sys_apply(id,type,payment_time,worker_id,apply_code,certificate_url) " +
+ String s = "insert into sys_exam_payment(id,type,payment_time,worker_id,payment_status,certificate_url) " +
"values(" + "'" + examPayment.getId() + "'" +
"," + "'" + examPayment.getType() + "'" +
"," + "'" + formatStr + "'" +
"," + "'" + examPayment.getWorkerId() + "'" +
- "," + "'" + examPayment.getApplyCode() + "'" +
- "," +"'" + examPayment.getCertificateUrl() + "'" + ")";
+ "," + "'" + examPayment.getPaymentStatus() + "'" +
+ "," +"'" + inUrl + "'" + ")";
FtpUtil.sqlFileUpload(s);
//文件推送
@@ -631,7 +632,23 @@
"insert into blade_attach(id,tenant_id,link,domain,name,original_name,extension,attach_size,create_user,deptid," +
"create_time,update_user,update_time,status,is_deleted,type,cardid";
if (noticeId != null) {
- s1 += ",notice_id";
+ s1 += ",notice_id"+")" +"values(" + "'" + attach.getId() + "'" + "," +
+ "'" + attach.getTenantId() + "'" + "," +
+ "'" + imgurl + "'" + "," +
+ "'" + ip + "'" + "," +
+ "'" + split[2] + "'" + "," +
+ "'" + attach.getOriginalName() + "'" + "," +
+ "'" + attach.getExtension() + "'" + "," +
+ "'" + attach.getAttachSize() + "'" + "," +
+ "'" + attach.getCreateUser() + "'" + "," +
+ "'" + attach.getDeptid() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
+ "'" + attach.getUpdateUser() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "'" + "," +
+ "'" + attach.getStatus() + "'" + "," +
+ "'" + attach.getIsDeleted() + "'" + "," +
+ "'" + attach.getType() + "'" + "," +
+ "'" + cardid + "'";
} else {
s1 += ") " +
"values(" + "'" + attach.getId() + "'" + "," +
@@ -653,7 +670,7 @@
"'" + cardid + "'";
}
if (noticeId != null) {
- s1 += "'" + noticeId + "'" + ")";
+ s1 += ","+"'" + noticeId + "'" + ")";
} else {
s1 += ")";
}
--
Gitblit v1.9.3