相关方企业

main
zhaokai 2025-11-01 09:17:03 +08:00
parent b654af6045
commit a137fe9f10
38 changed files with 1914 additions and 46 deletions

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,82 @@
package com.zcloud.basic.info.web;
import com.alibaba.cola.dto.MultiResponse;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
import com.jjb.saas.framework.auth.model.SSOUser;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.basic.info.api.CorpInfoXgfServiceI;
import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd;
import com.zcloud.basic.info.dto.CorpInfoXgfPageQry;
import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd;
import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
/**
* web-adapter
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Api(tags = "企业相关方信息")
@RequestMapping("/${application.gateway}/corpInfoXgf")
@RestController
@AllArgsConstructor
public class CorpInfoXgfController {
private final CorpInfoXgfServiceI corpInfoXgfService;
@ApiOperation("新增")
@PostMapping("/save")
public SingleResponse<CorpInfoXgfCO> add(@Validated @RequestBody CorpInfoXgfAddCmd cmd) {
SSOUser ssoUser = AuthContext.getCurrentUser();
return corpInfoXgfService.add(cmd);
}
@ApiOperation("分页")
@PostMapping("/list")
public PageResponse<CorpInfoXgfCO> page(@RequestBody CorpInfoXgfPageQry qry) {
return corpInfoXgfService.listPage(qry);
}
@ApiOperation("所有数据")
@PostMapping("/listAll")
public MultiResponse<CorpInfoXgfCO> listAll() {
return MultiResponse.of(new ArrayList<CorpInfoXgfCO>());
}
@ApiOperation("详情")
@PostMapping("/info/{id}")
public SingleResponse<CorpInfoXgfCO> getInfoById(@PathVariable("id") Long id) {
return SingleResponse.of(corpInfoXgfService.info(id));
}
@ApiOperation("删除")
@PostMapping("/remove/{id}")
public Response remove(@PathVariable("id") Long id) {
corpInfoXgfService.remove(id);
return SingleResponse.buildSuccess();
}
@ApiOperation("删除多个")
@DeleteMapping("/ids")
public Response removeBatch(@RequestParam Long[] ids) {
corpInfoXgfService.removeBatch(ids);
return SingleResponse.buildSuccess();
}
@ApiOperation("修改")
@PostMapping("/edit")
public SingleResponse edit(@Validated @RequestBody CorpInfoXgfUpdateCmd corpInfoXgfUpdateCmd) {
corpInfoXgfService.edit(corpInfoXgfUpdateCmd);
return SingleResponse.buildSuccess();
}
}

View File

@ -7,6 +7,8 @@ import com.alibaba.cola.dto.Response;
import com.alibaba.cola.dto.SingleResponse;
import com.jjb.saas.framework.auth.model.SSOUser;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.jjb.saas.system.client.dept.facade.DeptFacade;
import com.jjb.saas.system.client.dept.response.DeptCO;
import com.zcloud.basic.info.api.DepartmentServiceI;
import com.zcloud.basic.info.dto.*;
import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO;
@ -15,6 +17,7 @@ import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -33,6 +36,8 @@ import java.util.List;
@AllArgsConstructor
public class DepartmentController {
private final DepartmentServiceI departmentService;
@DubboReference
private DeptFacade deptFacade;
@ApiOperation("新增")
@PostMapping("/save")
@ -49,8 +54,9 @@ public class DepartmentController {
@ApiOperation("所有数据")
@PostMapping("/listAll")
public MultiResponse<DepartmentCO> listAll() {
return MultiResponse.of(new ArrayList<DepartmentCO>());
public MultiResponse<DeptCO> listAll() {
return deptFacade.getTreeByCurrentOrgId();
// return MultiResponse.of(new ArrayList<DepartmentCO>());
}
@ApiOperation("详情")

View File

@ -0,0 +1,130 @@
package com.zcloud.basic.info.command;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.system.client.dept.facade.DeptFacade;
import com.jjb.saas.system.client.tenant.facade.TenantFacade;
import com.jjb.saas.system.client.tenant.request.FacadeTenantAddCmd;
import com.jjb.saas.system.client.tenant.request.OtaTenantAddCmd;
import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor;
import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor;
import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
import com.zcloud.basic.info.domain.gateway.CorpFormGateway;
import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway;
import com.zcloud.basic.info.domain.model.CorpFormE;
import com.zcloud.basic.info.domain.model.CorpInfoXgfE;
import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd;
import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
/**
* web-app
*
* @Author zhaokai
* @Date 2025-10-31 10:52:08
*/
@Component
@AllArgsConstructor
@Slf4j
public class CorpInfoXgfAddExe {
private final CorpInfoXgfGateway corpInfoXgfGateway;
private final CorpFormGateway CorpFormGateway;
private final CorpInfoXgfCoConvertor corpInfoXgfCoConvertor;
@DubboReference
private TenantFacade tenantFacade;
@Transactional(rollbackFor = Exception.class)
public Long execute(CorpInfoXgfAddCmd cmd) {
CorpInfoXgfE corpInfoXgfE = new CorpInfoXgfE();
BeanUtils.copyProperties(cmd, corpInfoXgfE);
Long corpInfoId ;
try {
corpInfoId = corpInfoXgfGateway.addInfo(corpInfoXgfE);
} catch (Exception e) {
throw new RuntimeException(e);
}
if (corpInfoId == null) {
throw new BizException("保存失败");
}
List<CorpInfoXgfItemCmd> mainDepartmentList = cmd.getMainDepartmentList();
List<CorpFormE> corpFormEList = corpInfoXgfCoConvertor.converItemToData(mainDepartmentList);
corpFormEList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.MAINDEPARTMENT.getCode());
info.setTypeName(CorpFormTypeEnum.MAINDEPARTMENT.getName());
});
List<CorpFormE> managerDepartmentList = corpInfoXgfCoConvertor.converItemToData(cmd.getManagerDepartmentList());
managerDepartmentList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.MANAGERDEPARTMENT.getCode());
info.setTypeName(CorpFormTypeEnum.MANAGERDEPARTMENT.getName());
});
List<CorpFormE> competentDeptList = corpInfoXgfCoConvertor.converItemToData(cmd.getCompetentDeptList());
competentDeptList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.COMPETENTDEPT.getCode());
info.setTypeName(CorpFormTypeEnum.COMPETENTDEPT.getName());
});
List<CorpFormE> superVisecorpDeptList = corpInfoXgfCoConvertor.converItemToData(cmd.getSuperVisecorpDeptList());
superVisecorpDeptList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.SUPERVISECORPDEPT.getCode());
info.setTypeName(CorpFormTypeEnum.SUPERVISECORPDEPT.getName());
});
List<CorpFormE> corpTypeList = corpInfoXgfCoConvertor.converItemToData(cmd.getCorpTypeList());
corpTypeList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.CORP_TYPE.getCode());
info.setTypeName(CorpFormTypeEnum.CORP_TYPE.getName());
});
List<CorpFormE> employmentformList = corpInfoXgfCoConvertor.converItemToData(cmd.getEmploymentformList());
employmentformList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.EMPLOYMENTFORM.getCode());
info.setTypeName(CorpFormTypeEnum.EMPLOYMENTFORM.getName());
});
List<CorpFormE> selectfromList = corpInfoXgfCoConvertor.converItemToData(cmd.getSelectfromList());
selectfromList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.SELECTFROM.getCode());
info.setTypeName(CorpFormTypeEnum.SELECTFROM.getName());
});
corpFormEList.addAll(managerDepartmentList);
corpFormEList.addAll(competentDeptList);
corpFormEList.addAll(superVisecorpDeptList);
corpFormEList.addAll(corpTypeList);
corpFormEList.addAll(employmentformList);
corpFormEList.addAll(selectfromList);
List<CorpFormE> filteredList = corpFormEList.stream()
.filter(item -> item.getItemCode() != null && !item.getItemCode().trim().isEmpty())
.collect(Collectors.toList());
filteredList.forEach(info->{
CorpFormGateway.add(info);
});
OtaTenantAddCmd otaTenantAddCmd = new OtaTenantAddCmd();
otaTenantAddCmd.setAccount(corpInfoXgfE.getCorpName());
otaTenantAddCmd.setTenantId(corpInfoId);
otaTenantAddCmd.setTenantName(corpInfoXgfE.getCorpName());
otaTenantAddCmd.setPassword("123456");
log.info("CorpInfoXgfAddExe,新增企业调用GBS请求:{}",otaTenantAddCmd.toString());
Response response = tenantFacade.addOtaTenant(otaTenantAddCmd);
log.info("CorpInfoXgfAddExe,新增企业调用GBS返回:{}",response.toString());
//处理多个
return corpInfoId;
}
}

View File

