diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java index 361e89e..967ad55 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmGsdjxxController.java @@ -9,10 +9,7 @@ import com.kakarote.crm.entity.VO.CrmQueryGsdjxxVO; import com.kakarote.crm.service.ICrmGsdjxxService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -30,4 +27,11 @@ public class CrmGsdjxxController { List crmQueryGsdjxxVOList = iCrmGsdjxxService.queryByMonthAndXzqhDm(crmQueryGsdjxxDTO); return R.ok(crmQueryGsdjxxVOList); } + + @PostMapping("/queryByNsrmc/{nsrmc}") + @ApiOperation("根据月份和行政区划代码查询工商登记信息") + public Result> queryByNsrmc(@PathVariable String nsrmc) { + List crmQueryGsdjxxVOList = iCrmGsdjxxService.queryByNsrmc(nsrmc); + return R.ok(crmQueryGsdjxxVOList); + } } diff --git a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java index cf218c3..ccbb567 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java +++ b/crm/src/main/java/com/kakarote/crm/entity/PO/CrmGsdjxx.java @@ -47,7 +47,6 @@ public class CrmGsdjxx implements Serializable { /** * 企业名称 */ - @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String nsrmc; // 对应SQL: nsrmc /** diff --git a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml index 0994b09..b0b24b1 100644 --- a/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml +++ b/crm/src/main/java/com/kakarote/crm/mapper/xml/CrmGsdjxxMapper .xml @@ -41,7 +41,7 @@ ( #{item.xzqhDm}, #{item.yf}, #{item.tyshxydm, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter}, - #{item.nsrmc, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter}, + #{item.nsrmc}, #{item.djzclxDm, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter}, #{item.kyrq, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter}, #{item.zzhm, typeHandler=com.kakarote.core.security.converter.SensitiveDataConverter}, diff --git a/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java b/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java index e9cd706..55cdb28 100644 --- a/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java +++ b/crm/src/main/java/com/kakarote/crm/service/ICrmGsdjxxService.java @@ -14,4 +14,10 @@ public interface ICrmGsdjxxService extends BaseService { * 根据月份、行政区划代码,查询工商登记信息 */ List queryByMonthAndXzqhDm(CrmQueryGsdjxxDTO crmQueryGsdjxxDTO) throws Exception; + + /** + * 根据纳税人名称查询工商登记信息 + * @return + */ + List queryByNsrmc(String nsrmc); } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java index 215093b..9f8eddb 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmGsdjxxServiceImpl.java @@ -19,6 +19,7 @@ import com.kakarote.crm.webService.config.TaxWebServiceConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -62,6 +63,15 @@ public class CrmGsdjxxServiceImpl extends BaseServiceImpl queryByNsrmc(String nsrmc) { + + QueryWrapper wrapper = new QueryWrapper().eq("nsrmc", nsrmc); + List crmGsdjxxes = crmGsdjxxMapper.selectList(wrapper); + + return convertListToVO(crmGsdjxxes); + } + private CrmQueryGsdjxxVO convertToVO(CrmGsdjxx source) { if (source == null) { @@ -97,6 +107,7 @@ public class CrmGsdjxxServiceImpl extends BaseServiceImpl convertListToVO(List crmGsdjxxList) { + return crmGsdjxxList.stream() .map(this::convertToVO) .collect(Collectors.toList());