From 425fb772c347a85fe8c9cb38a7a386d6368402cd Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 16:36:57 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 973bed4..c7271a2 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -124,7 +124,21 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<PermitVO>> page(PermitVO permit, Query query) {
- IPage<PermitVO> pages = permitService.selectPermitPage(Condition.getPage(query), permit);
+ IPage<PermitVO> pages;
+ if (permit.getUsetype().equals("0")) {
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+ } else if (permit.getUsetype().equals("1")) {
+ String childer = informationService.selJurchilder(permit.getJurisdiction());
+ String[] split = childer.split(",");
+ String strArrays = "";
+ for (int j = 0; j < split.length; j++) {
+ strArrays += "'" + split[j] + "',";
+ }
+ String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, jurisdiction);
+ } else {
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+ }
return R.data(pages);
}
@@ -146,22 +160,21 @@
permit.setStorage("1");
permit.setPermitime(new Date());
permitService.save(permit);
- String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(permit.getPermitime());
+ //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,overtime)" +
+ "address,business,region,registration,industry,type,deptid,ptype,representativecell,contacts,contactscell,jurisdiction,cardid,overtime)" +
"values(" + "'" + permit.getId() + "'" + "," + "'" + permit.getCreditcode() + "'" + "," + "'" + permit.getEnterprisename() + "'" + "," + "'"
+ permit.getRepresentative() + "'" + "," + "'" + permit.getRegisteredcapital() + "'" + "," + "'"
+ permit.getOrganizationcode() + "'" + "," + "'" + permit.getRegistrationnumber() + "'" + "," +
"'" + permit.getIdentificationnumber() + "'" + "," + "'" + permit.getEnterprises() + "'" + "," + "'" +
permit.getAddress() + "'" + "," + "'" + permit.getBusiness() + "'" + "," + "'" +
permit.getRegion() + "'" + "," + "'" + permit.getRegistration() + "'" + "," + "'" + permit.getIndustry() + "'" + "," + "'"
- + permit.getType() + "'" + "," +
- "'" + pertime + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
+ + permit.getType() + "'" + "," + "'" + permit.getDeptid() + "'" + "," + "'" + permit.getPtype() + "'" + "," +
"'" + permit.getRepresentativecell() + "'" + "," + "'" + permit.getContacts() + "'" + "," + "'"
+ permit.getContactscell() + "'" + "," + "'" + permit.getJurisdiction() + "'" +
- "," + "'" + permit.getCardid() + "'"+ "," + "'" + overtime+ "'" + ")";
+ "," + "'" + permit.getCardid() + "'" + "," + "'" + overtime + "'" + ")";
FtpUtil.sqlFileUpload(s);
return R.success("许可提交成功");
}
--
Gitblit v1.9.3