From a0fcede67eeccaacf46f025f655f3c0dc3f5cb8e Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 23 Sep 2021 09:30:39 +0800
Subject: [PATCH] 1.自招审批
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 4 ++--
src/main/java/org/springblade/modules/record/entity/Record.java | 6 ++++++
src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml | 3 +++
src/main/java/org/springblade/modules/record/controller/RecordController.java | 35 ++++++++++++++++++++++++-----------
4 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index 1afa339..5be3e0a 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -88,10 +88,10 @@
ITokenGranter granter = TokenGranterBuilder.getGranter(grantType);
UserInfo userInfo = granter.grant(tokenParameter);
- if (userInfo == null && s.equals("0")) {
+ if (userInfo == null || userInfo.getUser() == null && s.equals("0")) {
return authInfo.set("error_description", "用户未审核");
}
- if (userInfo == null && s.equals("2")) {
+ if (userInfo == null || userInfo.getUser() == null && s.equals("2")) {
return authInfo.set("error_description", "审核不通过");
}
if (userInfo == null || userInfo.getUser() == null ) {
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index 85ab88b..a37ae1f 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -125,16 +125,17 @@
recordService.save(record);
String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
- String s = "insert into sys_record(id,creditCode,enterpriseName,representative,establishtime," +
- "registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
- "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid)" +
- "values(" + "'" + record.getId() + "'" + "," + "'" + record.getCreditcode() + "'" + "," + "'" + record.getEnterprisename() + "'" + "," + "'"+ record.getRepresentative() + "'" + "," + "'" + record.getRegisteredcapital() + "'" + "," + "'"
- + record.getOrganizationcode() + "'" + "," + "'" + record.getRegistrationnumber() + "'" + "," +
- "'" + record.getIdentificationnumber() + "'" + "," + "'" + record.getEnterprises() + "'" + "," + "'" +
- record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" +
- record.getRegion() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getDeptid() + "'" + "," + "'" + record.getPtype() + "'" + "," +
+ String s = "insert into sys_record(id,enterpriseName,representative," +
+ "address,business,registration,industry,type,permitime,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid,storage,overtime)" +
+ "values(" + "'" + record.getId() + "'"+ "," + "'" + record.getEnterprisename() + "'" + "," +
+ "'" + record.getRepresentative() + "'"+ "," + "'" +
+ record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getPtype() + "'" + "," +
"'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +"'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," +
- "'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" + "," + "'" + record.getCardid() + "'"+ ")";
+ "'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" +
+ "," + "'" + record.getCardid() + "'"+
+ "," + "'" + record.getStorage() + "'"+
+ "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
+ + ")";
FtpUtil.sqlFileUpload(s);
return R.success("成功");
}
@@ -222,12 +223,24 @@
userService.saveOrUpdate(user);
//把附件添加单位id
attachService.updat(information.getDepartmentid(),record.getCardid());
- String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + record.getApprove() + "'"+
+ String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
+ ",papprove = " + "'" + record.getPapprove() + "'"+
+ ",xapprove = " + "'" + record.getXapprove() + "'"+
+ ",sapprove = " + "'" + record.getSapprove() + "'"+
+ ",popinion = " + "'" + record.getPopinion() + "'"+
+ ",sopinion = " + "'" + record.getSopinion() + "'"+
+ ",xopinion = " + "'" + record.getXopinion() + "'"+
" " +"where id = " + "'" + record.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
else {
- String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + record.getApprove() + "'"+
+ String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
+ ",papprove = " + "'" + record.getPapprove() + "'"+
+ ",xapprove = " + "'" + record.getXapprove() + "'"+
+ ",sapprove = " + "'" + record.getSapprove() + "'"+
+ ",popinion = " + "'" + record.getPopinion() + "'"+
+ ",sopinion = " + "'" + record.getSopinion() + "'"+
+ ",xopinion = " + "'" + record.getXopinion() + "'"+
" " +"where id = " + "'" + record.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
diff --git a/src/main/java/org/springblade/modules/record/entity/Record.java b/src/main/java/org/springblade/modules/record/entity/Record.java
index cc2d8f5..f47fe52 100644
--- a/src/main/java/org/springblade/modules/record/entity/Record.java
+++ b/src/main/java/org/springblade/modules/record/entity/Record.java
@@ -166,6 +166,12 @@
private String xapprove;
//市审批
private String sapprove;
+ //派出意见
+ private String popinion;
+ //县意见
+ private String xopinion;
+ //市意见
+ private String sopinion;
@ApiModelProperty(value = "审批时间")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
diff --git a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
index 7b0a980..29c4812 100644
--- a/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
+++ b/src/main/java/org/springblade/modules/record/mapper/RecordMapper.xml
@@ -35,6 +35,9 @@
<result column="papprove" property="papprove"/>
<result column="xapprove" property="xapprove"/>
<result column="sapprove" property="sapprove"/>
+ <result column="popinion" property="popinion"/>
+ <result column="xopinion" property="xopinion"/>
+ <result column="sopinion" property="sopinion"/>
<result column="overtime" property="overtime"/>
</resultMap>
--
Gitblit v1.9.3