From f2032d8331cd8939bb8dd4ef372033a2dcdbc850 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Thu, 17 Feb 2022 16:10:55 +0800
Subject: [PATCH] +添加法人变更，以及跨区域备案字段更改
---
src/main/java/org/springblade/modules/information/controller/InformationController.java | 84 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/controller/InformationController.java b/src/main/java/org/springblade/modules/information/controller/InformationController.java
index c614b84..dd07305 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -34,12 +34,15 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.FTP.OutJson;
import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.excel.ExportInformationExcel;
+import org.springblade.modules.information.excel.ExportInformationSecurityStatistics;
import org.springblade.modules.information.excel.InforExcel;
import org.springblade.modules.information.excel.InforImporter;
import org.springblade.modules.information.service.IInformationService;
@@ -51,9 +54,11 @@
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.*;
import java.text.DateFormat;
@@ -143,6 +148,7 @@
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入information")
+ @Transactional(rollbackFor = Exception.class)
public R save(@Valid @RequestBody Information information){
Dept dept = new Dept();
//自招保安公司
@@ -199,6 +205,7 @@
}
user.setDeptId(information.getDepartmentid());
user.setTenantId("000000");
+ user.setCreateUser(Long.parseLong(information.getCreateUserId()));
user.setCreateTime(new Date());
user.setUpdateTime(new Date());
user.setStatus(1);
@@ -243,23 +250,24 @@
"," + "'" + information.getContactscell() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getCreateTime()) + "'" +
"," + "'" + information.getCreateUserId() + "'" + ");" +
- "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
+ "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
+ "'" + dept.getTenantId() + "'" +
"," + "'" + information.getEnterprisename() + "'" +
"," + "'" + dept.getAncestors() + "'" +
"," + "'" + dept.getDeptCategory() + "'" +
"," + "'" + isDeleted + "'" + ");" +
- "insert into blade_user(id,tenant_id,account,password,role_id,dept_id,create_time,update_time,status,is_deleted) " +
+ "insert into blade_user(id,tenant_id,account,password,dept_id,create_user,create_time,update_time,status,is_deleted,role_id) " +
"values(" + "'" + user.getId() + "'" +
"," + "'" + user.getTenantId() + "'"
+ "," + "'" + user.getAccount() + "'" +
"," + "'" + user.getPassword() + "'" +
- "," + "'" + user.getRoleId() + "'" +
"," + "'" + user.getDeptId() + "'" +
+ "," + "'" + user.getCreateUser() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
"," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" + ")";
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getRoleId() + "'" + ")";
FtpUtil.sqlFileUpload(s);
}
return R.success("成功");
@@ -425,6 +433,8 @@
return R.data(list);
}
+
+
/**
* 导入单位信息
*/
@@ -483,4 +493,70 @@
return sortedMap;
}
+ /**
+ * 业务统计情况
+ */
+ @GetMapping("/selectBusinessStatistics")
+ public R<IPage> selectBusinessStatistics(InformationVO information, Query query) {
+ IPage list = informationService.selectBusinessStatistics(Condition.getPage(query), information);
+ return R.data(list);
+ }
+
+ /**
+ * 保安员情况统计
+ */
+ @GetMapping("/selectSecurityStatistics")
+ public R<IPage> selectSecurityStatistics(InformationVO information, Query query) {
+ IPage list = informationService.selectSecurityStatistics(Condition.getPage(query), information);
+ return R.data(list);
+ }
+
+ /**
+ * 业务统计情况导出
+ */
+ @GetMapping("/export-business-statis")
+ public void exportBusinessStatis(HttpServletResponse response, InformationVO information) {
+ List<ExportInformationExcel> list= informationService.exportBusinessStatis(information);
+ ExcelUtil.export(response, "业务统计数据" + DateUtil.time(), "业务统计数据表", list, ExportInformationExcel.class);
+ }
+
+ /**
+ * 保安员情况统计导出
+ */
+ @GetMapping("/export-security-statis-info")
+ public void exportSecurityStatisInfo(HttpServletResponse response,InformationVO information) {
+ List<ExportInformationSecurityStatistics> list = informationService.exportSecurityStatisInfo(information);
+ ExcelUtil.export(response, "保安员统计数据" + DateUtil.time(), "保安员统计数据表", list, ExportInformationSecurityStatistics.class);
+ }
+
+ /**
+ * 保安员详情
+ */
+ @PostMapping("/selectUIn")
+ public R<IPage> selectUIn(String deptid, String name, String hold, String photo, String examinationtype, String dispatch, String soil, Query query) {
+ IPage list = informationService.selectUIn(Condition.getPage(query), deptid, name, hold, photo, examinationtype, dispatch, soil);
+ return R.data(list);
+ }
+
+ /**
+ * 查询学历统计信息
+ * @param deptid 部门id
+ * @param jurisdiction 辖区
+ * @return
+ */
+ @PostMapping("/getEducationStatistics")
+ public R getEducationStatistics(String deptid, String jurisdiction) {
+ return R.data(informationService.getEducationStatistics(deptid, jurisdiction));
+ }
+
+ /**
+ * 获取部门信息（）
+ * @param information
+ * @return
+ */
+ @GetMapping("/getInformationDetails")
+ public R getInformationDetails(InformationVO information) {
+ return R.data(informationService.getInformationDetails(information));
+ }
+
}
--
Gitblit v1.9.3