diff --git a/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java b/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java index 1f66774..bcc2c83 100644 --- a/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java +++ b/crm/src/main/java/com/kakarote/crm/controller/CrmXzqhDmController.java @@ -11,6 +11,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + @RestController @RequestMapping("/crmXzqhDm") @Api(tags = "行政区划代码") @@ -26,6 +28,11 @@ public class CrmXzqhDmController { IPage xzqhDmPage = crmXzqhDmService.getXzqhDmPage(pageNum, pageSize); return R.ok(xzqhDmPage); } + @GetMapping("/list") + @ApiOperation("行政区划列表") + public Result> getXzqhDmList() { + return R.ok(crmXzqhDmService.getXzqhDmList()); + } @PostMapping("/insert") @ApiOperation("插入税务机关代码") diff --git a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java index 1fabf2f..dac02c0 100644 --- a/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java +++ b/crm/src/main/java/com/kakarote/crm/entity/DTO/CrmQueryGsdjxxDTO.java @@ -19,6 +19,9 @@ public class CrmQueryGsdjxxDTO implements Serializable { // 评价年度 private String xzqhDm; + //地址 + private String xzqhMc; + @Override public String toString() { return "{" + 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 ccbb567..2cd2991 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 @@ -168,4 +168,7 @@ public class CrmGsdjxx implements Serializable { */ @TableField(typeHandler = SensitiveDataConverter.class, jdbcType = JdbcType.VARCHAR) private String jyfw; // 对应SQL: jyfw + + @TableField(exist = false) + private String dz; } diff --git a/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java b/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java index 5a783c3..9978c78 100644 --- a/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java +++ b/crm/src/main/java/com/kakarote/crm/service/impl/CrmCustomerServiceImpl.java @@ -637,7 +637,7 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl list = new ArrayList<>(); //加入时间 @@ -647,7 +647,7 @@ public class CrmCustomerServiceImpl extends BaseServiceImpl