From 07ff3643547bcb06ea73de9240724afeafecd16d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Fri, 18 Feb 2022 19:07:34 +0800
Subject: [PATCH] 1.培训单位许可设立,分公司备案,跨区域备案,法人变更备案详情查询接口新增 2.培训单位许可设立,分公司备案,跨区域备案,法人变更备案审批进度查询
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 148 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 135 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/record/controller/RecordController.java b/src/main/java/org/springblade/modules/record/controller/RecordController.java
index 6fb96fe..8bd7bd1 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -24,6 +24,7 @@
import lombok.AllArgsConstructor;
import org.springblade.common.cache.DictCache;
import org.springblade.common.cache.ParamCache;
+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;
@@ -31,14 +32,17 @@
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.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.vo.PermitVO;
+import org.springblade.modules.record.dto.RecordDTO;
import org.springblade.modules.record.entity.Record;
import org.springblade.modules.record.service.IRecordService;
import org.springblade.modules.record.vo.RecordVO;
+import org.springblade.modules.recordLegalperson.dto.RecordLegalpersonDTO;
import org.springblade.modules.resource.service.IAttachService;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
@@ -240,7 +244,8 @@
user.setTenantId("000000");
user.setAccount(record.getEnterprisename());
String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
+ user.setPassword(DigestUtil.encrypt(initPassword));
+ //user.setPassword(initPassword);
user.setCreateTime(new Date());
user.setUpdateTime(new Date());
user.setRoleId("1414575196264300546");
@@ -251,7 +256,7 @@
String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
" business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
- "contacts,contactscell,create_time,create_user_id) " +
+ "contacts,contactscell,create_user_id) " +
"values(" + "'" + information.getId() + "'" +
"," + "'" + information.getCreditcode() + "'" +
"," + "'" + information.getEnterprisename() + "'" +
@@ -271,26 +276,132 @@
"," + "'" + information.getRepresentativecell() + "'" +
"," + "'" + information.getContacts() + "'" +
"," + "'" + 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() + "'" + ","
+ "," + "'" + information.getCreateUserId() + "'" + ")";
+ FtpUtil.sqlFileUpload(s);
+ String ss = "insert into blade_dept(id,parent_id,tenant_id,dept_name,ancestors,dept_category,is_deleted) values(" + "'" + dept.getId() + "'" + "," + "'" + 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) " +
+ "," + "'" + isDeleted + "'" + ")";
+ FtpUtil.sqlFileUpload(ss);
+ String rtime;
+ String paperTime;
+ if (user.getRtime() == null) {
+ rtime = null;
+ } else {
+ rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
+ }
+ //发证日期处理
+ if (user.getPaperTime() == null) {
+ paperTime = "";
+ } else {
+ paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
+ }
+ //头像
+ if (null != user.getAvatar() && !user.getAvatar().equals("")) {
+ user.setAvatar(FtpConfig.ip + user.getAvatar().substring(26));
+ }
+
+ //指纹
+ if (null != user.getFingerprint() && !user.getFingerprint().equals("")) {
+ user.setFingerprint(FtpConfig.ip + user.getFingerprint().substring(26));
+ }
+
+ String sss = "insert into blade_user(" +
+ "id,tenant_id,account,password,name,real_name,avatar,email,phone,sex," +
+ "role_id,dept_id,cardid,nativePlace,nation,fingerprint,education," +
+ "politicaloutlook,healstats,height,address,registered,rtime," +
+ "securitynumber,hold,jurisdiction,examination_type,status,is_deleted,dispatch) " +
"values(" + "'" + user.getId() + "'" +
- "," + "'" + user.getTenantId() + "'"
- + "," + "'" + user.getAccount() + "'" +
+ "," + "'" + user.getTenantId() + "'" +
+ "," + "'" + user.getAccount() + "'" +
"," + "'" + user.getPassword() + "'" +
+ "," + "'" + user.getName() + "'" +
+ "," + "'" + user.getRealName() + "'" +
+ "," + "'" + user.getAvatar() + "'" +
+ "," + "'" + user.getEmail() + "'" +
+ "," + "'" + user.getPhone() + "'" +
+ "," + "'" + null + "'" +
"," + "'" + roleid + "'" +
"," + "'" + user.getDeptId() + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getCreateTime()) + "'" +
- "," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(user.getUpdateTime()) + "'" +
+ "," + "'" + user.getCardid() + "'" +
+ "," + "'" + user.getNativeplace() + "'" +
+ "," + "'" + user.getNation() + "'" +
+ "," + "'" + user.getFingerprint() + "'" +
+ "," + "'" + user.getEducation() + "'" +
+ "," + "'" + user.getPoliticaloutlook() + "'" +
+ "," + "'" + user.getHealstats() + "'" +
+ "," + "'" + user.getHeight() + "'" +
+ "," + "'" + user.getAddress() + "'" +
+ "," + "'" + user.getRegistered() + "'" +
+ "," + "'" + rtime + "'" +
+ "," + "'" + user.getSecuritynumber() + "'" +
+ "," + "'" + user.getHold() + "'" +
+ "," + "'" + user.getJurisdiction() + "'" +
+ "," + "'" + user.getExaminationType() + "'" +
"," + "'" + user.getStatus() + "'" +
- "," + "'" + user.getIsDeleted() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+ "," + "'" + user.getIsDeleted() + "'" +
+ "," + "'" + user.getDispatch() + "'" + ")";
+ FtpUtil.sqlFileUpload(sss);
+// Integer isDeleted = 0;
+// //注册用户
+// User user = new User();
+// user.setDeptId(information.getDepartmentid());
+// user.setTenantId("000000");
+// user.setAccount(record.getEnterprisename());
+// String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+// user.setPassword(initPassword);
+// user.setCreateTime(new Date());
+// user.setUpdateTime(new Date());
+// user.setRoleId("1414575196264300546");
+// user.setStatus(1);
+// user.setIsDeleted(0);
+// userService.save(user);
+// String roleid = "1415563428727328770";
+// String s = "insert into sys_information(id,creditCode,enterpriseName,representative" +
+// ",registeredCapital,organizationCode,registrationNumber, enterprises, address," +
+// " business,region,registration,industry,departmentid,stats,jurisdiction,representativecell," +
+// "contacts,contactscell,create_time,create_user_id) " +
+// "values(" + "'" + information.getId() + "'" +
+// "," + "'" + information.getCreditcode() + "'" +
+// "," + "'" + information.getEnterprisename() + "'" +
+// "," + "'" + information.getRepresentative() + "'" +
+// "," + "'" + information.getRegisteredcapital() + "'" +
+// "," + "'" + information.getOrganizationcode() + "'" +
+// "," + "'" + information.getRegistrationnumber() + "'" +
+// "," + "'" + information.getEnterprises() + "'" +
+// "," + "'" + information.getAddress() + "'" +
+// "," + "'" + information.getBusiness() + "'" +
+// "," + "'" + information.getRegion() + "'" +
+// "," + "'" + information.getRegistration() + "'" +
+// "," + "'" + information.getIndustry() + "'" +
+// "," + "'" + information.getDepartmentid() + "'" +
+// "," + "'" + information.getStats() + "'" +
+// "," + "'" + information.getJurisdiction() + "'" +
+// "," + "'" + information.getRepresentativecell() + "'" +
+// "," + "'" + information.getContacts() + "'" +
+// "," + "'" + 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() + "'" + ","
+// + "'" + 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) " +
+// "values(" + "'" + user.getId() + "'" +
+// "," + "'" + user.getTenantId() + "'"
+// + "," + "'" + user.getAccount() + "'" +
+// "," + "'" + user.getPassword() + "'" +
+// "," + "'" + roleid + "'" +
+// "," + "'" + user.getDeptId() + "'" +
+// "," + "'" + 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() + "'" + ")";
+// FtpUtil.sqlFileUpload(s);
// //注册用户
// User user = new User();
// user.setAccount(record.getEnterprisename());
@@ -355,4 +466,15 @@
Map map = recordService.selectIn(cardid, type);
return R.data(map);
}
+
+ /**
+ * 保安公司备案信息(基本信息和附件列表信息)
+ * @param record
+ * @return
+ */
+ @GetMapping("/details")
+ public R details(RecordDTO record) {
+ RecordDTO detail = recordService.getDetails(record);
+ return R.data(detail);
+ }
}
--
Gitblit v1.9.3