From ebb5012dc221db17bfad74c3bdfd91d46aa29c03 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 11:24:41 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/record/controller/RecordController.java | 127 ++++++++++++++++++++++++++++++++++++------
1 files changed, 109 insertions(+), 18 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 272ad62..8a28100 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;
/**
* 详情
@@ -70,6 +89,7 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "分页", notes = "传入record")
public R<IPage<Record>> list(Record record, Query query) {
+ record.setStorage("1");
IPage<Record> pages = recordService.page(Condition.getPage(query), Condition.getQueryWrapper(record));
return R.data(pages);
}
@@ -103,22 +123,20 @@
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)" +
- "values(" + "'" + record.getId() + "'" + "," + "'" + record.getCreditcode() + "'" + "," + "'" + record.getEnterprisename() + "'" + "," + "'"
- + record.getRepresentative() + "'" + "," +
- "'" + formatStr + "'" + "," + "'" + record.getRegisteredcapital() + "'" + "," + "'"
- + record.getOrganizationcode() + "'" + "," + "'" + record.getRegistrationnumber() + "'" + "," +
- "'" + record.getIdentificationnumber() + "'" + "," + "'" + record.getEnterprises() + "'" + "," + "'" +
- record.getAddress() + "'" + "," + "'" + record.getBusiness() + "'" + "," + "'" +
- record.getRegion() + "'" + "," + "'" + record.getRegistration() + "'" + "," + "'" + record.getIndustry() + "'" + "," + "'" + record.getType() + "'" + "," + "'" + pertime + "'" + "," + "'" + record.getDeptid() + "'" + "," + "'" + record.getPtype() + "'" + "," +
- "'" + record.getRepresentativecell() + "'" + "," + "'" + record.getContacts() + "'" + "," + "'" + record.getContactscell() + "'" + "," +
- "'" + record.getPerid() + "'" + "," + "'" + record.getOffices() + "'" + "," + "'" + offtime + "'" + "," + "'" + record.getJurisdiction() + "'" + ")";
- FtpUtil.sqlFileUpload(s);
+// 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() + "'"+
+// "," + "'" + new SimpleDateFormat("yyyy-MM-dd").format(record.getOvertime()) + "'"
+// + ")";
+// FtpUtil.sqlFileUpload(s);
return R.success("成功");
}
@@ -139,7 +157,6 @@
} else {
record.setStorage("0");
record.setType("2");
- record.setPtype("2");
record.setPermitime(new Date());
recordService.save(record);
}
@@ -153,7 +170,81 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入record")
public R update(@Valid @RequestBody Record record) {
- return R.status(recordService.updateById(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_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);
+ }
+ 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.saveOrUpdate(record));
}
/**
--
Gitblit v1.9.3