From 1143ea4c181cd31d53e221c408339afd04caee4e Mon Sep 17 00:00:00 2001 From: gaoxiong Date: Thu, 10 Jul 2025 00:29:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dite/znpt/domain/entity/CheckSchemeEntity.java | 6 +++--- .../com/dite/znpt/service/CheckSchemeService.java | 4 ++-- .../znpt/service/impl/CheckSchemeServiceImpl.java | 8 ++++---- .../znpt/web/controller/CheckSchemeController.java | 8 ++++---- .../dite/znpt/web/controller/CommonController.java | 12 +++++++++--- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/domain/entity/CheckSchemeEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/CheckSchemeEntity.java index 75517d7..d007394 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/CheckSchemeEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/CheckSchemeEntity.java @@ -43,9 +43,9 @@ public class CheckSchemeEntity extends AuditableEntity implements Serializable { @TableField("construction_scheme") private String constructionScheme; - @ApiModelProperty("检查方式，枚举CheckTypeEnum") - @TableField("check_type") - private String checkType; + @ApiModelProperty("检查方式，枚举CheckMethodEnum") + @TableField("check_method") + private String checkMethod; @ApiModelProperty("备注") @TableField("remark") diff --git a/core/src/main/java/com/dite/znpt/service/CheckSchemeService.java b/core/src/main/java/com/dite/znpt/service/CheckSchemeService.java index ae88c87..78e7e6f 100644 --- a/core/src/main/java/com/dite/znpt/service/CheckSchemeService.java +++ b/core/src/main/java/com/dite/znpt/service/CheckSchemeService.java @@ -13,8 +13,8 @@ import java.util.List; * @Description: */ public interface CheckSchemeService extends IService { - List page(String checkType); - List list(String checkType); + List page(String checkMethod); + List list(String checkMethod); CheckSchemeResp detail(String checkSchemeId); void save(CheckSchemeReq req); void update(String checkSchemeId, CheckSchemeReq req); diff --git a/core/src/main/java/com/dite/znpt/service/impl/CheckSchemeServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/CheckSchemeServiceImpl.java index 866a578..7c0535b 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/CheckSchemeServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/CheckSchemeServiceImpl.java @@ -28,14 +28,14 @@ import java.util.List; public class CheckSchemeServiceImpl extends ServiceImpl implements CheckSchemeService { @Override - public List page(String checkType) { + public List page(String checkMethod) { PageUtil.startPage(); - return this.list(checkType); + return this.list(checkMethod); } @Override - public List list(String checkType) { - List result = Converts.INSTANCE.toCheckSchemeResp(this.list(Wrappers.lambdaQuery(CheckSchemeEntity.class).eq(StrUtil.isNotBlank(checkType), CheckSchemeEntity::getCheckType, checkType))); + public List list(String checkMethod) { + List result = Converts.INSTANCE.toCheckSchemeResp(this.list(Wrappers.lambdaQuery(CheckSchemeEntity.class).eq(StrUtil.isNotBlank(checkMethod), CheckSchemeEntity::getCheckMethod, checkMethod))); result.forEach(resp -> { resp.setCheckMethodLabel(CheckMethodEnum.getDescByCode(resp.getCheckMethod())); }); diff --git a/web/src/main/java/com/dite/znpt/web/controller/CheckSchemeController.java b/web/src/main/java/com/dite/znpt/web/controller/CheckSchemeController.java index f32641c..c8e30dc 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/CheckSchemeController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/CheckSchemeController.java @@ -27,14 +27,14 @@ public class CheckSchemeController { @ApiOperation(value = "分页查询检查方案信息", httpMethod = "GET") @GetMapping("/page") - public PageResult page(@RequestParam(required = false) String checkType){ - return PageResult.ok(checkSchemeService.page(checkType)); + public PageResult page(@RequestParam(required = false) String checkMethod){ + return PageResult.ok(checkSchemeService.page(checkMethod)); } @ApiOperation(value = "查询检查方案信息列表", httpMethod = "GET") @GetMapping("/list") - public Result> list(@RequestParam(required = false) String checkType){ - return Result.ok(checkSchemeService.list(checkType)); + public Result> list(@RequestParam(required = false) String checkMethod){ + return Result.ok(checkSchemeService.list(checkMethod)); } @ApiOperation(value = "查询检查方案详情", httpMethod = "GET") diff --git a/web/src/main/java/com/dite/znpt/web/controller/CommonController.java b/web/src/main/java/com/dite/znpt/web/controller/CommonController.java index 4e96b3b..1edc6e8 100644 --- a/web/src/main/java/com/dite/znpt/web/controller/CommonController.java +++ b/web/src/main/java/com/dite/znpt/web/controller/CommonController.java @@ -134,7 +134,7 @@ public class CommonController { } @ApiOperation(value = "查询在职状态", httpMethod = "GET") - @GetMapping("/list/user_status") + @GetMapping("/list/user-status") public Result listUserStatus(){ return Result.ok(UserStatusEnum.listAll()); } @@ -146,16 +146,22 @@ public class CommonController { } @ApiOperation(value = "查询保险状态", httpMethod = "GET") - @GetMapping("/list/insurance_status") + @GetMapping("/list/insurance-status") public Result listInsuranceStatus(){ return Result.ok(InsuranceStatusEnum.listAll()); } @ApiOperation(value = "查询附件业务类型", httpMethod = "GET") - @GetMapping("/list/attach_business_type") + @GetMapping("/list/attach-business_type") public Result listAttachBusinessType(){ return Result.ok(AttachBusinessTypeEnum.listAll()); } + @ApiOperation(value = "查询检查方式", httpMethod = "GET") + @GetMapping("/list/check-method") + public Result listCheckMethod(){ + return Result.ok(CheckMethodEnum.listAll()); + } + }