@ -0,0 +1,39 @@
package com.zcloud.basic.info.command;
import com.alibaba.cola.exception.BizException;
import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* web-app
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Component
@AllArgsConstructor
public class CorpInfoXgfRemoveExe {
private final CorpInfoXgfGateway corpInfoXgfGateway;
@Transactional(rollbackFor = Exception.class)
public boolean execute(Long id) {
boolean res = corpInfoXgfGateway.deletedCorpInfoXgfById(id);
if (!res) {
throw new BizException("删除失败");
}
return true;
}
@Transactional(rollbackFor = Exception.class)
public boolean execute(Long[] ids) {
boolean res = corpInfoXgfGateway.deletedCorpInfoXgfByIds(ids);
if (!res) {
throw new BizException("删除失败");
}
return true;
}
}

View File

@ -0,0 +1,165 @@
package com.zcloud.basic.info.command;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.system.client.tenant.facade.TenantFacade;
import com.jjb.saas.system.client.tenant.request.OtaPlatformUserUpdateCmd;
import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor;
import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
import com.zcloud.basic.info.domain.gateway.CorpFormGateway;
import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway;
import com.zcloud.basic.info.domain.model.CorpFormE;
import com.zcloud.basic.info.domain.model.CorpInfoXgfE;
import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd;
import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd;
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
/**
* web-app
*
* @Author zhaokai
* @Date 2025-10-31 10:52:10
*/
@Component
@AllArgsConstructor
@Slf4j
public class CorpInfoXgfUpdateExe {
private final CorpInfoXgfGateway corpInfoXgfGateway;
private final CorpInfoXgfCoConvertor corpInfoXgfCoConvertor;
private final CorpFormGateway CorpFormGateway;
private final CorpInfoRepository corpInfoRepository;
@DubboReference
private TenantFacade tenantFacade;
@Transactional(rollbackFor = Exception.class)
public void execute(CorpInfoXgfUpdateCmd corpInfoXgfUpdateCmd) {
CorpInfoDO corpInfoDO = corpInfoRepository.getById(corpInfoXgfUpdateCmd.getId());
if(corpInfoDO == null) {
throw new BizException("企业信息不存在");
}
CorpInfoXgfE corpInfoXgfE = new CorpInfoXgfE();
BeanUtils.copyProperties(corpInfoXgfUpdateCmd, corpInfoXgfE);
boolean res = corpInfoXgfGateway.update(corpInfoXgfE);
if (!res) {
throw new BizException("修改失败");
}
Long corpInfoId = corpInfoXgfUpdateCmd.getId();
List<CorpFormE> corpFormEList = new ArrayList<>();
//股份主管部门
List<CorpInfoXgfItemCmd> mainDepartmentList = corpInfoXgfUpdateCmd.getMainDepartmentList();
if(CollUtil.isNotEmpty(mainDepartmentList)){
CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.MAINDEPARTMENT.getCode());
corpFormEList = corpInfoXgfCoConvertor.converItemToData(mainDepartmentList);
corpFormEList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.MAINDEPARTMENT.getCode());
info.setTypeName(CorpFormTypeEnum.MAINDEPARTMENT.getName());
});
}
//股份监管部门
List<CorpFormE> managerDepartmentList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getManagerDepartmentList());
if(CollUtil.isNotEmpty(managerDepartmentList)){
CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.MANAGERDEPARTMENT.getCode());
managerDepartmentList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.MANAGERDEPARTMENT.getCode());
info.setTypeName(CorpFormTypeEnum.MANAGERDEPARTMENT.getName());
});
corpFormEList.addAll(managerDepartmentList);
}
//基层单位监管部门
List<CorpFormE> competentDeptList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getCompetentDeptList());
if(CollUtil.isNotEmpty(competentDeptList)){
CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.COMPETENTDEPT.getCode());
competentDeptList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.COMPETENTDEPT.getCode());
info.setTypeName(CorpFormTypeEnum.COMPETENTDEPT.getName());
});
corpFormEList.addAll(competentDeptList);
}
//基层单位主管部门
List<CorpFormE> superVisecorpDeptList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getSuperVisecorpDeptList());
if(CollUtil.isNotEmpty(superVisecorpDeptList)){
CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.SUPERVISECORPDEPT.getCode());
superVisecorpDeptList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.SUPERVISECORPDEPT.getCode());
info.setTypeName(CorpFormTypeEnum.SUPERVISECORPDEPT.getName());
});
corpFormEList.addAll(superVisecorpDeptList);
}
//集团单位
List<CorpFormE> corpTypeList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getCorpTypeList());
if(CollUtil.isNotEmpty(corpTypeList)){
CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.CORP_TYPE.getCode());
corpTypeList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.CORP_TYPE.getCode());
info.setTypeName(CorpFormTypeEnum.CORP_TYPE.getName());
});
corpFormEList.addAll(corpTypeList);
}
//用工形式
List<CorpFormE> employmentformList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getEmploymentformList());
if(CollUtil.isNotEmpty(employmentformList)){
CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.EMPLOYMENTFORM.getCode());
employmentformList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.EMPLOYMENTFORM.getCode());
info.setTypeName(CorpFormTypeEnum.EMPLOYMENTFORM.getName());
});
corpFormEList.addAll(employmentformList);
}
//选取形式
List<CorpFormE> selectfromList = corpInfoXgfCoConvertor.converItemToData(corpInfoXgfUpdateCmd.getSelectfromList());
if(CollUtil.isNotEmpty(selectfromList)){
CorpFormGateway.deletedCorpFormByType(corpInfoId,CorpFormTypeEnum.SELECTFROM.getCode());
selectfromList.forEach(info->{
info.setInfoId(corpInfoId);
info.setType(CorpFormTypeEnum.SELECTFROM.getCode());
info.setTypeName(CorpFormTypeEnum.SELECTFROM.getName());
});
corpFormEList.addAll(selectfromList);
}
List<CorpFormE> filteredList = corpFormEList.stream()
.filter(item -> item.getItemCode() != null && !item.getItemCode().trim().isEmpty())
.collect(Collectors.toList());
filteredList.forEach(info->{
CorpFormGateway.add(info);
});
OtaPlatformUserUpdateCmd otaUpdateCmd = new OtaPlatformUserUpdateCmd();
otaUpdateCmd.setAccount(corpInfoXgfE.getCorpName());
otaUpdateCmd.setTenantName(corpInfoXgfE.getCorpName());
otaUpdateCmd.setOriginalAccount(corpInfoDO.getCorpName());
otaUpdateCmd.setPassword(corpInfoXgfUpdateCmd.getPassWord());
log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS请求:{}",otaUpdateCmd.toString());
Response response = tenantFacade.updateOtaPlatformUser(otaUpdateCmd);
log.info("CorpInfoXgfUpdateExe,修改企业信息调用GBS返回:{}",response.toString());
if(!corpInfoDO.getCorpName().equals(corpInfoXgfE.getCorpName())){
//TODO 名字有变动发送mq
}
}
}

View File

