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 | 283 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 243 insertions(+), 40 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 a37ae1f..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,13 +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;
@@ -101,7 +106,23 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入record")
public R<IPage<RecordVO>> page(RecordVO record, Query query) {
- IPage<RecordVO> pages = recordService.selectRecordPage(Condition.getPage(query), record);
+ IPage<RecordVO> pages;
+ pages = recordService.selectRecordPage(Condition.getPage(query), record, record.getJurisdiction());
+// if (record.getUsetype().equals("0")) {
+// pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
+// } else if (record.getUsetype().equals("1")) {
+// String childer = informationService.selJurchilder(record.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 = recordService.selectRecordPage(Condition.getPage(query), record, jurisdiction);
+// } else {
+// pages = recordService.selectRecordPage(Condition.getPage(query), record, null);
+// }
+
return R.data(pages);
}
@@ -114,26 +135,27 @@
public R save(@Valid @RequestBody Record record) {
String cardid = record.getCardid();
String type = record.getPtype();
- Map map = recordService.selectIn(cardid,type);
+ Map map = recordService.selectIn(cardid, type);
if (map != null) {
String id = map.get("id").toString();
recordService.removeByIds(Func.toLongList(id));
+ String s1 = "delete from sys_record where id = " + "'" + id + "'";
+ FtpUtil.sqlFileUpload(s1);
}
record.setStorage("1");
record.setType("2");
record.setPermitime(new Date());
recordService.save(record);
- String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
- String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
- String s = "insert into sys_record(id,enterpriseName,representative," +
- "address,business,registration,industry,type,permitime,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid,storage,overtime)" +
- "values(" + "'" + record.getId() + "'"+ "," + "'" + record.getEnterprisename() + "'" + "," +
- "'" + record.getRepresentative() + "'"+ "," + "'" +
- record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getPtype() + "'" + "," +
- "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +"'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," +
- "'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" +
- "," + "'" + record.getCardid() + "'"+
- "," + "'" + record.getStorage() + "'"+
+ //String offtime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOfficetime());
+ //String pertime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getPermitime());
+ String s = "insert into sys_record(id,representative," +
+ "address,business,registration,industry,type,ptype,representativecell,contacts,contactscell,perid,offices,jurisdiction,cardid,storage,overtime)" +
+ "values(" + "'" + record.getId() + "'" + "," +
+ "'" + record.getRepresentative() + "'" + "," + "'" +
+ record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + record.getPtype() + "'" + "," +
+ "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," + "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + record.getJurisdiction() + "'" +
+ "," + "'" + record.getCardid() + "'" +
+ "," + "'" + record.getStorage() + "'" +
"," + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getOvertime()) + "'"
+ ")";
FtpUtil.sqlFileUpload(s);
@@ -149,7 +171,7 @@
public R rocordsave(@Valid @RequestBody Record record) {
String cardid = record.getCardid();
String type = record.getPtype();
- Map map = recordService.selectIn(cardid,type);
+ Map map = recordService.selectIn(cardid, type);
if (map != null) {
record.setStorage("0");
record.setPermitime(new Date());
@@ -173,7 +195,7 @@
//审核通过
if (record.getType().equals("0")) {
//新增组织机构和单位信息
- Information information =new Information();
+ Information information = new Information();
information.setCreditcode(record.getCreditcode());
information.setEnterprisename(record.getEnterprisename());
information.setRepresentative(record.getRepresentative());
@@ -192,7 +214,7 @@
information.setContactscell(record.getContactscell());
Dept dept = new Dept();
//本市公司
- if (record.getPtype().equals("2")){
+ if (record.getPtype().equals("2")) {
Long i = 1425366663452196865L;
dept.setParentId(i);
dept.setAncestors("0,1425366663452196865");
@@ -215,36 +237,206 @@
information.setDepartmentid(id);
}
informationService.save(information);
+ 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);
- userService.saveOrUpdate(user);
+ user.setPassword(DigestUtil.encrypt(initPassword));
+ //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_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() + "'" +
+ "," + "'" + 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 + "'" + ")";
+ 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.getPassword() + "'" +
+ "," + "'" + user.getName() + "'" +
+ "," + "'" + user.getRealName() + "'" +
+ "," + "'" + user.getAvatar() + "'" +
+ "," + "'" + user.getEmail() + "'" +
+ "," + "'" + user.getPhone() + "'" +
+ "," + "'" + null + "'" +
+ "," + "'" + roleid + "'" +
+ "," + "'" + user.getDeptId() + "'" +
+ "," + "'" + 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() + "'" +
+ "," + "'" + 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());
+// String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+// user.setPassword(initPassword);
+// boolean b = userService.saveOrUpdate(user);
//把附件添加单位id
- attachService.updat(information.getDepartmentid(),record.getCardid());
+ attachService.updat(information.getDepartmentid(), record.getCardid());
String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
- ",papprove = " + "'" + record.getPapprove() + "'"+
- ",xapprove = " + "'" + record.getXapprove() + "'"+
- ",sapprove = " + "'" + record.getSapprove() + "'"+
- ",popinion = " + "'" + record.getPopinion() + "'"+
- ",sopinion = " + "'" + record.getSopinion() + "'"+
- ",xopinion = " + "'" + record.getXopinion() + "'"+
- " " +"where id = " + "'" + record.getId() + "'";
+ ",papprove = " + "'" + record.getPapprove() + "'" +
+ ",xapprove = " + "'" + record.getXapprove() + "'" +
+ ",sapprove = " + "'" + record.getSapprove() + "'" +
+ ",popinion = " + "'" + record.getPopinion() + "'" +
+ ",sopinion = " + "'" + record.getSopinion() + "'" +
+ ",xopinion = " + "'" + record.getXopinion() + "'" +
+ ",ptime = " + "'" + record.getPtime() + "'" +
+ ",stime = " + "'" + record.getStime() + "'" +
+ ",xtime = " + "'" + record.getXtime() + "'" +
+ " " + "where id = " + "'" + record.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ } else {
+ String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
+ ",papprove = " + "'" + record.getPapprove() + "'" +
+ ",xapprove = " + "'" + record.getXapprove() + "'" +
+ ",sapprove = " + "'" + record.getSapprove() + "'" +
+ ",popinion = " + "'" + record.getPopinion() + "'" +
+ ",sopinion = " + "'" + record.getSopinion() + "'" +
+ ",xopinion = " + "'" + record.getXopinion() + "'" +
+ ",ptime = " + "'" + record.getPtime() + "'" +
+ ",stime = " + "'" + record.getStime() + "'" +
+ ",xtime = " + "'" + record.getXtime() + "'" +
+ " " + "where id = " + "'" + record.getId() + "'";
FtpUtil.sqlFileUpload(s1);
}
- else {
- String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
- ",papprove = " + "'" + record.getPapprove() + "'"+
- ",xapprove = " + "'" + record.getXapprove() + "'"+
- ",sapprove = " + "'" + record.getSapprove() + "'"+
- ",popinion = " + "'" + record.getPopinion() + "'"+
- ",sopinion = " + "'" + record.getSopinion() + "'"+
- ",xopinion = " + "'" + record.getXopinion() + "'"+
- " " +"where id = " + "'" + record.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }
- return R.status(recordService.updateById(record));
+ return R.status(recordService.saveOrUpdate(record));
}
/**
@@ -270,8 +462,19 @@
@PostMapping("/selectIn")
- public R selectIn(String cardid,String type) {
- Map map = recordService.selectIn(cardid,type);
+ public R selectIn(String cardid, String type) {
+ 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