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 | 138 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 119 insertions(+), 19 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 e0d1e4e..512c571 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -16,23 +16,41 @@
*/
package org.springblade.modules.record.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.common.cache.DictCache;
+import org.springblade.common.cache.ParamCache;
+import org.springblade.common.enums.DictEnum;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.mp.support.Condition;
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.Func;
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.modules.FTP.FtpUtil;
+import org.springblade.modules.information.entity.Information;
+import org.springblade.modules.information.service.IInformationService;
import org.springblade.modules.record.entity.Record;
-import org.springblade.modules.record.vo.RecordVO;
import org.springblade.modules.record.service.IRecordService;
-import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.modules.record.vo.RecordVO;
+import org.springblade.modules.resource.service.IAttachService;
+import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+import java.util.Map;
+
+import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
* 控制器
@@ -42,11 +60,15 @@
*/
@RestController
@AllArgsConstructor
-@RequestMapping("blade-record/record")
+@RequestMapping("/record")
@Api(value = "", tags = "接口")
public class RecordController extends BladeController {
private final IRecordService recordService;
+ private final IDeptService iDeptService;
+ private final IInformationService informationService;
+ private final IUserService userService;
+ private final IAttachService attachService;
/**
* 详情
@@ -60,49 +82,127 @@
}
/**
- * 分页
+ * 分页
*/
@GetMapping("/list")
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入record")
- public R<IPage<Record>> list(Record record, Query query) {
- IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record));
+ public R<IPage<Record>> list(@ApiIgnore @RequestParam Map<String, Object> record, Query query) {
+ IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record, Record.class));
return R.data(pages);
}
/**
- * 自定义分页
+ * 自定义分页
*/
@GetMapping("/page")
@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);
}
/**
- * 新增
+ * 新增
*/
@PostMapping("/save")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "新增", notes = "传入record")
public R save(@Valid @RequestBody Record record) {
+ record.setType("2");
return R.status(recordService.save(record));
}
/**
- * 修改
+ * 修改
*/
@PostMapping("/update")
@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);
+// 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));
}
/**
- * 新增或修改
+ * 新增或修改
*/
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@@ -111,9 +211,9 @@
return R.status(recordService.saveOrUpdate(record));
}
-
+
/**
- * 删除
+ * 删除
*/
@PostMapping("/remove")
@ApiOperationSupport(order = 8)
@@ -122,5 +222,5 @@
return R.status(recordService.removeByIds(Func.toLongList(ids)));
}
-
+
}
--
Gitblit v1.9.3