From 5cceb01ea15fa807ebe0011c5b38780cb3e3e2c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 12 Nov 2021 23:50:26 +0800
Subject: [PATCH] 部门数菜单修改，考试审核修改
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 95 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 80 insertions(+), 15 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 3d773d7..6fb96fe 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -103,20 +103,21 @@
@ApiOperation(value = "分页", notes = "传入record")
public R<IPage<RecordVO>> page(RecordVO record, Query query) {
IPage<RecordVO> pages;
- 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);
- }
+ 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);
}
@@ -232,12 +233,70 @@
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);
- boolean b = userService.saveOrUpdate(user);
+ 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());
String s1 = "update sys_record set type = " + "'" + record.getType() + "'" +
@@ -247,6 +306,9 @@
",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 {
@@ -257,6 +319,9 @@
",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);
}
--
Gitblit v1.9.3