From 103292be21d37873b95eec7d6881374ba06b92fc Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Sat, 19 Feb 2022 17:30:16 +0800
Subject: [PATCH] 法人变更审核修改
---
src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java | 117 ++++++++++++++++++++++------------------------------------
1 files changed, 44 insertions(+), 73 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java b/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java
index fc72759..aa8adfa 100644
--- a/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java
+++ b/src/main/java/org/springblade/modules/recordLegalperson/controller/RecordLegalpersonController.java
@@ -28,6 +28,7 @@
import org.springblade.common.enums.DictEnum;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
@@ -51,6 +52,7 @@
import javax.validation.Valid;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import java.util.Map;
import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
@@ -159,86 +161,55 @@
* 修改
*/
@PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入record")
public R update(@Valid @RequestBody RecordLegalperson record) {
+ boolean status = false;
//审核通过
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");
+ List<Information> list = informationService.list(Condition.getQueryWrapper(information));
+ if (list.size()>0){
+ //更新法人信息
+ Information information1 = list.get(0);
+ information1.setRepresentative(record.getChangecontacts());
+ information1.setRepresentativecell(record.getChangecontactscell());
+ //修改
+ informationService.updateById(information1);
+ //变更信息修改
+ recordService.updateById(record);
+ status = true;
+ }else {
+ //按组织机构查询
+ Information information2 = new Information();
+ information2.setCreditcode(record.getCreditcode());
+ List<Information> list1 = informationService.list(Condition.getQueryWrapper(information2));
+ if (list1.size()>0){
+ //更新法人信息
+ Information information1 = list.get(0);
+ information1.setRepresentative(record.getChangecontacts());
+ information1.setRepresentativecell(record.getChangecontactscell());
+ //修改
+ informationService.updateById(information1);
+ //变更信息修改
+ recordService.updateById(record);
+ status = true;
+ }else {
+ //设置未审核不通过
+ record.setType("1");
+ record.setApprove("当前公司单位未保安服务系统存在,请先注册!");
+ recordService.updateById(record);
+ throw new ServiceException("当前公司单位未保安服务系统存在,请先注册!");
+ }
}
- //培训公司
- 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);
- 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(DigestUtil.encrypt(initPassword));
- //user.setPassword(initPassword);
- user.setCreateTime(new Date());
- user.setUpdateTime(new Date());
- user.setRoleId("1414575196264300546");
- user.setStatus(1);
- user.setIsDeleted(0);
- userService.save(user);
-
- String rtime;
- String paperTime;
- if (user.getRtime() == null) {
- rtime = null;
- } else {
- rtime = new SimpleDateFormat("yyyy-MM-dd").format(user.getRtime());
- }
- //发证日期处理
- if (user.getPaperTime() == null) {
- paperTime = "";
- } else {
- paperTime = new SimpleDateFormat("yyyy-MM-dd").format(user.getPaperTime());
- }
-
- //把附件添加单位id
- attachService.updat(information.getDepartmentid(), record.getCardid());
+ } else {
+ //更新
+ recordService.updateById(record);
}
- return R.status(recordService.saveOrUpdate(record));
+ //返回数据
+ return R.status(status);
}
/**
--
Gitblit v1.9.3