From 60dddbf3d0182c8a5220b04d3ea207b0756bc0f3 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 05 Nov 2021 17:35:15 +0800
Subject: [PATCH] 1.统计
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 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 0d0b361..96c11c2 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -33,12 +33,14 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.information.entity.Information;
import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.permit.entity.Permit;
import org.springblade.modules.permit.service.IPermitService;
import org.springblade.modules.permit.vo.PermitVO;
import org.springblade.modules.punish.entity.Punish;
+import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
@@ -47,6 +49,7 @@
import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
@@ -69,6 +72,7 @@
private final IDeptService iDeptService;
private final IInformationService informationService;
private final IUserService userService;
+ private final IAttachService attachService;
/**
* 详情
*/
@@ -98,7 +102,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);
}
@@ -142,11 +160,25 @@
information.setContacts(permit.getContacts());
information.setContactscell(permit.getContactscell());
Dept dept = new Dept();
- Long i = 1413470343230877697L;
- dept.setParentId(i);
+ //本市公司
+ if (permit.getPtype().equals("0")){
+ Long i = 1413470343230877697L;
+ dept.setParentId(i);
+ dept.setAncestors("0,1413470343230877697");
+ }
+ //培训公司
+ else if (permit.getPtype().equals("1")){
+ Long i = 1418458374477549569L;
+ dept.setParentId(i);
+ dept.setAncestors("0,1418458374477549569");
+ }
+ else{
+ Long i = 1420222961377357825L;
+ dept.setParentId(i);
+ dept.setAncestors("0,1420222961377357825");
+ }
dept.setTenantId("000000");
dept.setDeptName(information.getEnterprisename());
- dept.setAncestors("0,1413470343230877697");
dept.setDeptCategory(1);
if (iDeptService.submit(dept)) {
CacheUtil.clear(SYS_CACHE);
@@ -163,6 +195,16 @@
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
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() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ }
+ 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