fix(): 企业查询修复

dev.vehicleGateway
xinzirun 2024-09-26 11:51:21 +08:00
parent 0b297a028f
commit 5012e3c895
5 changed files with 21 additions and 9 deletions

View File

@ -50,7 +50,7 @@ public class SysEnt extends BaseEntity {
private String email; private String email;
/** /**
* *
*/ */
private Long databaseName; private String entCode;
} }

View File

@ -32,6 +32,7 @@ public class SysEntController extends BaseController {
/** /**
* *
* @return
*/ */
@GetMapping @GetMapping
@Operation(summary = "获取企业信息", description = "现有的基础企业信息") @Operation(summary = "获取企业信息", description = "现有的基础企业信息")
@ -41,6 +42,8 @@ public class SysEntController extends BaseController {
/** /**
* *
* @param entListReq
* @return
*/ */
@PostMapping(value = "/selectList") @PostMapping(value = "/selectList")
@Operation(summary = "查询企业信息列表", description = "分页展示企业信息") @Operation(summary = "查询企业信息列表", description = "分页展示企业信息")

View File

@ -1,5 +1,6 @@
package com.muyu.system.domain.req; package com.muyu.system.domain.req;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
@ -19,25 +20,30 @@ public class EntListReq {
/** /**
* *
*/ */
@Schema(title = "企业名称", type = "String", defaultValue = "长安汽车", description = "企业名称")
private String entName; private String entName;
/** /**
* *
*/ */
@Schema(title = "负责人", type = "String", defaultValue = "张三", description = "负责人")
private String leader; private String leader;
/** /**
* *
*/ */
@Schema(title = "手机号码", type = "String", defaultValue = "18321974313", description = "手机号码")
private String phoneNumber; private String phoneNumber;
/** /**
* *
*/ */
@Schema(title = "邮箱", type = "String", defaultValue = "12123@qq.com", description = "邮箱账号")
private String email; private String email;
/** /**
* *
*/ */
private String databaseName; @Schema(title = "企业编码", type = "String", defaultValue = "db", description = "连接的数据源")
private String entCode;
} }

View File

@ -49,12 +49,15 @@ public class EntResp {
private String email; private String email;
/** /**
* *
*/ */
private Long databaseName; @Schema(title = "企业编码", type = "String", defaultValue = "db", description = "连接的数据源")
private String entCode;
/** /**
* *
* @param sysEnt
* @return
*/ */
public static EntResp entBuild(SysEnt sysEnt) { public static EntResp entBuild(SysEnt sysEnt) {
return EntResp.builder() return EntResp.builder()
@ -63,7 +66,7 @@ public class EntResp {
.leader(sysEnt.getLeader()) .leader(sysEnt.getLeader())
.phoneNumber(sysEnt.getPhoneNumber()) .phoneNumber(sysEnt.getPhoneNumber())
.email(sysEnt.getEmail()) .email(sysEnt.getEmail())
.databaseName(sysEnt.getDatabaseName()) .entCode(sysEnt.getEntCode())
.build(); .build();
} }
} }

View File

@ -52,8 +52,8 @@ public class SysEntServiceImpl extends ServiceImpl<SysEntMapper, SysEnt> impleme
SysEnt::getEmail, entListReq.getEmail() SysEnt::getEmail, entListReq.getEmail()
); );
queryWrapper.eq( queryWrapper.eq(
StringUtils.isNotEmpty(entListReq.getDatabaseName()), StringUtils.isNotEmpty(entListReq.getEntCode()),
SysEnt::getDatabaseName, entListReq.getDatabaseName() SysEnt::getEntCode, entListReq.getEntCode()
); );
List<SysEnt> sysEntList = this.list(queryWrapper); List<SysEnt> sysEntList = this.list(queryWrapper);