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/dto/JyjcOpeningApplicationDto.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-
 import java.util.Date;
 import java.util.List;
 
@@ -63,22 +62,22 @@ public class JyjcOpeningApplicationDto  extends BaseDto {
 
     /* ----------------  -------------- */
 
- @ApiModelProperty(value = "使用单位联系人")
- private String useContact;
+   @ApiModelProperty(value = "使用单位联系人")
+   private String useContact;
 
- @ApiModelProperty(value = "联系人联系电话")
- private String contactPhone;
+   @ApiModelProperty(value = "联系人联系电话")
+   private String contactPhone;
 
 
- @ApiModelProperty(value = "行业主管部门")
- private String industrySupervisor;
+   @ApiModelProperty(value = "行业主管部门")
+   private String industrySupervisor;
 
- @ApiModelProperty(value = "单位地理坐标经度")
- private String longitude;
+   @ApiModelProperty(value = "单位地理坐标经度")
+   private String longitude;
 
- @ApiModelProperty(value = "单位地理坐标纬度")
- private String latitude;
+   @ApiModelProperty(value = "单位地理坐标纬度")
+   private String latitude;
 
- @ApiModelProperty("")
- private String unitBusinessLicense ;
+   @ApiModelProperty("企业营业执照")
+   private String unitBusinessLicense ;
 }

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  *  Mapper 接口
@@ -18,7 +19,7 @@ public interface JyjcBaseMapper {
 
     TzBaseEnterpriseInfoDto selectEnterpriseInfo(String unitCode);
 
-    List<TzBaseUnitLicenceDto> selectBaseUnitLicenceList(TzBaseUnitLicenceDto dto);
+    List<TzBaseUnitLicenceDto> selectBaseUnitLicenceList(Map<String, Object> params);
 
     @Select ("SELECT " +
             " * " +

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

@@ -6,9 +6,9 @@
         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 id="selectBaseUnitLicenceList" parameterType="map" resultType="com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseUnitLicenceDto">
         select * from tz_base_unit_licence
-        where unit_code = #{unitCode} and  licence_type = #{jyjc}
+        where unit_code = #{unitCode} and  licence_type = #{licenceType}
     </select>
 
 

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

@@ -78,9 +78,9 @@ public class JyjcOpeningApplicationController extends BaseController {
      * @return
      */
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
+	@GetMapping(value = "/detail")
 	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
-	public ResponseModel<JyjcOpeningApplicationDto> selectOne(@PathVariable Long sequenceNbr) {
+	public ResponseModel<JyjcOpeningApplicationDto> selectOne(@RequestParam(value = "sequenceNbr", required = false) Long sequenceNbr) {
 	    return ResponseHelper.buildResponse(jyjcOpeningApplicationServiceImpl.queryDetail(sequenceNbr));
 	}
 
@@ -100,7 +100,6 @@ public class JyjcOpeningApplicationController extends BaseController {
 	    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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
+import cn.hutool.core.map.MapBuilder;
 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 com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.springframework.stereotype.Service;
@@ -80,18 +83,21 @@ public class JyjcOpeningApplicationServiceImpl extends BaseService<JyjcOpeningAp
         } else {
             jyjcOpeningApplicationDto = new JyjcOpeningApplicationDto();
         }
-        String unitCode = reginParams.getCompany().getOrgCode();
+        String unitCode = reginParams.getCompany().getCompanyCode();
         TzBaseEnterpriseInfoDto baseEnterpriseInfoDto = baseMapper.selectEnterpriseInfo(unitCode);
         // 获取企业资质
-        List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList();
+        List<TzBaseUnitLicenceDto> baseUnitLicences = baseMapper.selectBaseUnitLicenceList(MapBuilder.<String, Object>create()
+                                                                                                     .put("unitCode", unitCode)
+                                                                                                     .put("licenceType", LicenceTypeEnum.JYJC.getCode()).build());
         // 获取检验人员信息
-        // 判断是否有资质
         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());
+        if (baseEnterpriseInfoDto != null) {
+            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;