From b5960d1968e007b91d4d33dd7cbb74f1b566f2c1 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 24 May 2024 10:20:01 +0800
Subject: [PATCH] 到期时间修改
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 140 ++++++++++++++++++++++++++--------------------
1 files changed, 78 insertions(+), 62 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 34b61c5..512c571 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -99,7 +99,22 @@
@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;
+ 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);
}
@@ -121,67 +136,68 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入record")
public R update(@Valid @RequestBody Record record) {
- //审核通过
- if (record.getType().equals("0")) {
- //新增组织机构和单位信息
- Information information =new Information();
- information.setCreditcode(record.getCreditcode());
- information.setEnterprisename(record.getEnterprisename());
- information.setRepresentative(record.getRepresentative());
- information.setEstablishtime(record.getEstablishtime());
- information.setRegisteredcapital(record.getRegisteredcapital());
- information.setOrganizationcode(record.getOrganizationcode());
- information.setRegistrationnumber(record.getRegistrationnumber());
- information.setEnterprises(record.getEnterprises());
- information.setAddress(record.getAddress());
- information.setBusiness(record.getBusiness());
- information.setRegion(record.getRegion());
- information.setRegistration(record.getRegistration());
- information.setIndustry(record.getIndustry());
- information.setRepresentativecell(record.getRepresentativecell());
- information.setContacts(record.getContacts());
- information.setContactscell(record.getContactscell());
- Dept dept = new Dept();
- //本市公司
- if (record.getPtype().equals("2")){
- Long i = 1425366663452196865L;
- dept.setParentId(i);
- }
- //培训公司
- else {
- Long i = 1420222768149966850L;
- dept.setParentId(i);
- }
- dept.setTenantId("000000");
- dept.setDeptName(information.getEnterprisename());
- dept.setAncestors("0,1413470343230877697");
- dept.setDeptCategory(1);
- if (iDeptService.submit(dept)) {
- CacheUtil.clear(SYS_CACHE);
- // 返回懒加载树更新节点所需字段
- Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
- .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
- String id = kv.get("id").toString();
- information.setDepartmentid(id);
- }
- informationService.save(information);
- //注册用户
- User user = new User();
- user.setAccount(record.getEnterprisename());
- String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
- user.setPassword(initPassword);
- userService.saveOrUpdate(user);
- //把附件添加单位id
- attachService.updat(information.getDepartmentid(),record.getCardid());
- String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + record.getApprove() + "'"+
- " " +"where id = " + "'" + record.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }
- else {
- String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + record.getApprove() + "'"+
- " " +"where id = " + "'" + record.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- }
+// //审核通过
+// if (record.getType().equals("0")) {
+// //新增组织机构和单位信息
+// Information information =new Information();
+// information.setCreditcode(record.getCreditcode());
+// information.setEnterprisename(record.getEnterprisename());
+// information.setRepresentative(record.getRepresentative());
+// information.setEstablishtime(record.getEstablishtime());
+// information.setRegisteredcapital(record.getRegisteredcapital());
+// information.setOrganizationcode(record.getOrganizationcode());
+// information.setRegistrationnumber(record.getRegistrationnumber());
+// information.setEnterprises(record.getEnterprises());
+// information.setAddress(record.getAddress());
+// information.setBusiness(record.getBusiness());
+// information.setRegion(record.getRegion());
+// information.setRegistration(record.getRegistration());
+// information.setIndustry(record.getIndustry());
+// information.setRepresentativecell(record.getRepresentativecell());
+// information.setContacts(record.getContacts());
+// information.setContactscell(record.getContactscell());
+// Dept dept = new Dept();
+// //本市公司
+// if (record.getPtype().equals("2")){
+// Long i = 1425366663452196865L;
+// dept.setParentId(i);
+// dept.setAncestors("0,1425366663452196865");
+// }
+// //培训公司
+// else {
+// Long i = 1420222768149966850L;
+// dept.setParentId(i);
+// dept.setAncestors("0,1420222768149966850");
+// }
+// dept.setTenantId("000000");
+// dept.setDeptName(information.getEnterprisename());
+// dept.setDeptCategory(1);
+// if (iDeptService.submit(dept)) {
+// CacheUtil.clear(SYS_CACHE);
+// // 返回懒加载树更新节点所需字段
+// Kv kv = Kv.create().set("id", String.valueOf(dept.getId())).set("tenantId", dept.getTenantId())
+// .set("deptCategoryName", DictCache.getValue(DictEnum.ORG_CATEGORY, dept.getDeptCategory()));
+// String id = kv.get("id").toString();
+// information.setDepartmentid(id);
+// }
+// informationService.save(information);
+// //注册用户
+// User user = new User();
+// user.setAccount(record.getEnterprisename());
+// String initPassword = ParamCache.getValue(DEFAULT_PARAM_PASSWORD);
+// user.setPassword(initPassword);
+// userService.saveOrUpdate(user);
+// //把附件添加单位id
+// attachService.updat(information.getDepartmentid(),record.getCardid());
+// String s1 = "update sys_permit set type = " + "'" + 0 + "'" +",approve = " + "'" + record.getApprove() + "'"+
+// " " +"where id = " + "'" + record.getId() + "'";
+// FtpUtil.sqlFileUpload(s1);
+// }
+// else {
+// String s1 = "update sys_permit set type = " + "'" + 1 + "'" +",approve = " + "'" + record.getApprove() + "'"+
+// " " +"where id = " + "'" + record.getId() + "'";
+// FtpUtil.sqlFileUpload(s1);
+// }
return R.status(recordService.updateById(record));
}
--
Gitblit v1.9.3