feat(jyjc)：企业基本信息查询初版提交

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcBaseMapper.java

+package com.yeejoin.amos.boot.module.jyjc.api.mapper;
+
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-13
+ */
+public interface JyjcBaseMapper {
+
+    TzBaseEnterpriseInfoDto selectEnterpriseInfo(String unitCode);
+
+    List<TzBaseUnitLicenceDto> selectBaseUnitLicenceList(TzBaseUnitLicenceDto dto);
+
+    @Select ("SELECT " +
+            " * " +
+            " FROM " +
+            " tzs_user_info " +
+            " WHERE " +
+            " unit_code = '${unitCode}'")
+    List<TzsUserInfoDto> selectUserInfoByUnitCodeList(@Param ("unitCode") String unitCode);
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcBaseMapper.xml

+<?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.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper">
+
+    <select id="selectEnterpriseInfo" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto">
+        select * from tz_base_enterprise_info where use_unit_code = #{unitCode}
+    </select>
+
+    <select id="selectBaseUnitLicenceList" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto">
+        select * from tz_base_unit_licence
+        where unit_code = #{unitCode} and  licence_type = #{jyjc}
+    </select>
+
+
+
+</mapper>

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

@@ -81,7 +81,7 @@ public class JyjcOpeningApplicationController extends BaseController {
 	@GetMapping(value = "/{sequenceNbr}")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
 	public ResponseModel<JyjcOpeningApplicationDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryBySeq(sequenceNbr));
+	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr));
 	}
 
 	/**
@@ -99,6 +99,8 @@ public class JyjcOpeningApplicationController extends BaseController {
 	    Page<JyjcOpeningApplication> page = new Page<JyjcOpeningApplication>();
 	    page.setCurrent(current);
 	    page.setSize(size);
+		// BaseEnterpriseInfoDto baseEnterpriseInfoDto
+	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page));
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryForJyjcOpeningApplicationPage(page,jyjcOpeningApplicationDto));
 	}
 

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

@@ -3,13 +3,21 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
+import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcOpeningApplicationMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcOpeningApplicationService;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.JyjcOpeningApplicationDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
 import org.springframework.beans.factory.annotation.Autowired;
+
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -26,6 +34,9 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
     @Autowired
     JyjcOpeningApplicationMapper jyjcOpeningApplicationMapper;
 
+    @Resource(type = JyjcBaseMapper.class)
+    private JyjcBaseMapper baseMapper;
+
     /**
      * 分页查询
      */
@@ -49,4 +60,41 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         return jyjcOpeningApplicationMapper.selectJyjcOpeningApplicationList(page,jyjcOpeningApplicationDto);
     }
 
+
+    /**
+     * 获取详情跳转
+     *
+     *
+     * @param
+     * @return {@link }
+     * @author yangyang
+     * @throws
+     */
+    public JyjcOpeningApplicationDto queryDetail(Long sequenceNbr) {
+        ReginParams reginParams = commonserviceImpl.getReginParamsOfCurrentUser();
+        if (ValidationUtil.isEmpty(reginParams.getCompany())) {
+            throw new RuntimeException("未指定人员归属单位信息");
+        }
+        JyjcOpeningApplicationDto jyjcOpeningApplicationDto;
+        if (null != sequenceNbr) {
+            jyjcOpeningApplicationDto =  this.queryBySeq(sequenceNbr);
+        } else {
+            jyjcOpeningApplicationDto = new JyjcOpeningApplicationDto();
+        }
+        String unitCode = reginParams.getCompany().getOrgCode();
+        TzBaseEnterpriseInfoDto baseEnterpriseInfoDto = baseMapper.selectEnterpriseInfo(unitCode);
+        // 获取企业资质
+        List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList();
+        // 获取检验人员信息
+        // 判断是否有资质
+        List<TzsUserInfoDto> userInfos = baseMapper.selectUserInfoByUnitCodeList(unitCode);
+        jyjcOpeningApplicationDto.setUseContact(baseEnterpriseInfoDto.getUseContact());
+        jyjcOpeningApplicationDto.setContactPhone(baseEnterpriseInfoDto.getContactPhone());
+        jyjcOpeningApplicationDto.setIndustrySupervisor(baseEnterpriseInfoDto.getIndustrySupervisor());
+        jyjcOpeningApplicationDto.setLongitude(baseEnterpriseInfoDto.getLongitude());
+        jyjcOpeningApplicationDto.setLatitude(baseEnterpriseInfoDto.getLatitude());
+        jyjcOpeningApplicationDto.setBaseUnitLicences(baseUnitLicences);
+        jyjcOpeningApplicationDto.setUserInfos(userInfos);
+        return jyjcOpeningApplicationDto;
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-common/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/JyjcOpeningApplicationDto.java

 package com.yeejoin.amos.boot.module.jyjc.api.dto;
 
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto;
+import com.yeejoin.amos.boot.module.tcm.api.dto.TzsUserInfoDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -52,4 +55,30 @@ public class JyjcOpeningApplicationDto  extends BaseDto {
     @ApiModelProperty(value = "申请时间")
      private String applyTime;
 
+    @ApiModelProperty(value = "企业资质信息")
+    List<TzBaseUnitLicenceDto> baseUnitLicences;
+
+    @ApiModelProperty(value = "检验人员信息")
+    List<TzsUserInfoDto> userInfos;
+
+    /* ----------------  -------------- */
+
+ @ApiModelProperty(value = "使用单位联系人")
+ private String useContact;
+
+ @ApiModelProperty(value = "联系人联系电话")
+ private String contactPhone;
+
+
+ @ApiModelProperty(value = "行业主管部门")
+ private String industrySupervisor;
+
+ @ApiModelProperty(value = "单位地理坐标经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "单位地理坐标纬度")
+ private String latitude;
+
+ @ApiModelProperty("")
+ private String unitBusinessLicense ;
 }