@ -1,12 +1,17 @@
package com.zcloud.basic.info.command;
import com.alibaba.cola.dto.Response;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.system.client.dept.facade.DeptFacade;
import com.jjb.saas.system.client.dept.request.FacadeAddDeptCmd;
import com.jjb.saas.system.client.user.facade.UserFacade;
import com.jjb.saas.system.client.user.request.FacadeUserAddCmd;
import com.jjb.saas.system.enums.org.DeptTypeEnum;
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
import com.zcloud.basic.info.domain.model.DepartmentE;
import com.zcloud.basic.info.dto.DepartmentAddCmd;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
@ -21,11 +26,12 @@ import org.springframework.transaction.annotation.Transactional;
*/
@Component
@AllArgsConstructor
@Slf4j
public class DepartmentAddExe {
private final DepartmentGateway departmentGateway;
// @DubboReference
// private UserFacade userFacade;
@DubboReference
private DeptFacade deptFacade;
@Transactional(rollbackFor = Exception.class)
public boolean execute(DepartmentAddCmd cmd) {
@ -35,18 +41,26 @@ public class DepartmentAddExe {
//a
// userFacade.addUser(new FacadeUserAddCmd());
// C = examTypeE.add(a,b,c);
//TODO 需要调用GBS新增
boolean res = false;
Long id = null;
try {
res = departmentGateway.add(examTypeE);
id = departmentGateway.add(examTypeE);
} catch (Exception e) {
throw new RuntimeException(e);
}
if (!res) {
if (id ==null) {
throw new BizException("保存失败");
}
// 需要调用GBS新增
FacadeAddDeptCmd deptCmd = new FacadeAddDeptCmd();
deptCmd.setLinkId(id);
deptCmd.setLinkName(examTypeE.getName());
deptCmd.setParentId(examTypeE.getParentId());
deptCmd.setDeptTypeEnum(DeptTypeEnum.DEPARTMENT.getValue());
Response response = deptFacade.addDept(deptCmd);
log.info("DepartmentAddExe,新增部门调用GBS返回"+response.toString());
return true;
}
}

View File

@ -3,12 +3,14 @@ package com.zcloud.basic.info.command;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.system.client.dept.facade.DeptFacade;
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
import com.zcloud.basic.info.dto.clientobject.DepartmentCO;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import lombok.AllArgsConstructor;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@ -28,6 +30,9 @@ import java.util.Map;
public class DepartmentRemoveExe {
private final DepartmentGateway departmentGateway;
private final DepartmentRepository departmentRepository;
@DubboReference
private DeptFacade deptFacade;
@Transactional(rollbackFor = Exception.class)
public boolean execute(Long id) {
@ -42,6 +47,7 @@ public class DepartmentRemoveExe {
if (!res) {
throw new BizException("删除失败");
}
return true;
}

View File

@ -1,10 +1,16 @@
package com.zcloud.basic.info.command;
import com.alibaba.cola.exception.BizException;
import com.jjb.saas.system.client.dept.facade.DeptFacade;
import com.jjb.saas.system.client.dept.request.FacadeUpdateDeptCmd;
import com.zcloud.basic.info.domain.gateway.DepartmentGateway;
import com.zcloud.basic.info.domain.model.DepartmentE;
import com.zcloud.basic.info.dto.DepartmentUpdateCmd;
import com.zcloud.basic.info.persistence.dataobject.DepartmentDO;
import com.zcloud.basic.info.persistence.repository.DepartmentRepository;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.config.annotation.DubboReference;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@ -20,15 +26,32 @@ import org.springframework.transaction.annotation.Transactional;
@AllArgsConstructor
public class DepartmentUpdateExe {
private final DepartmentGateway departmentGateway;
private final DepartmentRepository departmentRepository;
@DubboReference
private DeptFacade deptFacade;
@Transactional(rollbackFor = Exception.class)
public void execute(DepartmentUpdateCmd departmentUpdateCmd) {
DepartmentDO departmentDO = departmentRepository.getById(departmentUpdateCmd.getId());
if(departmentDO == null){
throw new BizException("部门信息不存在");
}
DepartmentE departmentE = new DepartmentE();
BeanUtils.copyProperties(departmentUpdateCmd, departmentE);
boolean res = departmentGateway.update(departmentE);
if (!res) {
throw new BizException("修改失败");
}
FacadeUpdateDeptCmd deptCmd = new FacadeUpdateDeptCmd();
deptCmd.setLinkId(departmentE.getId());
deptCmd.setLinkName(departmentE.getName());
deptCmd.setParentId(departmentE.getParentId());
deptFacade.updateDept(deptCmd);
if(!departmentDO.getName().equals(departmentE.getName())){
//TODO 名字不一样发送mq
}
}
}

View File

@ -1,6 +1,7 @@
package com.zcloud.basic.info.command.convertor;
import com.zcloud.basic.info.dto.clientobject.CorpFormCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfItemCO;
import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
import org.mapstruct.Mapper;
@ -20,5 +21,7 @@ public interface CorpFormCoConvertor {
* @return
*/
List<CorpFormCO> converDOsToCOs(List<CorpFormDO> corpFormDOs);
List<CorpInfoXgfItemCO> converDOsToItemCOs(List<CorpFormDO> selectFromList);
}

View File

@ -0,0 +1,28 @@
package com.zcloud.basic.info.command.convertor;
import com.zcloud.basic.info.domain.model.CorpFormE;
import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd;
import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO;
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import org.mapstruct.Mapper;
import java.util.List;
/**
* web-app
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Mapper(componentModel = "spring")
public interface CorpInfoXgfCoConvertor {
/**
* @param corpInfoXgfDOs
* @return
*/
List<CorpInfoXgfCO> converDOsToCOs(List<CorpInfoDO> corpInfoXgfDOs);
List<CorpFormE> converItemToData(List<CorpInfoXgfItemCmd> mainDepartmentList);
}

View File

@ -0,0 +1,97 @@
package com.zcloud.basic.info.command.query;
import com.alibaba.cola.dto.PageResponse;
import com.zcloud.basic.info.command.convertor.CorpFormCoConvertor;
import com.zcloud.basic.info.command.convertor.CorpInfoXgfCoConvertor;
import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
import com.zcloud.basic.info.dto.CorpInfoXgfPageQry;
import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO;
import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfItemCO;
import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.repository.CorpFormRepository;
import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
import com.zcloud.gbscommon.utils.PageQueryHelper;
import lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Component;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* web-app
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Component
@AllArgsConstructor
public class CorpInfoXgfQueryExe {
private final CorpInfoRepository corpInfoRepository;
private final CorpInfoXgfCoConvertor corpInfoXgfCoConvertor;
private final CorpFormRepository corpFormRepository;
private final CorpFormCoConvertor corpFormCoConvertor;
/**
*
*
* @param corpInfoXgfPageQry
* @return
*/
public PageResponse<CorpInfoXgfCO> execute(CorpInfoXgfPageQry corpInfoXgfPageQry) {
Map<String, Object> params = PageQueryHelper.toHashMap(corpInfoXgfPageQry);
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(params);
List<CorpInfoXgfCO> examCenterCOS = corpInfoXgfCoConvertor.converDOsToCOs(pageResponse.getData());
//TODo 组装营业执照和多选框
examCenterCOS.forEach(info -> {
Long corpInfoId = info.getId();
List<Integer> typeList = Arrays.asList(CorpFormTypeEnum.MAINDEPARTMENT.getCode()
, CorpFormTypeEnum.MANAGERDEPARTMENT.getCode(), CorpFormTypeEnum.SUPERVISECORPDEPT.getCode()
, CorpFormTypeEnum.CORP_TYPE.getCode(), CorpFormTypeEnum.COMPETENTDEPT.getCode());
List<CorpFormDO> infoByTypeList = corpFormRepository.getInfoByTypeList(corpInfoId, typeList);
Map<Integer, List<CorpFormDO>> groupedByType = infoByTypeList.stream()
.collect(Collectors.groupingBy(CorpFormDO::getType));
info.setManagerDepartmentList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.MAINDEPARTMENT.getCode())));
info.setMainDepartmentList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.MANAGERDEPARTMENT.getCode())));
info.setCompetentDeptList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.COMPETENTDEPT.getCode())));
info.setSuperVisecorpDeptList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.SUPERVISECORPDEPT.getCode())));
info.setCorpTypeList(corpFormCoConvertor.converDOsToItemCOs(groupedByType.get(CorpFormTypeEnum.CORP_TYPE.getCode())));
});
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
public CorpInfoXgfCO info(Long id) {
CorpInfoDO corpInfoDO = corpInfoRepository.getById(id);
CorpInfoXgfCO corpInfoXgfCO = new CorpInfoXgfCO();
BeanUtils.copyProperties(corpInfoDO, corpInfoXgfCO);
//查找多选按钮
List<CorpFormDO> employmentformList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.EMPLOYMENTFORM.getCode());
corpInfoXgfCO.setEmploymentformList(corpFormCoConvertor.converDOsToItemCOs(employmentformList));
List<CorpFormDO> selectFromList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.SELECTFROM.getCode());
corpInfoXgfCO.setSelectfromList(corpFormCoConvertor.converDOsToItemCOs(selectFromList));
List<CorpFormDO> managerDepartmentList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.MANAGERDEPARTMENT.getCode());
corpInfoXgfCO.setManagerDepartmentList(corpFormCoConvertor.converDOsToItemCOs(managerDepartmentList));
List<CorpFormDO> mainDepartmentList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.MAINDEPARTMENT.getCode());
corpInfoXgfCO.setMainDepartmentList(corpFormCoConvertor.converDOsToItemCOs(mainDepartmentList));
List<CorpFormDO> competentDeptList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.COMPETENTDEPT.getCode());
corpInfoXgfCO.setCompetentDeptList(corpFormCoConvertor.converDOsToItemCOs(competentDeptList));
List<CorpFormDO> superVisecorpDeptList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.SUPERVISECORPDEPT.getCode());
corpInfoXgfCO.setSuperVisecorpDeptList(corpFormCoConvertor.converDOsToItemCOs(superVisecorpDeptList));
List<CorpFormDO> corpTypeList = corpFormRepository.getInfoByType(corpInfoDO.getId(), CorpFormTypeEnum.CORP_TYPE.getCode());
corpInfoXgfCO.setCorpTypeList(corpFormCoConvertor.converDOsToItemCOs(corpTypeList));
return corpInfoXgfCO;
}
}

View File

