Skip to content

A
amos-boot-biz
Commit 14b8ece3 authored by tianyiming's avatar tianyiming
Browse files
Options

企业端企业信息详情

parent fc91094a
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 27 deletions
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java
View file @ 14b8ece3
......@@ -2,14 +2,7 @@ package com.yeejoin.amos.boot.module.tzs.api.dto;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
import java.util.Date;
import java.util.List;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -258,6 +251,25 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
*/
private String technicalPerson;
@ApiModelProperty(value = "涉及设备类型")
private String equipCategory;
@ApiModelProperty(value = "企业营业执照")
private List unitBusinessLicense;
@ApiModelProperty(value = "企业许可证书")
private List unitExequatur;
@ApiModelProperty(value = "安全管理人2身份证照片")
private List safetyTwoPhoto;
@ApiModelProperty(value = "安全管理人1身份证照片")
private List safetyOnePhoto;
@ApiModelProperty(value = "质量保证工程师电话")
private String sqaPhone;
private String region;
private String fullAddress;
......@@ -265,6 +277,11 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
private String superviseKey;
private List<BaseUnitLicenceDto> unitLicences;
private RegUnitIcDto regUnitIcDto;
//企业管理员信息
private RegUnitInfoDto regUnitInfoDto;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/entity/TzBaseEnterpriseInfo.java
View file @ 14b8ece3
package com.yeejoin.amos.boot.module.tzs.api.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
......@@ -10,9 +8,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;
import java.util.List;
/**
......@@ -162,5 +159,23 @@ public class TzBaseEnterpriseInfo extends BaseEntity {
@ApiModelProperty(value = "技术负责人")
private String technicalPerson;
@ApiModelProperty(value = "涉及设备类型")
private String equipCategory;
@ApiModelProperty(value = "企业营业执照")
private List unitBusinessLicense;
@ApiModelProperty(value = "企业许可证书")
private List unitExequatur;
@ApiModelProperty(value = "安全管理人2身份证照片")
private List safetyTwoPhoto;
@ApiModelProperty(value = "安全管理人1身份证照片")
private List safetyOnePhoto;
@ApiModelProperty(value = "质量保证工程师电话")
private String sqaPhone;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/service/ITzBaseEnterpriseInfoService.java
View file @ 14b8ece3
......@@ -28,6 +28,7 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
TzBaseEnterpriseInfoDto detail(Long id);
IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, Long id);
List<EquEnterDto> getInfoByUseUnit(String useUnit);
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitIcDto.java
View file @ 14b8ece3
package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
......@@ -57,5 +56,7 @@ public class RegUnitIcDto extends BaseDto {
private String province;
private String city;
private String district;
private String registerAddress;
}
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/dto/RegUnitInfoDto.java
View file @ 14b8ece3
package com.yeejoin.amos.boot.module.tzs.flc.api.dto;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
......@@ -109,6 +107,9 @@ public class RegUnitInfoDto extends BaseDto {
@ApiModelProperty(value = "管理员身份证号")
private String adminIdNumber;
@ApiModelProperty(value = "身份证照片（正反面）")
private List adminIdCardPhoto;
@ApiModelProperty(value = "审核状态：1-无需审核；2-待审核；3-已审核")
private String state;
......
amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/entity/RegUnitInfo.java
View file @ 14b8ece3
......@@ -7,6 +7,8 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.List;
/**
* 单位注册信息表
*
......@@ -199,4 +201,9 @@ public class RegUnitInfo extends BaseEntity {
*/
private String adminUserId;
/**
* 身份证照片（正反面）
*/
private List adminIdCardPhoto;
}
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java
View file @ 14b8ece3
......@@ -9,8 +9,6 @@ import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.tzs.api.entity.PageParam;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
......@@ -162,6 +160,14 @@ public class TzBaseEnterpriseInfoController {
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@RequestMapping(value = "/info", method = RequestMethod.GET)
@ApiOperation(httpMethod = "GET", value = "根据id查询企业详情", notes = "根据id查询企业详情")
public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> pageInfo(PageParam pageParam,
Long id) {
return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.page(pageParam, id));
}
/**
* 根据企业名称查询企业详情
*
......
amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java
View file @ 14b8ece3
......@@ -2,12 +2,13 @@ package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
import com.yeejoin.amos.boot.module.tzs.api.dto.BaseUnitLicenceDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.EquEnterDto;
import com.yeejoin.amos.boot.module.tzs.api.dto.TzBaseEnterpriseInfoDto;
......@@ -17,29 +18,31 @@ import com.yeejoin.amos.boot.module.tzs.api.entity.SpeUseUnit;
import com.yeejoin.amos.boot.module.tzs.api.entity.TzBaseEnterpriseInfo;
import com.yeejoin.amos.boot.module.tzs.api.mapper.TzBaseEnterpriseInfoMapper;
import com.yeejoin.amos.boot.module.tzs.api.service.IBaseUnitLicenceService;
import com.yeejoin.amos.boot.module.tzs.api.service.ISpeUseUnitService;
import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
import com.yeejoin.amos.boot.module.tzs.biz.utils.RedisUtil;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitInfoDto;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitInfo;
import com.yeejoin.amos.boot.module.tzs.flc.api.feign.AccessFeignService;
import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitIcServiceImpl;
import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitInfoServiceImpl;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import java.util.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService;
import java.text.ParseException;
import java.util.*;
/**
* 企业数据信息 服务实现类
*
......@@ -70,6 +73,9 @@ public class TzBaseEnterpriseInfoServiceImpl
RegUnitIcServiceImpl regUnitIcService;
@Autowired
RegUnitInfoServiceImpl regUnitInfoService;
@Autowired
private IBaseUnitLicenceService iBaseUnitLicenceService;
@Autowired
......@@ -77,6 +83,8 @@ public class TzBaseEnterpriseInfoServiceImpl
@Autowired
private AccessFeignService accessFeignService;
@Autowired
DataDictionaryServiceImpl iDataDictionaryService;
@Override
public List<EquEnterDto> getInfo(String sequenceNbr) {
......@@ -113,6 +121,17 @@ public class TzBaseEnterpriseInfoServiceImpl
unitLicenceDtos.add(baseUnitLicenceDto);
}
tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
// 管理员信息
RegUnitInfo regUnitInfo = regUnitInfoService.getOne(
new LambdaQueryWrapper<RegUnitInfo>().eq(RegUnitInfo::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
RegUnitInfoDto regUnitInfoDto = new RegUnitInfoDto();
if (regUnitInfo != null) {
BeanUtils.copyProperties(regUnitInfo, regUnitInfoDto);
}
List list = ObjectUtils.isEmpty(regUnitInfoDto.getAdminIdCardPhoto()) ? new ArrayList() : regUnitInfoDto.getAdminIdCardPhoto();
regUnitInfoDto.setAdminIdCardPhoto(list);
tzBaseEnterpriseInfoDto.setRegUnitInfoDto(regUnitInfoDto);
// 工商信息
RegUnitIc regUnitIc = regUnitIcService.getOne(
new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
......@@ -126,6 +145,62 @@ public class TzBaseEnterpriseInfoServiceImpl
}
@Override
public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, Long id) {
TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = detail(id);
RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
Map<String, Object> resultMap = accessFeignService.getData(tzBaseEnterpriseInfoDto.getUseCode()).getResult();
if(!ValidationUtil.isEmpty(resultMap)){
String area = String.valueOf(resultMap.get("area"));
String city = area.substring(0,area.indexOf("市")+1);
String district = area.substring(city.length());
if(district.equals("高新区")){
district = "雁塔区";
}
String industryName = "";
DataDictionary dataDictionary = iDataDictionaryService.getByCode(String.valueOf(resultMap.get("industryCode")),"HYXLDM");
if(!ValidationUtil.isEmpty(dataDictionary)) {
industryName = dataDictionary.getName();
}
String approveDate = String.valueOf(resultMap.get("approval_time"));
approveDate = approveDate.contains("年")?approveDate.replace("年","-"):approveDate;
approveDate = approveDate.contains("月")?approveDate.replace("月","-"):approveDate;
approveDate = approveDate.contains("日")?approveDate.replace("日","-"):approveDate;
regUnitIcDto.setUnitCode(String.valueOf(resultMap.get("creditCode")));
try {
regUnitIcDto.setApprovedDate(DateUtils.dateParse(approveDate,"yyyy-MM-dd"));
} catch (ParseException e) {
e.printStackTrace();
}
regUnitIcDto.setUnitName(String.valueOf(resultMap.get("unitName")));
regUnitIcDto.setRegisteredOrgan(String.valueOf(resultMap.get("registration_authority")));
regUnitIcDto.setBusinessState(String.valueOf(resultMap.get("operating_status")));
regUnitIcDto.setProvince("陕西省");
regUnitIcDto.setCity(city);
regUnitIcDto.setDistrict(district);
regUnitIcDto.setStree(String.valueOf(resultMap.get("street")));
regUnitIcDto.setCommunity(String.valueOf(resultMap.get("community")));
regUnitIcDto.setAddress(String.valueOf(resultMap.get("address")));
regUnitIcDto.setLegalPerson(String.valueOf(resultMap.get("legalPeople")));
regUnitIcDto.setIndustryName(industryName);
regUnitIcDto.setRegisterAddress("陕西省/" + city + "/" + district);
}
tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
tzBaseEnterpriseInfoDto.setApprovalTime(regUnitIcDto.getApprovedDate());
ArrayList<TzBaseEnterpriseInfoDto> result = new ArrayList<>();
result.add(tzBaseEnterpriseInfoDto);
Page<TzBaseEnterpriseInfoDto> page = new Page<>(pageParam.getCurrent(), pageParam.getSize());
List safetyTwoPhone = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getSafetyTwoPhoto()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getSafetyTwoPhoto();
tzBaseEnterpriseInfoDto.setSafetyTwoPhoto(safetyTwoPhone);
List safetyOnePhoto = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getSafetyOnePhoto()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getSafetyOnePhoto();
tzBaseEnterpriseInfoDto.setSafetyOnePhoto(safetyOnePhoto);
List unitBusinessLicense = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getUnitBusinessLicense()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getUnitBusinessLicense();
tzBaseEnterpriseInfoDto.setUnitBusinessLicense(unitBusinessLicense);
List unitExequatur = ObjectUtils.isEmpty(tzBaseEnterpriseInfoDto.getUnitExequatur()) ? new ArrayList() : tzBaseEnterpriseInfoDto.getUnitExequatur();
tzBaseEnterpriseInfoDto.setUnitExequatur(unitExequatur);
return page.setRecords(result);
}
@Override
public List<EquEnterDto> getInfoByUseUnit(String userUnit) {
return tzBaseEnterpriseInfoMapper.getInfoByUseUnit(userUnit);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment