From 345d17cf82e1bbc1fbfbeec10193c2bed59cd674 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 22:21:21 +0800
Subject: [PATCH] 注册登录，车辆，装备，枪支，招聘，培训考试修改
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index 19b5a85..973bed4 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -137,7 +137,7 @@
public R save(@Valid @RequestBody Permit permit) throws FileNotFoundException {
String cardid = permit.getCardid();
String type = permit.getPtype();
- Map map = permitService.selectIn(cardid,type);
+ Map map = permitService.selectIn(cardid, type);
if (map != null) {
String id = map.get("id").toString();
permitService.removeByIds(Func.toLongList(id));
@@ -147,22 +147,23 @@
permit.setPermitime(new Date());
permitService.save(permit);
String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
+ String overtime = new SimpleDateFormat("yyyy-MM-dd").format(permit.getOvertime());
String s = "insert into sys_permit(id,creditCode,enterpriseName,representative," +
"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
- "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid)" +
+ "address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
- + permit.getRepresentative() + "'" + "," +"'" + permit.getRegisteredcapital() + "'" + "," + "'"
+ + permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
+ permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
"'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
- permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry()+ "'" + "," + "'"
+ permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
+ permit.getType() + "'" + "," +
"'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
- + permit.getContactscell() + "'"+"," + "'" + permit.getJurisdiction() + "'"+
- "," + "'" + permit.getCardid() + "'"+")" ;
+ + permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
+ "," + "'" + permit.getCardid() + "'"+ "," + "'" + overtime+ "'" + ")";
FtpUtil.sqlFileUpload(s);
- return R.success("新增成功");
+ return R.success("许可提交成功");
}
/**
@@ -173,7 +174,7 @@
public R storage(@Valid @RequestBody Permit permit) {
String cardid = permit.getCardid();
String type = permit.getPtype();
- Map map = permitService.selectIn(cardid,type);
+ Map map = permitService.selectIn(cardid, type);
if (map != null) {
permit.setStorage("0");
permitService.updateById(permit);
@@ -187,8 +188,8 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid ,String type) {
- Map map = permitService.selectIn(cardid,type);
+ public R selectIn(String cardid, String type) {
+ Map map = permitService.selectIn(cardid, type);
return R.data(map);
}
@@ -202,7 +203,7 @@
//审核通过
if (permit.getType().equals("0")) {
//新增组织机构和单位信息
- Information information =new Information();
+ Information information = new Information();
information.setCreditcode(permit.getCreditcode());
information.setEnterprisename(permit.getEnterprisename());
information.setRepresentative(permit.getRepresentative());
@@ -221,18 +222,17 @@
information.setContactscell(permit.getContactscell());
Dept dept = new Dept();
//本市公司
- if (permit.getPtype().equals("0")){
+ if (permit.getPtype().equals("0")) {
Long i = 1413470343230877697L;
dept.setParentId(i);
dept.setAncestors("0,1413470343230877697");
}
//培训公司
- else if (permit.getPtype().equals("1")){
+ else if (permit.getPtype().equals("1")) {
Long i = 1418458374477549569L;
dept.setParentId(i);
dept.setAncestors("0,1418458374477549569");
- }
- else{
+ } else {
Long i = 1420222961377357825L;
dept.setParentId(i);
dept.setAncestors("0,1420222961377357825");
@@ -256,14 +256,13 @@
user.setPassword(initPassword);
userService.saveOrUpdate(user);
//把附件添加单位id
- attachService.updat(information.getDepartmentid(),permit.getCardid());
- String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + permit.getApprove() + "'"+
- " " +"where id = " + "'" + permit.getId() + "'";
+ attachService.updat(information.getDepartmentid(), permit.getCardid());
+ String s1 = "update sys_permit set type = " + "'" + 0 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
+ " " + "where id = " + "'" + permit.getId() + "'";
FtpUtil.sqlFileUpload(s1);
- }
- else {
- String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + permit.getApprove() + "'"+
- " " +"where id = " + "'" + permit.getId() + "'";
+ } else {
+ String s1 = "update sys_permit set type = " + "'" + 1 + "'" + ",approve = " + "'" + permit.getApprove() + "'" +
+ " " + "where id = " + "'" + permit.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
return R.status(permitService.updateById(permit));
--
Gitblit v1.9.3