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/information/controller/InformationController.java | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 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 664bcdb..a7ee002 100644
--- a/src/main/java/org/springblade/modules/information/controller/InformationController.java
+++ b/src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -23,7 +23,7 @@
import lombok.AllArgsConstructor;
import com.alibaba.fastjson.JSON;
import org.springblade.common.cache.DictCache;
-import org.springblade.common.constant.FtpConstant;
+import org.springblade.common.config.FtpConfig;
import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
@@ -184,7 +184,8 @@
information.setDepartmentid(id);
}
informationService.save(information);
- String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(information.getEstablishtime());
+ String formatStr = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
+ Integer isDeleted = 0;
//Integer id = information.getId();
String s = "insert into sys_information(id,creditCode,enterpriseName,representative,establishTime," +
"registeredCapital,organizationCode,registrationNumber, enterprises, address," +
@@ -195,8 +196,12 @@
information.getRegion() + "'" + "," + "'" + information.getRegistration() + "'" + "," + "'" + information.getIndustry() + "'" + "," + "'" + information.getDepartmentid() + "'" + "," +
"'" + information.getStats() + "'" + "," + "'" + information.getJurisdiction() + "'" + "," + "'" + information.getRepresentativecell() + "'" + "," +
"'" + information.getContacts() + "'" + "," + "'" + information.getContactscell() + "'" + ");" +
- "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category) values(" + "'" + information.getDepartmentid() + "'" + "," + "'" + dept.getParentId() + "'" + ","
- + "'" + dept.getTenantId() + "'" + "," + "'" + information.getEnterprisename() + "'" + "," + "'" + dept.getAncestors() + "'" + "," + "'" + dept.getDeptCategory() + "'" + ")";
+ "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 + "'" + ")";
FtpUtil.sqlFileUpload(s);
return R.success("成功");
}
@@ -209,17 +214,25 @@
@ApiOperation(value = "修改", notes = "传入information")
public R update(@Valid @RequestBody Information information) throws Exception {
informationService.updateById(information);
- String businessLicense=null;
- String licence=null;
- String format="";
- if(information.getBusinessLicense()!=null && !"".equals(information.getBusinessLicense())){
- businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
+ String businessLicense = null;
+ String businessLicenses = null;
+ String licence = null;
+ String licences = null;
+ String format = "";
+ if (information.getBusinessLicense() != null && !"".equals(information.getBusinessLicense())) {
+ businessLicense = information.getBusinessLicense().substring(26, information.getBusinessLicense().length());
+ businessLicenses = FtpConfig.ip + businessLicense;
+ } else {
+ businessLicenses = "";
}
- if(information.getLicence()!=null && !"".equals(information.getLicence())){
- licence = information.getLicence().substring(26, information.getLicence().length());
+ if (information.getLicence() != null && !"".equals(information.getLicence())) {
+ licence = information.getLicence().substring(26, information.getLicence().length());
+ licences = FtpConfig.ip + licence;
+ } else {
+ licences = "";
}
- if (information.getEstablishtime()!=null && !"".equals(information.getEstablishtime())){
- format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
+ if (information.getEstablishtime() != null && !"".equals(information.getEstablishtime())) {
+ format = new SimpleDateFormat("yyyy-MM-dd").format(information.getEstablishtime());
}
//内网同步
String s1 = "update sys_information set creditCode = " + "'" + information.getCreditcode() + "'" +
@@ -239,8 +252,8 @@
",representativecell = " + "'" + information.getRepresentativecell() + "'" +
",contacts = " + "'" + information.getContacts() + "'" +
",contactscell = " + "'" + information.getContactscell() + "'" +
- ",business_License = " + "'" + FtpConstant.ip + businessLicense + "'" +
- ",licence = " + "'" + FtpConstant.ip + licence + "'" +
+ ",business_License = " + "'" + businessLicenses + "'" +
+ ",licence = " + "'" + licences + "'" +
" " + "where id = " + "'" + information.getId() + "'";
FtpUtil.sqlFileUpload(s1);
return R.success("修改成功");
@@ -270,11 +283,18 @@
informationService.deleteIn(strArray[i]);
informationService.deleteSh(strArray[i]);
informationService.deleteMe(strArray[i]);
-
+ String s1 = "delete from sys_information where creditCode = " + "'" + strArray[i] + "'";
+ FtpUtil.sqlFileUpload(s1);
+ String s2 = "delete from sys_shareholder where creditCode = " + "'" + strArray[i] + "'";
+ FtpUtil.sqlFileUpload(s2);
+ String s3 = "delete from sys_member where creditCode = " + "'" + strArray[i] + "'";
+ FtpUtil.sqlFileUpload(s3);
}
for (int j = 0; j < strArrays.length; j++) {
//机构删除
informationService.deleteDept(strArrays[j]);
+ String s4 = "delete from blade_dept where id = " + "'" + strArrays[j] + "'";
+ FtpUtil.sqlFileUpload(s4);
}
return R.success("删除成功");
@@ -284,8 +304,8 @@
* 统计保安员资格异常的数量
*/
@PostMapping("/selectExtype")
- public R selectExtype(String deptid,String jurisdiction) {
- List<Map<Object, Object>> lists = informationService.selectExtype(deptid,jurisdiction);
+ public R selectExtype(String deptid, String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectExtype(deptid, jurisdiction);
return R.data(lists);
}
@@ -293,8 +313,8 @@
* 统计保安员持证的数量
*/
@PostMapping("/selectHold")
- public R selectHold(String deptid,String jurisdiction) {
- List<Map<Object, Object>> lists = informationService.selectHold(deptid,jurisdiction);
+ public R selectHold(String deptid, String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectHold(deptid, jurisdiction);
return R.data(lists);
}
@@ -311,8 +331,8 @@
* 保安派遣数量统计
*/
@PostMapping("/selectDisp")
- public R selectDisp(String deptid,String jurisdiction) {
- List<Map<Object, Object>> lists = informationService.selectDisp(deptid,jurisdiction);
+ public R selectDisp(String deptid, String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectDisp(deptid, jurisdiction);
return R.data(lists);
}
@@ -320,8 +340,8 @@
* 社保统计
*/
@PostMapping("/selectSoil")
- public R selectSoil(String deptid,String jurisdiction) {
- List<Map<Object, Object>> lists = informationService.selectSoil(deptid,jurisdiction);
+ public R selectSoil(String deptid, String jurisdiction) {
+ List<Map<Object, Object>> lists = informationService.selectSoil(deptid, jurisdiction);
List<Map<String, Object>> list = new ArrayList<>();
for (int i = 0; i < lists.size(); i++) {
Map<String, Object> map = new HashMap<String, Object>();
@@ -329,9 +349,9 @@
Integer a = Integer.valueOf(numj);
String numz = lists.get(i).get("numz").toString();
Integer b = Integer.valueOf(numz);
- Integer c = b - a;
+ //Integer c = b - a;
map.put("numj", a);
- map.put("nmuwj", c);
+ map.put("nmuwj", b);
list.add(map);
}
return R.data(list);
@@ -361,6 +381,7 @@
List list = informationService.queryYearKh(year, jurisdiction, deptid);
return list;
}
+
//升序
public static Map<String, String> sortMapBykeyAsc(Map<String, String> oriMap) {
Map<String, String> sortedMap = new LinkedHashMap<String, String>();
--
Gitblit v1.9.3