@ -0,0 +1,77 @@
package com.zcloud.basic.info.service;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse;
import com.jjb.saas.framework.auth.utils.AuthContext;
import com.zcloud.basic.info.api.CorpInfoXgfServiceI;
import com.zcloud.basic.info.command.CorpInfoXgfAddExe;
import com.zcloud.basic.info.command.CorpInfoXgfRemoveExe;
import com.zcloud.basic.info.command.CorpInfoXgfUpdateExe;
import com.zcloud.basic.info.command.SysUserAddExe;
import com.zcloud.basic.info.command.query.CorpInfoXgfQueryExe;
import com.zcloud.basic.info.domain.enums.UserTypeEnum;
import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd;
import com.zcloud.basic.info.dto.CorpInfoXgfPageQry;
import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd;
import com.zcloud.basic.info.dto.SysUserAddCmd;
import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO;
import com.zcloud.gbscommon.utils.Tools;
import lombok.AllArgsConstructor;
import org.apache.shiro.crypto.hash.SimpleHash;
import org.springframework.stereotype.Service;
/**
* web-app
*
* @Author zhaokai
* @Date 2025-10-31 10:56:46
*/
@Service
@AllArgsConstructor
public class CorpInfoXgfServiceImpl implements CorpInfoXgfServiceI {
private final CorpInfoXgfAddExe corpInfoXgfAddExe;
private final CorpInfoXgfUpdateExe corpInfoXgfUpdateExe;
private final CorpInfoXgfRemoveExe corpInfoXgfRemoveExe;
private final CorpInfoXgfQueryExe corpInfoXgfQueryExe;
private final SysUserAddExe sysUserAddExe;
@Override
public PageResponse<CorpInfoXgfCO> listPage(CorpInfoXgfPageQry qry) {
return corpInfoXgfQueryExe.execute(qry);
}
@Override
public SingleResponse add(CorpInfoXgfAddCmd cmd) {
Long userId = AuthContext.getUserId();
Long id = corpInfoXgfAddExe.execute(cmd);
//新增企业成功后新增企业主账号用户(企业主账号的gbsId与企业的gbsId一致) 2025-10-31 huangyuxuan
SysUserAddCmd user = new SysUserAddCmd();
user.setId(userId).setUserId(Tools.get32UUID()).setUsername(cmd.getCorpName()).setName(cmd.getCorpName())
.setPassword(new SimpleHash("SHA-1",user.getUsername(),"Aa@123456789").toHex())
.setCorpinfoId(id).setUserType(UserTypeEnum.getUserType(cmd.getType())).setStatus("0")
.setDepartmentId(id);
sysUserAddExe.execute(user);
return SingleResponse.buildSuccess();
}
@Override
public void edit(CorpInfoXgfUpdateCmd corpInfoXgfUpdateCmd) {
corpInfoXgfUpdateExe.execute(corpInfoXgfUpdateCmd);
}
@Override
public void remove(Long id) {
corpInfoXgfRemoveExe.execute(id);
}
@Override
public void removeBatch(Long[] ids) {
corpInfoXgfRemoveExe.execute(ids);
}
@Override
public CorpInfoXgfCO info(Long id) {
return corpInfoXgfQueryExe.info(id);
}
}

View File

@ -0,0 +1,29 @@
package com.zcloud.basic.info.api;
import com.alibaba.cola.dto.PageResponse;
import com.alibaba.cola.dto.SingleResponse;
import com.zcloud.basic.info.dto.CorpInfoXgfAddCmd;
import com.zcloud.basic.info.dto.CorpInfoXgfPageQry;
import com.zcloud.basic.info.dto.CorpInfoXgfUpdateCmd;
import com.zcloud.basic.info.dto.clientobject.CorpInfoXgfCO;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
public interface CorpInfoXgfServiceI {
PageResponse<CorpInfoXgfCO> listPage(CorpInfoXgfPageQry qry);
SingleResponse<CorpInfoXgfCO> add(CorpInfoXgfAddCmd cmd);
void edit(CorpInfoXgfUpdateCmd cmd);
void remove(Long id);
void removeBatch(Long[] ids);
CorpInfoXgfCO info(Long id);
}

View File

@ -47,6 +47,7 @@ public class CorpInfoAddCmd extends Command {
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ -144,9 +145,11 @@ public class CorpInfoAddCmd extends Command {
@ApiModelProperty(value = "四色图类型1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;
@ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseEnd;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;

View File

@ -1,6 +1,7 @@
package com.zcloud.basic.info.dto;
import com.alibaba.cola.dto.Command;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
@ -49,10 +50,12 @@ public class CorpInfoUpdateCmd extends Command {
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate createDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String corpState;
@ -145,9 +148,11 @@ public class CorpInfoUpdateCmd extends Command {
@ApiModelProperty(value = "四色图类型1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;
@ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseEnd;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;

View File

@ -0,0 +1,263 @@
package com.zcloud.basic.info.dto;
import com.alibaba.cola.dto.Command;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-31 10:52:08
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
public class CorpInfoXgfAddCmd extends Command {
@ApiModelProperty(value = "企业名称", name = "corpName", required = true)
@NotEmpty(message = "企业名称不能为空")
private String corpName;
@ApiModelProperty(value = "企业类型(0-普通企业1-集团单位2-股份单位3-相关方企业4-货主单位5-驻港单位)", name = "type", required = true)
private Integer type;
@ApiModelProperty(value = "相关方等级1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
private Integer xgfLevel;
@ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true)
private Integer corOrder;
@ApiModelProperty(value = "是否启用1:启用,2:关闭", name = "isUse", required = true)
private Integer isUse;
@ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
private String code;
@ApiModelProperty(value = "通讯地址", name = "address", required = true)
private String address;
@ApiModelProperty(value = "邮编", name = "postalCode", required = true)
private String postalCode;
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate createDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String corpState;
@ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
private String corpStateCode;
@ApiModelProperty(value = "资产总额(万元)", name = "totalassets", required = true)
private Double totalassets;
@ApiModelProperty(value = "注册资金(万元)", name = "regcapital", required = true)
private BigDecimal regcapital;
@ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true)
private String addressBusiness;
@ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
private String addressOffice;
@ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
private Double fixedAssets;
@ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
private Double yearOutputValue;
@ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
private String ecoType;
@ApiModelProperty(value = "主要负责人", name = "contacts", required = true)
private String contacts;
@ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true)
private String contactsPhone;
@ApiModelProperty(value = "安全负责人", name = "safetyName", required = true)
private String safetyName;
@ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true)
private String safetyPhone;
@ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true)
private Integer scaleType;
@ApiModelProperty(value = "占地面积", name = "areaCovered", required = true)
private Double areaCovered;
@ApiModelProperty(value = "职工人数", name = "employees", required = true)
private Integer employees;
@ApiModelProperty(value = "经度", name = "longitude", required = true)
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
private String latitude;
@ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true)
private String regType;
@ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true)
private String industryDepartment;
@ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
private String lrName;
@ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true)
private String lrMobile;
@ApiModelProperty(value = "行业分类", name = "corpType", required = true)
private String corpType;
@ApiModelProperty(value = "行业分类名称", name = "corpTypeName", required = true)
private String corpTypeName;
@ApiModelProperty(value = "行业分类", name = "corpType2", required = true)
private String corpType2;
@ApiModelProperty(value = "行业分类名称", name = "corpType2Name", required = true)
private String corpType2Name;
@ApiModelProperty(value = "行业分类", name = "corpType3", required = true)
private String corpType3;
@ApiModelProperty(value = "行业分类名称", name = "corpType3Name", required = true)
private String corpType3Name;
@ApiModelProperty(value = "行业分类", name = "corpType4", required = true)
private String corpType4;
@ApiModelProperty(value = "行业分类名称", name = "corpType4Name", required = true)
private String corpType4Name;
@ApiModelProperty(value = "所属省名称", name = "provinceName", required = true)
private String provinceName;
@ApiModelProperty(value = "所属省编码", name = "province", required = true)
private String province;
@ApiModelProperty(value = "所属市级名称", name = "cityName", required = true)
private String cityName;
@ApiModelProperty(value = "所属市级编码", name = "city", required = true)
private String city;
@ApiModelProperty(value = "所属区县名称", name = "countryName", required = true)
private String countryName;
@ApiModelProperty(value = "所属区县编码", name = "country", required = true)
private String country;
@ApiModelProperty(value = "所属乡镇名称", name = "villageName", required = true)
private String villageName;
@ApiModelProperty(value = "所属乡镇编码", name = "village", required = true)
private String village;
@ApiModelProperty(value = "所属街道名称", name = "streetName", required = true)
private String streetName;
@ApiModelProperty(value = "所属街道编码", name = "street", required = true)
private String street;
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
@ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
private String subordination;
@ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
private String subordinationName;
@ApiModelProperty(value = "四色图类型1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;
@ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseEnd;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;
@ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)
private Integer whetherHazards;
@ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true)
private Integer whetherScarce;
@ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true)
private Integer whetherChemicals;
@ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true)
private Integer whetherSpecialequipment;
@ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true)
private Integer whetherSpecialpeople;
@ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true)
private Integer whetherCoalgas;
@ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true)
private Integer whetherFire;
@ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true)
private Integer whetherConfined;
@ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true)
private Integer whetherPowder;
@ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true)
private Integer whetherLightning;
@ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true)
private Integer whetherPipeline;
@ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true)
private Integer whetherActinogen;
@ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true)
private Integer whetherLiquidammonia;
@ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
private List<CorpInfoXgfItemCmd> employmentformList;
@ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)
private List<CorpInfoXgfItemCmd> selectfromList;
@ApiModelProperty(value = "股份监管部门", name = "managerDepartmentList", required = true)
private List<CorpInfoXgfItemCmd> managerDepartmentList;
@ApiModelProperty(value = "股份主管部门", name = "mainDepartmentList", required = true)
private List<CorpInfoXgfItemCmd> mainDepartmentList;
@ApiModelProperty(value = "基层单位监管部门", name = "competentDeptList", required = true)
private List<CorpInfoXgfItemCmd> competentDeptList;
@ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true)
private List<CorpInfoXgfItemCmd> superVisecorpDeptList;
@ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true)
private List<CorpInfoXgfItemCmd> corpTypeList;
}

