From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 85 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 3 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 ba14a58..85ab88b 100644
--- a/src/main/java/org/springblade/modules/record/controller/RecordController.java
+++ b/src/main/java/org/springblade/modules/record/controller/RecordController.java
@@ -22,21 +22,36 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+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.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.service.IRecordService;
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 javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;
+
+import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
* 控制器
@@ -51,6 +66,10 @@
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;
/**
* 详情
@@ -104,14 +123,12 @@
record.setType("2");
record.setPermitime(new Date());
recordService.save(record);
- String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(record.getEstablishtime());
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,creditCode,enterpriseName,representative,establishtime," +
"registeredCapital,organizationCode,registrationNumber,identificationNumber,enterprises," +
"address,business,region,registration,industry,type,permitime,deptid,ptype,representativecell,contacts,contactscell,perid,offices,officetime,jurisdiction,cardid)" +
- "values(" + "'" + record.getId() + "'" + "," + "'" + record.getCreditcode() + "'" + "," + "'" + record.getEnterprisename() + "'" + "," + "'"+ record.getRepresentative() + "'" + "," +
- "'" + formatStr + "'" + "," + "'" + record.getRegisteredcapital() + "'" + "," + "'"
+ "values(" + "'" + record.getId() + "'" + "," + "'" + record.getCreditcode() + "'" + "," + "'" + record.getEnterprisename() + "'" + "," + "'"+ record.getRepresentative() + "'" + "," + "'" + record.getRegisteredcapital() + "'" + "," + "'"
+ record.getOrganizationcode() + "'" + "," + "'" + record.getRegistrationnumber() + "'" + "," +
"'" + record.getIdentificationnumber() + "'" + "," + "'" + record.getEnterprises() + "'" + "," + "'" +
record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" +
@@ -152,6 +169,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);
+ 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