Merge branch 'develop_unit_register' of…

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/TzBaseEnterpriseInfoDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 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 io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -254,5 +256,8 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 	private String fullAddress;
 
 	private String superviseKey;
+
+	private List<BaseUnitLicenceDto> unitLicences;
 	
+	private RegUnitIcDto regUnitIcDto;
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -90,8 +90,8 @@ public class TzBaseEnterpriseInfoController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@RequestMapping(value = "/{id}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
-	public ResponseModel<TzBaseEnterpriseInfo> selectById(HttpServletRequest request, @PathVariable Long id) {
-		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getById(id));
+	public ResponseModel<TzBaseEnterpriseInfoDto> selectById(HttpServletRequest request, @PathVariable Long id) {
+		return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.detail(id));
 	}
 
 	/**

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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;
-import com.yeejoin.amos.boot.module.tzs.api.dto.TzsJgBasicInfoDto;
+import com.yeejoin.amos.boot.module.tzs.api.entity.BaseUnitLicence;
 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.mapper.TzBaseEnterpriseInfoMapper;
+import com.yeejoin.amos.boot.module.tzs.api.service.IBaseUnitLicenceService;
 import com.yeejoin.amos.boot.module.tzs.api.service.ITzBaseEnterpriseInfoService;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.L;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
-import java.util.List;
+import com.yeejoin.amos.boot.module.tzs.flc.api.dto.RegUnitIcDto;
+import com.yeejoin.amos.boot.module.tzs.flc.api.entity.RegUnitIc;
+import com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl.RegUnitIcServiceImpl;
 
 /**
  * 企业数据信息 服务实现类
@@ -24,15 +31,26 @@ import java.util.List;
  * @date 2022-08-10
  */
 @Service
-public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper> implements ITzBaseEnterpriseInfoService {
+public class TzBaseEnterpriseInfoServiceImpl
+		extends BaseService<TzBaseEnterpriseInfoDto, TzBaseEnterpriseInfo, TzBaseEnterpriseInfoMapper>
+		implements ITzBaseEnterpriseInfoService {
 
-    @Autowired
-    private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
+	@Autowired
+	private TzBaseEnterpriseInfoMapper tzBaseEnterpriseInfoMapper;
 
-    @Override
-    public List<EquEnterDto> getInfo(String sequenceNbr) {
-        return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
-    }
+	@Autowired
+	BaseUnitLicenceServiceImpl baseUnitLicenceService;
+
+	@Autowired
+	RegUnitIcServiceImpl regUnitIcService;
+
+	@Autowired
+	private IBaseUnitLicenceService iBaseUnitLicenceService;
+
+	@Override
+	public List<EquEnterDto> getInfo(String sequenceNbr) {
+		return tzBaseEnterpriseInfoMapper.getInfo(sequenceNbr);
+	}
 
 	@Override
 	public IPage<TzBaseEnterpriseInfoDto> page(PageParam pageParam, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto) {
@@ -42,7 +60,25 @@ public class TzBaseEnterpriseInfoServiceImpl extends BaseService<TzBaseEnterpris
 
 	@Override
 	public TzBaseEnterpriseInfoDto detail(Long id) {
-		// TODO Auto-generated method stub
-		return null;
+		TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();
+		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = this.getById(id);
+		BeanUtils.copyProperties(tzBaseEnterpriseInfo, tzBaseEnterpriseInfoDto);
+		// 许可信息
+		List<BaseUnitLicence> unitLicences = baseUnitLicenceService.list(new LambdaQueryWrapper<BaseUnitLicence>()
+				.eq(BaseUnitLicence::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+		List<BaseUnitLicenceDto> unitLicenceDtos = new ArrayList<BaseUnitLicenceDto>();
+		for (BaseUnitLicence baseUnitLicence : unitLicences) {
+			BaseUnitLicenceDto baseUnitLicenceDto = new BaseUnitLicenceDto();
+			BeanUtils.copyProperties(baseUnitLicence, baseUnitLicenceDto);
+			unitLicenceDtos.add(baseUnitLicenceDto);
+		}
+		tzBaseEnterpriseInfoDto.setUnitLicences(unitLicenceDtos);
+		// 工商信息
+		RegUnitIc regUnitIc = regUnitIcService.getOne(
+				new LambdaQueryWrapper<RegUnitIc>().eq(RegUnitIc::getUnitCode, tzBaseEnterpriseInfo.getUseCode()));
+		RegUnitIcDto regUnitIcDto = new RegUnitIcDto();
+		BeanUtils.copyProperties(regUnitIc, regUnitIcDto);
+		tzBaseEnterpriseInfoDto.setRegUnitIcDto(regUnitIcDto);
+		return tzBaseEnterpriseInfoDto;
 	}
 }

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/biz/service/impl/RegUnitInfoServiceImpl.java

 package com.yeejoin.amos.boot.module.tzs.flc.biz.service.impl;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -27,17 +47,6 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.client.RestTemplate;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
-
-import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 单位注册信息表服务实现类