View File

@ -0,0 +1,19 @@
package com.zcloud.basic.info.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotEmpty;
@Data
public class CorpInfoXgfItemCmd {
@ApiModelProperty(value = "数据字典编码", name = "itemCode", required = true)
@NotEmpty(message = "数据字典编码")
private String itemCode;
@ApiModelProperty(value = "数据字典名称", name = "itemName", required = true)
@NotEmpty(message = "数据字典名称")
private String itemName;
@ApiModelProperty(value = "排序", name = "itemOrder", required = true)
private Integer itemOrder;
}

View File

@ -0,0 +1,49 @@
package com.zcloud.basic.info.dto;
import com.alibaba.cola.dto.PageQuery;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Data
public class CorpInfoXgfPageQry extends PageQuery {
/**
* ,
* - `like`: SQLLIKE
* - `eq`: SQL=
* - `gt`:
* - `lt`:
* - `ge`:
* - `le`:
* - `ne`: SQL!=
*/
@ApiModelProperty(value = "企业名称", name = "corpName", required = true)
private String likeCorpName;
@ApiModelProperty(value = "结束时间", name = "leCreateTime")
private String leCreateTime;
@ApiModelProperty(value = "开始时间", name = "geCreateTime")
private String geCreateTime;
@ApiModelProperty(value = "所属省编码", name = "eqProvince")
private String eqProvince;
@ApiModelProperty(value = "所属市级编码", name = "eqCity")
private String eqCity;
@ApiModelProperty(value = "所属区县编码", name = "eqCountry")
private String eqCountry;
@ApiModelProperty(value = "所属乡镇编码", name = "eqVillage")
private String eqVillage;
@ApiModelProperty(value = "所属街道编码", name = "eqStreet")
private String eqStreet;
}

View File

@ -0,0 +1,203 @@
package com.zcloud.basic.info.dto;
import com.alibaba.cola.dto.Command;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
public class CorpInfoXgfUpdateCmd extends Command {
@ApiModelProperty(value = "主键", name = "id", required = true)
@NotNull(message = "主键不能为空")
private Long id;
@ApiModelProperty(value = "企业id", name = "corpinfoId", required = true)
private String corpinfoId;
@ApiModelProperty(value = "企业名称", name = "corpName", required = true)
@NotEmpty(message = "企业名称不能为空")
private String corpName;
@ApiModelProperty(value = "企业类型(0-普通企业1-集团单位2-股份单位3-相关方企业4-货主单位5-驻港单位)", name = "type", required = true)
private Integer type;
@ApiModelProperty(value = "相关方等级1 一级相关方,2 二级相关方", name = "xgfLevel", required = true)
private Integer xgfLevel;
@ApiModelProperty(value = "企业再列表中的排序", name = "corOrder", required = true)
private Integer corOrder;
@ApiModelProperty(value = "是否启用1:启用,2:关闭", name = "isUse", required = true)
private Integer isUse;
@ApiModelProperty(value = "统一社会信用代码", name = "code", required = true)
private String code;
@ApiModelProperty(value = "通讯地址", name = "address", required = true)
private String address;
@ApiModelProperty(value = "邮编", name = "postalCode", required = true)
private String postalCode;
@ApiModelProperty(value = "所属区域", name = "companyArea", required = true)
private String companyArea;
@ApiModelProperty(value = "开始服务日期", name = "firstServeDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate firstServeDate;
@ApiModelProperty(value = "规模", name = "scale", required = true)
private String scale;
@ApiModelProperty(value = "成立时间", name = "createDate", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate createDate;
@ApiModelProperty(value = "企业状态", name = "corpState", required = true)
private String corpState;
@ApiModelProperty(value = "企业状态编码", name = "corpStateCode", required = true)
private String corpStateCode;
@ApiModelProperty(value = "资产总额(万元)", name = "totalassets", required = true)
private Double totalassets;
@ApiModelProperty(value = "注册资金(万元)", name = "regcapital", required = true)
private BigDecimal regcapital;
@ApiModelProperty(value = "企事业单位经营地址", name = "addressBusiness", required = true)
private String addressBusiness;
@ApiModelProperty(value = "企事业单位办公地址", name = "addressOffice", required = true)
private String addressOffice;
@ApiModelProperty(value = "固定资产", name = "fixedAssets", required = true)
private Double fixedAssets;
@ApiModelProperty(value = "年产值", name = "yearOutputValue", required = true)
private Double yearOutputValue;
@ApiModelProperty(value = "经济类型", name = "ecoType", required = true)
private String ecoType;
@ApiModelProperty(value = "主要负责人", name = "contacts", required = true)
private String contacts;
@ApiModelProperty(value = "主要负责人手机号", name = "contactsPhone", required = true)
private String contactsPhone;
@ApiModelProperty(value = "安全负责人", name = "safetyName", required = true)
private String safetyName;
@ApiModelProperty(value = "安全负责人手机号", name = "safetyPhone", required = true)
private String safetyPhone;
@ApiModelProperty(value = "是否规模以上,1:是,2:否", name = "scaleType", required = true)
private Integer scaleType;
@ApiModelProperty(value = "占地面积", name = "areaCovered", required = true)
private Double areaCovered;
@ApiModelProperty(value = "职工人数", name = "employees", required = true)
private Integer employees;
@ApiModelProperty(value = "经度", name = "longitude", required = true)
private String longitude;
@ApiModelProperty(value = "纬度", name = "latitude", required = true)
private String latitude;
@ApiModelProperty(value = "单位注册登记类型", name = "regType", required = true)
private String regType;
@ApiModelProperty(value = "行业监管部门", name = "industryDepartment", required = true)
private String industryDepartment;
@ApiModelProperty(value = "法定代表人", name = "lrName", required = true)
private String lrName;
@ApiModelProperty(value = "法人手机号", name = "lrMobile", required = true)
private String lrMobile;
@ApiModelProperty(value = "行业分类", name = "corpType", required = true)
private String corpType;
@ApiModelProperty(value = "行业分类名称", name = "corpTypeName", required = true)
private String corpTypeName;
@ApiModelProperty(value = "行业分类", name = "corpType2", required = true)
private String corpType2;
@ApiModelProperty(value = "行业分类名称", name = "corpType2Name", required = true)
private String corpType2Name;
@ApiModelProperty(value = "行业分类", name = "corpType3", required = true)
private String corpType3;
@ApiModelProperty(value = "行业分类名称", name = "corpType3Name", required = true)
private String corpType3Name;
@ApiModelProperty(value = "行业分类", name = "corpType4", required = true)
private String corpType4;
@ApiModelProperty(value = "行业分类名称", name = "corpType4Name", required = true)
private String corpType4Name;
@ApiModelProperty(value = "所属省名称", name = "provinceName", required = true)
private String provinceName;
@ApiModelProperty(value = "所属省编码", name = "province", required = true)
private String province;
@ApiModelProperty(value = "所属市级名称", name = "cityName", required = true)
private String cityName;
@ApiModelProperty(value = "所属市级编码", name = "city", required = true)
private String city;
@ApiModelProperty(value = "所属区县名称", name = "countryName", required = true)
private String countryName;
@ApiModelProperty(value = "所属区县编码", name = "country", required = true)
private String country;
@ApiModelProperty(value = "所属乡镇名称", name = "villageName", required = true)
private String villageName;
@ApiModelProperty(value = "所属乡镇编码", name = "village", required = true)
private String village;
@ApiModelProperty(value = "所属街道名称", name = "streetName", required = true)
private String streetName;
@ApiModelProperty(value = "所属街道编码", name = "street", required = true)
private String street;
@ApiModelProperty(value = "公司简介", name = "descr", required = true)
private String descr;
@ApiModelProperty(value = "隶属关系编码", name = "subordination", required = true)
private String subordination;
@ApiModelProperty(value = "隶属关系名称", name = "subordinationName", required = true)
private String subordinationName;
@ApiModelProperty(value = "四色图类型1.平面四色图", name = "fourtype", required = true)
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间", name = "licenseStart", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseStart;
@ApiModelProperty(value = "营业执照结束时间", name = "licenseEnd", required = true)
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate licenseEnd;
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否", name = "whetherHygiene", required = true)
private Integer whetherHygiene;
@ApiModelProperty(value = "有无重大危险源,1:是,2:否", name = "whetherHazards", required = true)
private Integer whetherHazards;
@ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否", name = "whetherScarce", required = true)
private Integer whetherScarce;
@ApiModelProperty(value = "是否涉及危化品,1:是,2:否", name = "whetherChemicals", required = true)
private Integer whetherChemicals;
@ApiModelProperty(value = "有无特种设备,1:是,2:否", name = "whetherSpecialequipment", required = true)
private Integer whetherSpecialequipment;
@ApiModelProperty(value = "有无特存种作业人员,1:是,2:否", name = "whetherSpecialpeople", required = true)
private Integer whetherSpecialpeople;
@ApiModelProperty(value = "是否涉及煤气,1:是,2:否", name = "whetherCoalgas", required = true)
private Integer whetherCoalgas;
@ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否", name = "whetherFire", required = true)
private Integer whetherFire;
@ApiModelProperty(value = "是否在有限空间作业,1:是,2:否", name = "whetherConfined", required = true)
private Integer whetherConfined;
@ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否", name = "whetherPowder", required = true)
private Integer whetherPowder;
@ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否", name = "whetherLightning", required = true)
private Integer whetherLightning;
@ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否", name = "whetherPipeline", required = true)
private Integer whetherPipeline;
@ApiModelProperty(value = "是否持有放射源,1:是,2:否", name = "whetherActinogen", required = true)
private Integer whetherActinogen;
@ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否", name = "whetherLiquidammonia", required = true)
private Integer whetherLiquidammonia;
@ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
private List<CorpInfoXgfItemCmd> employmentformList;
@ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)
private List<CorpInfoXgfItemCmd> selectfromList;
@ApiModelProperty(value = "股份监管部门", name = "managerDepartmentList", required = true)
private List<CorpInfoXgfItemCmd> managerDepartmentList;
@ApiModelProperty(value = "股份主管部门", name = "mainDepartmentList", required = true)
private List<CorpInfoXgfItemCmd> mainDepartmentList;
@ApiModelProperty(value = "基层单位监管部门", name = "competentDeptList", required = true)
private List<CorpInfoXgfItemCmd> competentDeptList;
@ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true)
private List<CorpInfoXgfItemCmd> superVisecorpDeptList;
@ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true)
private List<CorpInfoXgfItemCmd> corpTypeList;
@ApiModelProperty(value = "密码", name = "passWord", required = true)
private String passWord;
}

View File

@ -28,9 +28,9 @@ public class CorpQualificationInfoPageQry extends PageQuery {
private Long eqCorpInfoId;
@ApiModelProperty(value = "证书名称编号模糊查询", name = "keyWords")
private String keyWords;
@ApiModelProperty(value = "结束时间", name = "startDate")
@ApiModelProperty(value = "结束时间", name = "leValidityTime")
private String leValidityTime;
@ApiModelProperty(value = "开始时间", name = "endDate")
@ApiModelProperty(value = "开始时间", name = "geValidityTime")
private String geValidityTime;
// validitytime
}

View File

@ -0,0 +1,282 @@
package com.zcloud.basic.info.dto.clientobject;
import com.alibaba.cola.dto.ClientObject;
import com.zcloud.basic.info.dto.CorpInfoXgfItemCmd;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
/**
* web-client
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Data
public class CorpInfoXgfCO extends ClientObject {
//主键
@ApiModelProperty(value = "主键")
private Long id;
//企业id
@ApiModelProperty(value = "企业id")
private String corpinfoId;
//企业名称
@ApiModelProperty(value = "企业名称")
private String corpName;
//企业类型(0-普通企业1-集团单位2-股份单位3-相关方企业4-货主单位5-驻港单位)
@ApiModelProperty(value = "企业类型(0-普通企业1-集团单位2-股份单位3-相关方企业4-货主单位5-驻港单位)")
private Integer type;
//相关方等级1 一级相关方,2 二级相关方
@ApiModelProperty(value = "相关方等级1 一级相关方,2 二级相关方")
private Integer xgfLevel;
//企业再列表中的排序
@ApiModelProperty(value = "企业再列表中的排序")
private Integer corOrder;
//是否启用1:启用,2:关闭
@ApiModelProperty(value = "是否启用1:启用,2:关闭")
private Integer isUse;
//统一社会信用代码
@ApiModelProperty(value = "统一社会信用代码")
private String code;
//通讯地址
@ApiModelProperty(value = "通讯地址")
private String address;
//邮编
@ApiModelProperty(value = "邮编")
private String postalCode;
//所属区域
@ApiModelProperty(value = "所属区域")
private String companyArea;
//开始服务日期
@ApiModelProperty(value = "开始服务日期")
private LocalDate firstServeDate;
//规模
@ApiModelProperty(value = "规模")
private String scale;
//成立时间
@ApiModelProperty(value = "成立时间")
private LocalDate createDate;
//企业状态
@ApiModelProperty(value = "企业状态")
private String corpState;
//企业状态编码
@ApiModelProperty(value = "企业状态编码")
private String corpStateCode;
//资产总额(万元)
@ApiModelProperty(value = "资产总额(万元)")
private Double totalassets;
//注册资金(万元)
@ApiModelProperty(value = "注册资金(万元)")
private BigDecimal regcapital;
//企事业单位经营地址
@ApiModelProperty(value = "企事业单位经营地址")
private String addressBusiness;
//企事业单位办公地址
@ApiModelProperty(value = "企事业单位办公地址")
private String addressOffice;
//固定资产
@ApiModelProperty(value = "固定资产")
private Double fixedAssets;
//年产值
@ApiModelProperty(value = "年产值")
private Double yearOutputValue;
//经济类型
@ApiModelProperty(value = "经济类型")
private String ecoType;
//主要负责人
@ApiModelProperty(value = "主要负责人")
private String contacts;
//主要负责人手机号
@ApiModelProperty(value = "主要负责人手机号")
private String contactsPhone;
//安全负责人
@ApiModelProperty(value = "安全负责人")
private String safetyName;
//安全负责人手机号
@ApiModelProperty(value = "安全负责人手机号")
private String safetyPhone;
//是否规模以上,1:是,2:否
@ApiModelProperty(value = "是否规模以上,1:是,2:否")
private Integer scaleType;
//占地面积
@ApiModelProperty(value = "占地面积")
private Double areaCovered;
//职工人数
@ApiModelProperty(value = "职工人数")
private Integer employees;
//经度
@ApiModelProperty(value = "经度")
private String longitude;
//纬度
@ApiModelProperty(value = "纬度")
private String latitude;
//单位注册登记类型
@ApiModelProperty(value = "单位注册登记类型")
private String regType;
//行业监管部门
@ApiModelProperty(value = "行业监管部门")
private String industryDepartment;
//法定代表人
@ApiModelProperty(value = "法定代表人")
private String lrName;
//法人手机号
@ApiModelProperty(value = "法人手机号")
private String lrMobile;
//行业分类
@ApiModelProperty(value = "行业分类")
private String corpType;
//行业分类名称
@ApiModelProperty(value = "行业分类名称")
private String corpTypeName;
//行业分类
@ApiModelProperty(value = "行业分类")
private String corpType2;
//行业分类名称
@ApiModelProperty(value = "行业分类名称")
private String corpType2Name;
//行业分类
@ApiModelProperty(value = "行业分类")
private String corpType3;
//行业分类名称
@ApiModelProperty(value = "行业分类名称")
private String corpType3Name;
//行业分类
@ApiModelProperty(value = "行业分类")
private String corpType4;
//行业分类名称
@ApiModelProperty(value = "行业分类名称")
private String corpType4Name;
//所属省名称
@ApiModelProperty(value = "所属省名称")
private String provinceName;
//所属省编码
@ApiModelProperty(value = "所属省编码")
private String province;
//所属市级名称
@ApiModelProperty(value = "所属市级名称")
private String cityName;
//所属市级编码
@ApiModelProperty(value = "所属市级编码")
private String city;
//所属区县名称
@ApiModelProperty(value = "所属区县名称")
private String countryName;
//所属区县编码
@ApiModelProperty(value = "所属区县编码")
private String country;
//所属乡镇名称
@ApiModelProperty(value = "所属乡镇名称")
private String villageName;
//所属乡镇编码
@ApiModelProperty(value = "所属乡镇编码")
private String village;
//所属街道名称
@ApiModelProperty(value = "所属街道名称")
private String streetName;
//所属街道编码
@ApiModelProperty(value = "所属街道编码")
private String street;
//公司简介
@ApiModelProperty(value = "公司简介")
private String descr;
//隶属关系编码
@ApiModelProperty(value = "隶属关系编码")
private String subordination;
//隶属关系名称
@ApiModelProperty(value = "隶属关系名称")
private String subordinationName;
//四色图类型1.平面四色图
@ApiModelProperty(value = "四色图类型1.平面四色图")
private String fourtype;
@ApiModelProperty(value = "营业执照开始时间")
private LocalDate licenseStart;
//营业执照结束时间
@ApiModelProperty(value = "营业执照结束时间")
private LocalDate licenseEnd;
//有无职业卫生信息,1:是,2:否
@ApiModelProperty(value = "有无职业卫生信息,1:是,2:否")
private Integer whetherHygiene;
//有无重大危险源,1:是,2:否
@ApiModelProperty(value = "有无重大危险源,1:是,2:否")
private Integer whetherHazards;
//是否有稀缺大型应急物资或设施,1:是,2:否
@ApiModelProperty(value = "是否有稀缺大型应急物资或设施,1:是,2:否")
private Integer whetherScarce;
//是否涉及危化品,1:是,2:否
@ApiModelProperty(value = "是否涉及危化品,1:是,2:否")
private Integer whetherChemicals;
//有无特种设备,1:是,2:否
@ApiModelProperty(value = "有无特种设备,1:是,2:否")
private Integer whetherSpecialequipment;
//有无特存种作业人员,1:是,2:否
@ApiModelProperty(value = "有无特存种作业人员,1:是,2:否")
private Integer whetherSpecialpeople;
//是否涉及煤气,1:是,2:否
@ApiModelProperty(value = "是否涉及煤气,1:是,2:否")
private Integer whetherCoalgas;
//是否属于消防重点单位,1:是,2:否
@ApiModelProperty(value = "是否属于消防重点单位,1:是,2:否")
private Integer whetherFire;
//是否在有限空间作业,1:是,2:否
@ApiModelProperty(value = "是否在有限空间作业,1:是,2:否")
private Integer whetherConfined;
//是否存在涉爆粉尘作业,1:是,2:否
@ApiModelProperty(value = "是否存在涉爆粉尘作业,1:是,2:否")
private Integer whetherPowder;
//是否涉及防雷防静电,1:是,2:否
@ApiModelProperty(value = "是否涉及防雷防静电,1:是,2:否")
private Integer whetherLightning;
//是否涉及危化品管道,1:是,2:否
@ApiModelProperty(value = "是否涉及危化品管道,1:是,2:否")
private Integer whetherPipeline;
//是否持有放射源,1:是,2:否
@ApiModelProperty(value = "是否持有放射源,1:是,2:否")
private Integer whetherActinogen;
//是否涉及液氨制冷,1:是,2:否
@ApiModelProperty(value = "是否涉及液氨制冷,1:是,2:否")
private Integer whetherLiquidammonia;
//创建人
@ApiModelProperty(value = "创建人")
private Long createId;
//创建人姓名
@ApiModelProperty(value = "创建人姓名")
private String createName;
//创建时间
@ApiModelProperty(value = "创建时间")
private LocalDateTime createTime;
//更新人
@ApiModelProperty(value = "更新人")
private Long updateId;
//修改人名称
@ApiModelProperty(value = "修改人名称")
private String updateName;
//更新时间
@ApiModelProperty(value = "更新时间")
private LocalDateTime updateTime;
//描述
@ApiModelProperty(value = "描述")
private String remarks;
@ApiModelProperty(value = "用工形式", name = "employmentformList", required = true)
private List<CorpInfoXgfItemCO> employmentformList;
@ApiModelProperty(value = "选取形式", name = "selectfromList", required = true)
private List<CorpInfoXgfItemCO> selectfromList;
@ApiModelProperty(value = "股份监管部门", name = "managerDepartmentList", required = true)
private List<CorpInfoXgfItemCO> managerDepartmentList;
@ApiModelProperty(value = "股份主管部门", name = "mainDepartmentList", required = true)
private List<CorpInfoXgfItemCO> mainDepartmentList;
@ApiModelProperty(value = "基层单位监管部门", name = "competentDeptList", required = true)
private List<CorpInfoXgfItemCO> competentDeptList;
@ApiModelProperty(value = "基层单位主管部门", name = "superVisecorpDeptList", required = true)
private List<CorpInfoXgfItemCO> superVisecorpDeptList;
@ApiModelProperty(value = "集团单位", name = "corpTypeList", required = true)
private List<CorpInfoXgfItemCO> corpTypeList;
}

View File

@ -0,0 +1,17 @@
package com.zcloud.basic.info.dto.clientobject;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class CorpInfoXgfItemCO {
@ApiModelProperty(value = "数据字典编码", name = "itemCode", required = true)
private String itemCode;
@ApiModelProperty(value = "数据字典名称", name = "itemName", required = true)
private String itemName;
@ApiModelProperty(value = "排序", name = "itemOrder", required = true)
private Integer itemOrder;
@ApiModelProperty(value = "企业名称", name = "corpName", required = true)
private String corpName;
}

View File

@ -0,0 +1,26 @@
package com.zcloud.basic.info.domain.enums;
import lombok.Getter;
@Getter
public enum CorpFormTypeEnum {
SELECTFROM(0,"选取形式", "旧代码select_from"),
EMPLOYMENTFORM(1,"用工形式", "旧代码employment_form"),
BUSLICENSEEXPDATE(3,"营业执照有效期", "旧代码license_start,license_end,新licensestartlicensestart"),
MAINDEPARTMENT(4,"股份主管部门", "旧代码main_department,新maindepartment"),
MANAGERDEPARTMENT(5,"股份监管部门", "旧代码manager_department,新managerdepartment"),
COMPETENTDEPT(6,"基层单位监管部门", "旧代码competent_dept,新competentdept"),
SUPERVISECORPDEPT(7,"基层单位主管部门", "旧代码supervise_corp_dept,新supervisecorpdept"),
CORP_TYPE(8,"集团单位", "集团单位"),
BUSINESSLICENSE(2,"营业执照照片", "旧代码business_license");
private final Integer code;
private final String name;
private final String desc;
CorpFormTypeEnum(Integer code, String name, String desc) {
this.code = code;
this.name = name;
this.desc = desc;
}
}

View File

@ -2,6 +2,8 @@ package com.zcloud.basic.info.domain.gateway;
import com.zcloud.basic.info.domain.model.CorpFormE;
import java.util.List;
/**
* web-domain
*
@ -26,5 +28,9 @@ public interface CorpFormGateway {
Boolean deletedCorpFormById(Long id);
Boolean deletedCorpFormByIds(Long[] id);
void deletedCorpFormByType(Long corpInfoId, List<Integer> typeList);
void deletedCorpFormByType(Long corpInfoId, Integer type);
}

View File

@ -0,0 +1,38 @@
package com.zcloud.basic.info.domain.gateway;
import com.zcloud.basic.info.domain.model.CorpInfoXgfE;
/**
* web-domain
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
public interface CorpInfoXgfGateway {
/**
*
*/
Boolean add(CorpInfoXgfE corpInfoXgfE);
/**
* id
* @param corpInfoXgfE
* @return
*/
Long addInfo(CorpInfoXgfE corpInfoXgfE);
/**
*
*/
Boolean update(CorpInfoXgfE corpInfoXgfE);
/**
*
*/
Boolean deletedCorpInfoXgfById(Long id);
Boolean deletedCorpInfoXgfByIds(Long[] id);
}

View File

@ -13,7 +13,7 @@ public interface DepartmentGateway {
/**
*
*/
Boolean add(DepartmentE departmentE);
Long add(DepartmentE departmentE);
/**
*

View File

@ -2,6 +2,7 @@ package com.zcloud.basic.info.domain.model;
import com.alibaba.cola.domain.Entity;
import com.jjb.saas.framework.domain.model.BaseE;
import com.zcloud.basic.info.domain.enums.CorpFormTypeEnum;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -32,6 +33,6 @@ public class CorpFormE extends BaseE {
private String itemName;
//排序
private Integer itemOrder;
// CorpFormTypeEnum
}

View File

@ -168,30 +168,7 @@ public class CorpInfoE extends BaseE {
private Integer whetherActinogen;
//是否涉及液氨制冷,1:是,2:否
private Integer whetherLiquidammonia;
//乐观锁
private Integer version;
//创建人
private Long createId;
//创建人姓名
private String createName;
//创建时间
private LocalDateTime createTime;
//更新人
private Long updateId;
//修改人名称
private String updateName;
//更新时间
private LocalDateTime updateTime;
//描述
private String remarks;
//是否删除
private String deleteEnum;
//租户ID
private Long tenantId;
//机构ID
private Long orgId;
//环境
private String env;
}

View File

@ -0,0 +1,167 @@
package com.zcloud.basic.info.domain.model;
import com.jjb.saas.framework.domain.model.BaseE;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* web-domain
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Data
public class CorpInfoXgfE extends BaseE {
//企业id
private String corpinfoId;
//企业名称
private String corpName;
//企业类型(0-普通企业1-集团单位2-股份单位3-相关方企业4-货主单位5-驻港单位)
private Integer type;
//相关方等级1 一级相关方,2 二级相关方
private Integer xgfLevel;
//企业再列表中的排序
private Integer corOrder;
//是否启用1:启用,2:关闭
private Integer isUse;
//统一社会信用代码
private String code;
//通讯地址
private String address;
//邮编
private String postalCode;
//所属区域
private String companyArea;
//开始服务日期
private LocalDate firstServeDate;
//规模
private String scale;
//成立时间
private LocalDate createDate;
//企业状态
private String corpState;
//企业状态编码
private String corpStateCode;
//资产总额(万元)
private Double totalassets;
//注册资金(万元)
private BigDecimal regcapital;
//企事业单位经营地址
private String addressBusiness;
//企事业单位办公地址
private String addressOffice;
//固定资产
private Double fixedAssets;
//年产值
private Double yearOutputValue;
//经济类型
private String ecoType;
//主要负责人
private String contacts;
//主要负责人手机号
private String contactsPhone;
//安全负责人
private String safetyName;
//安全负责人手机号
private String safetyPhone;
//是否规模以上,1:是,2:否
private Integer scaleType;
//占地面积
private Double areaCovered;
//职工人数
private Integer employees;
//经度
private String longitude;
//纬度
private String latitude;
//单位注册登记类型
private String regType;
//行业监管部门
private String industryDepartment;
//法定代表人
private String lrName;
//法人手机号
private String lrMobile;
//行业分类
private String corpType;
//行业分类名称
private String corpTypeName;
//行业分类
private String corpType2;
//行业分类名称
private String corpType2Name;
//行业分类
private String corpType3;
//行业分类名称
private String corpType3Name;
//行业分类
private String corpType4;
//行业分类名称
private String corpType4Name;
//所属省名称
private String provinceName;
//所属省编码
private String province;
//所属市级名称
private String cityName;
//所属市级编码
private String city;
//所属区县名称
private String countryName;
//所属区县编码
private String country;
//所属乡镇名称
private String villageName;
//所属乡镇编码
private String village;
//所属街道名称
private String streetName;
//所属街道编码
private String street;
//公司简介
private String descr;
//隶属关系编码
private String subordination;
//隶属关系名称
private String subordinationName;
//四色图类型1.平面四色图
private String fourtype;
//营业执照开始时间
private LocalDate licenseStart;
//营业执照结束时间
private LocalDate licenseEnd;
//有无职业卫生信息,1:是,2:否
private Integer whetherHygiene;
//有无重大危险源,1:是,2:否
private Integer whetherHazards;
//是否有稀缺大型应急物资或设施,1:是,2:否
private Integer whetherScarce;
//是否涉及危化品,1:是,2:否
private Integer whetherChemicals;
//有无特种设备,1:是,2:否
private Integer whetherSpecialequipment;
//有无特存种作业人员,1:是,2:否
private Integer whetherSpecialpeople;
//是否涉及煤气,1:是,2:否
private Integer whetherCoalgas;
//是否属于消防重点单位,1:是,2:否
private Integer whetherFire;
//是否在有限空间作业,1:是,2:否
private Integer whetherConfined;
//是否存在涉爆粉尘作业,1:是,2:否
private Integer whetherPowder;
//是否涉及防雷防静电,1:是,2:否
private Integer whetherLightning;
//是否涉及危化品管道,1:是,2:否
private Integer whetherPipeline;
//是否持有放射源,1:是,2:否
private Integer whetherActinogen;
//是否涉及液氨制冷,1:是,2:否
private Integer whetherLiquidammonia;
}

View File

@ -1,14 +1,18 @@
package com.zcloud.basic.info.gatewayimpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zcloud.basic.info.domain.gateway.CorpFormGateway;
import com.zcloud.basic.info.domain.model.CorpFormE;
import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
import com.zcloud.basic.info.persistence.repository.CorpFormRepository;
import com.zcloud.gbscommon.utils.Tools;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List;
/**
* web-infrastructure
@ -25,10 +29,14 @@ public class CorpFormGatewayImpl implements CorpFormGateway {
public Boolean add(CorpFormE corpFormE) {
CorpFormDO d = new CorpFormDO();
BeanUtils.copyProperties(corpFormE, d);
if (StringUtils.isEmpty(d.getCorpFormId())) {
d.setCorpFormId(Tools.get32UUID());
}
corpFormRepository.save(d);
return true;
}
@Override
public Boolean update(CorpFormE corpFormE) {
CorpFormDO d = new CorpFormDO();
@ -46,5 +54,21 @@ public class CorpFormGatewayImpl implements CorpFormGateway {
public Boolean deletedCorpFormByIds(Long[] ids) {
return corpFormRepository.removeByIds(Collections.singletonList(ids));
}
@Override
public void deletedCorpFormByType(Long corpInfoId, List<Integer> typeList) {
QueryWrapper<CorpFormDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("info_id", corpInfoId)
.in("type", typeList);
corpFormRepository.remove(queryWrapper);
}
@Override
public void deletedCorpFormByType(Long corpInfoId, Integer type) {
QueryWrapper<CorpFormDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("info_id", corpInfoId)
.eq("type", type);
corpFormRepository.remove(queryWrapper);
}
}

View File

@ -0,0 +1,66 @@
package com.zcloud.basic.info.gatewayimpl;
import com.zcloud.basic.info.domain.gateway.CorpInfoXgfGateway;
import com.zcloud.basic.info.domain.model.CorpInfoXgfE;
import com.zcloud.basic.info.persistence.dataobject.CorpInfoDO;
import com.zcloud.basic.info.persistence.repository.CorpInfoRepository;
import com.zcloud.gbscommon.utils.Tools;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.util.Collections;
/**
* web-infrastructure
*
* @Author zhaokai
* @Date 2025-10-31 10:52:09
*/
@Service
@AllArgsConstructor
public class CorpInfoXgfGatewayImpl implements CorpInfoXgfGateway {
private final CorpInfoRepository corpInfoRepository;
@Override
public Boolean add(CorpInfoXgfE corpInfoXgfE) {
CorpInfoDO d = new CorpInfoDO();
BeanUtils.copyProperties(corpInfoXgfE, d);
if(StringUtils.isEmpty(d.getCorpinfoId())){
d.setCorpinfoId(Tools.get32UUID());
}
corpInfoRepository.save(d);
return true;
}
@Override
public Long addInfo(CorpInfoXgfE corpInfoXgfE) {
CorpInfoDO d = new CorpInfoDO();
BeanUtils.copyProperties(corpInfoXgfE, d);
if(StringUtils.isEmpty(d.getCorpinfoId())){
d.setCorpinfoId(Tools.get32UUID());
}
corpInfoRepository.save(d);
return d.getId();
}
@Override
public Boolean update(CorpInfoXgfE corpInfoXgfE) {
CorpInfoDO d = new CorpInfoDO();
BeanUtils.copyProperties(corpInfoXgfE, d);
corpInfoRepository.updateById(d);
return true;
}
@Override
public Boolean deletedCorpInfoXgfById(Long id) {
return corpInfoRepository.removeById(id);
}
@Override
public Boolean deletedCorpInfoXgfByIds(Long[] ids) {
return corpInfoRepository.removeByIds(Collections.singletonList(ids));
}
}

View File

@ -23,12 +23,12 @@ public class DepartmentGatewayImpl implements DepartmentGateway {
private final DepartmentRepository departmentRepository;
@Override
public Boolean add(DepartmentE departmentE) {
public Long add(DepartmentE departmentE) {
DepartmentDO d = new DepartmentDO();
BeanUtils.copyProperties(departmentE, d);
d.setDepartmentId(Tools.get32UUID());
departmentRepository.save(d);
return true;
return d.getId();
}
@Override

View File

@ -1,6 +1,7 @@
package com.zcloud.basic.info.persistence.dataobject;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.jjb.saas.framework.repository.basedo.BaseDO;
@ -43,5 +44,8 @@ public class CorpFormDO extends BaseDO {
@ApiModelProperty(value = "排序")
private Integer itemOrder;
@TableField(exist = false)
private String corpName;
}

View File

@ -3,6 +3,9 @@ package com.zcloud.basic.info.persistence.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* web-infrastructure
@ -13,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CorpFormMapper extends BaseMapper<CorpFormDO> {
List<CorpFormDO> selectListByType(@Param("infoId") Long infoId, @Param("typeList") List<Integer> typeList);
}

View File

@ -4,6 +4,7 @@ import com.alibaba.cola.dto.PageResponse;
import com.jjb.saas.framework.repository.repo.BaseRepository;
import com.zcloud.basic.info.persistence.dataobject.CorpFormDO;
import java.util.List;
import java.util.Map;
/**
@ -14,5 +15,9 @@ import java.util.Map;
*/
public interface CorpFormRepository extends BaseRepository<CorpFormDO> {
PageResponse<CorpFormDO> listPage(Map<String, Object> parmas);
List<CorpFormDO> getInfoByType(Long id, Integer type);
List<CorpFormDO> getInfoByTypeList(Long corpInfoId, List<Integer> typeList);
}

View File

@ -13,6 +13,7 @@ import com.zcloud.gbscommon.utils.PageQueryHelper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
@ -35,5 +36,21 @@ public class CorpFormRepositoryImpl extends BaseRepositoryImpl<CorpFormMapper, C
IPage<CorpFormDO> result = corpFormMapper.selectPage(iPage, queryWrapper);
return PageHelper.pageToResponse(result, result.getRecords());
}
@Override
public List<CorpFormDO> getInfoByType(Long id, Integer type) {
QueryWrapper<CorpFormDO> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("info_id", id);
queryWrapper.eq("type", type);
queryWrapper.orderByAsc("item_order");
List<CorpFormDO> corpFormDOS = corpFormMapper.selectList(queryWrapper);
return corpFormDOS;
}
@Override
public List<CorpFormDO> getInfoByTypeList(Long corpInfoId, List<Integer> typeList) {
List<CorpFormDO> corpFormDOList = corpFormMapper.selectListByType(corpInfoId,typeList);
return corpFormDOList;
}
}

View File

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zcloud.basic.info.persistence.mapper.CorpFormMapper">
</mapper>