From 68d0c7ea378ef1c4e1539c6bf5340b90a92a8d70 Mon Sep 17 00:00:00 2001 From: cst61 Date: Wed, 29 Apr 2026 19:20:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....java => LbAssessmentApplyController.java} | 24 ++++++------- ...pplication.java => LbAssessmentApply.java} | 4 +-- .../mapper/LbAssessmentApplicationMapper.java | 9 ----- .../rj/mapper/LbAssessmentApplyMapper.java | 9 +++++ ...ce.java => ILbAssessmentApplyService.java} | 8 ++--- ...java => LbAssessmentApplyServiceImpl.java} | 34 +++++++++---------- 6 files changed, 44 insertions(+), 44 deletions(-) rename src/main/java/com/rj/controller/{LbAssessmentApplicationController.java => LbAssessmentApplyController.java} (76%) rename src/main/java/com/rj/entity/{LbAssessmentApplication.java => LbAssessmentApply.java} (94%) delete mode 100644 src/main/java/com/rj/mapper/LbAssessmentApplicationMapper.java create mode 100644 src/main/java/com/rj/mapper/LbAssessmentApplyMapper.java rename src/main/java/com/rj/service/{ILbAssessmentApplicationService.java => ILbAssessmentApplyService.java} (67%) rename src/main/java/com/rj/service/impl/{LbAssessmentApplicationServiceImpl.java => LbAssessmentApplyServiceImpl.java} (79%) diff --git a/src/main/java/com/rj/controller/LbAssessmentApplicationController.java b/src/main/java/com/rj/controller/LbAssessmentApplyController.java similarity index 76% rename from src/main/java/com/rj/controller/LbAssessmentApplicationController.java rename to src/main/java/com/rj/controller/LbAssessmentApplyController.java index 3efb50c..3b6cabd 100644 --- a/src/main/java/com/rj/controller/LbAssessmentApplicationController.java +++ b/src/main/java/com/rj/controller/LbAssessmentApplyController.java @@ -1,7 +1,7 @@ package com.rj.controller; -import com.rj.entity.LbAssessmentApplication; -import com.rj.service.ILbAssessmentApplicationService; +import com.rj.entity.LbAssessmentApply; +import com.rj.service.ILbAssessmentApplyService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -12,18 +12,18 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; @RestController -@RequestMapping("/api/lbAssessmentApplication") -@Tag(name = "申请评估", description = "lb_assessment_application增删改查与分页") -public class LbAssessmentApplicationController { +@RequestMapping("/api/lbAssessmentApply") +@Tag(name = "申请评估", description = "lb_assessment_apply增删改查与分页") +public class LbAssessmentApplyController { @Autowired - private ILbAssessmentApplicationService lbAssessmentApplicationService; + private ILbAssessmentApplyService lbAssessmentApplyService; @PostMapping("/add") @Operation(summary = "新增") public ResponseEntity> add( - @Parameter(description = "实体", required = true) @RequestBody LbAssessmentApplication entity) { - Map result = lbAssessmentApplicationService.add(entity); + @Parameter(description = "实体", required = true) @RequestBody LbAssessmentApply entity) { + Map result = lbAssessmentApplyService.add(entity); Boolean success = (Boolean) result.get("success"); if (success != null && success) { return ResponseEntity.ok(result); @@ -34,8 +34,8 @@ public class LbAssessmentApplicationController { @PutMapping("/update") @Operation(summary = "编辑") public ResponseEntity> update( - @Parameter(description = "实体", required = true) @RequestBody LbAssessmentApplication entity) { - Map result = lbAssessmentApplicationService.update(entity); + @Parameter(description = "实体", required = true) @RequestBody LbAssessmentApply entity) { + Map result = lbAssessmentApplyService.update(entity); Boolean success = (Boolean) result.get("success"); if (success != null && success) { return ResponseEntity.ok(result); @@ -47,7 +47,7 @@ public class LbAssessmentApplicationController { @Operation(summary = "删除") public ResponseEntity> delete( @Parameter(description = "主键ID(UUID)", required = true) @PathVariable String id) { - Map result = lbAssessmentApplicationService.deleteById(id); + Map result = lbAssessmentApplyService.deleteById(id); Boolean success = (Boolean) result.get("success"); if (success != null && success) { return ResponseEntity.ok(result); @@ -65,7 +65,7 @@ public class LbAssessmentApplicationController { @RequestParam(required = false) String applicantPhone, @RequestParam(required = false) String colleagueName, @RequestParam(required = false) String teamLeaderName) { - Map result = lbAssessmentApplicationService.pageQuery( + Map result = lbAssessmentApplyService.pageQuery( current, size, tenantId, applicantName, applicantPhone, colleagueName, teamLeaderName ); Boolean success = (Boolean) result.get("success"); diff --git a/src/main/java/com/rj/entity/LbAssessmentApplication.java b/src/main/java/com/rj/entity/LbAssessmentApply.java similarity index 94% rename from src/main/java/com/rj/entity/LbAssessmentApplication.java rename to src/main/java/com/rj/entity/LbAssessmentApply.java index 5ff81b7..f369427 100644 --- a/src/main/java/com/rj/entity/LbAssessmentApplication.java +++ b/src/main/java/com/rj/entity/LbAssessmentApply.java @@ -12,9 +12,9 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = false) -@TableName("lb_assessment_application") +@TableName("lb_assessment_apply") @Schema(description = "申请评估表") -public class LbAssessmentApplication implements Serializable { +public class LbAssessmentApply implements Serializable { private static final long serialVersionUID = 1L; diff --git a/src/main/java/com/rj/mapper/LbAssessmentApplicationMapper.java b/src/main/java/com/rj/mapper/LbAssessmentApplicationMapper.java deleted file mode 100644 index b45a6de..0000000 --- a/src/main/java/com/rj/mapper/LbAssessmentApplicationMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.rj.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.rj.entity.LbAssessmentApplication; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface LbAssessmentApplicationMapper extends BaseMapper { -} diff --git a/src/main/java/com/rj/mapper/LbAssessmentApplyMapper.java b/src/main/java/com/rj/mapper/LbAssessmentApplyMapper.java new file mode 100644 index 0000000..aeb0d0c --- /dev/null +++ b/src/main/java/com/rj/mapper/LbAssessmentApplyMapper.java @@ -0,0 +1,9 @@ +package com.rj.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.rj.entity.LbAssessmentApply; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface LbAssessmentApplyMapper extends BaseMapper { +} diff --git a/src/main/java/com/rj/service/ILbAssessmentApplicationService.java b/src/main/java/com/rj/service/ILbAssessmentApplyService.java similarity index 67% rename from src/main/java/com/rj/service/ILbAssessmentApplicationService.java rename to src/main/java/com/rj/service/ILbAssessmentApplyService.java index a2874f9..3ca6e51 100644 --- a/src/main/java/com/rj/service/ILbAssessmentApplicationService.java +++ b/src/main/java/com/rj/service/ILbAssessmentApplyService.java @@ -1,15 +1,15 @@ package com.rj.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.rj.entity.LbAssessmentApplication; +import com.rj.entity.LbAssessmentApply; import java.util.Map; -public interface ILbAssessmentApplicationService extends IService { +public interface ILbAssessmentApplyService extends IService { - Map add(LbAssessmentApplication entity); + Map add(LbAssessmentApply entity); - Map update(LbAssessmentApplication entity); + Map update(LbAssessmentApply entity); Map deleteById(String id); diff --git a/src/main/java/com/rj/service/impl/LbAssessmentApplicationServiceImpl.java b/src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java similarity index 79% rename from src/main/java/com/rj/service/impl/LbAssessmentApplicationServiceImpl.java rename to src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java index 47ba31a..1790636 100644 --- a/src/main/java/com/rj/service/impl/LbAssessmentApplicationServiceImpl.java +++ b/src/main/java/com/rj/service/impl/LbAssessmentApplyServiceImpl.java @@ -3,9 +3,9 @@ package com.rj.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.rj.entity.LbAssessmentApplication; -import com.rj.mapper.LbAssessmentApplicationMapper; -import com.rj.service.ILbAssessmentApplicationService; +import com.rj.entity.LbAssessmentApply; +import com.rj.mapper.LbAssessmentApplyMapper; +import com.rj.service.ILbAssessmentApplyService; import org.springframework.stereotype.Service; import java.time.LocalDateTime; @@ -14,12 +14,12 @@ import java.util.Map; import java.util.UUID; @Service -public class LbAssessmentApplicationServiceImpl - extends ServiceImpl - implements ILbAssessmentApplicationService { +public class LbAssessmentApplyServiceImpl + extends ServiceImpl + implements ILbAssessmentApplyService { @Override - public Map add(LbAssessmentApplication entity) { + public Map add(LbAssessmentApply entity) { Map result = new HashMap<>(); try { if (entity.getTenantId() == null) { @@ -62,7 +62,7 @@ public class LbAssessmentApplicationServiceImpl } @Override - public Map update(LbAssessmentApplication entity) { + public Map update(LbAssessmentApply entity) { Map result = new HashMap<>(); try { if (entity.getId() == null || entity.getId().trim().isEmpty()) { @@ -117,26 +117,26 @@ public class LbAssessmentApplicationServiceImpl size = 10; } - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (tenantId != null) { - queryWrapper.eq(LbAssessmentApplication::getTenantId, tenantId); + queryWrapper.eq(LbAssessmentApply::getTenantId, tenantId); } if (applicantName != null && !applicantName.trim().isEmpty()) { - queryWrapper.like(LbAssessmentApplication::getApplicantName, applicantName.trim()); + queryWrapper.like(LbAssessmentApply::getApplicantName, applicantName.trim()); } if (applicantPhone != null && !applicantPhone.trim().isEmpty()) { - queryWrapper.like(LbAssessmentApplication::getApplicantPhone, applicantPhone.trim()); + queryWrapper.like(LbAssessmentApply::getApplicantPhone, applicantPhone.trim()); } if (colleagueName != null && !colleagueName.trim().isEmpty()) { - queryWrapper.like(LbAssessmentApplication::getColleagueName, colleagueName.trim()); + queryWrapper.like(LbAssessmentApply::getColleagueName, colleagueName.trim()); } if (teamLeaderName != null && !teamLeaderName.trim().isEmpty()) { - queryWrapper.like(LbAssessmentApplication::getTeamLeaderName, teamLeaderName.trim()); + queryWrapper.like(LbAssessmentApply::getTeamLeaderName, teamLeaderName.trim()); } - queryWrapper.orderByDesc(LbAssessmentApplication::getUpdatedAt) - .orderByDesc(LbAssessmentApplication::getCreatedAt); + queryWrapper.orderByDesc(LbAssessmentApply::getUpdatedAt) + .orderByDesc(LbAssessmentApply::getCreatedAt); - Page page = this.page(new Page<>(current, size), queryWrapper); + Page page = this.page(new Page<>(current, size), queryWrapper); result.put("success", true); result.put("message", "查询成功"); result.put("data", page.getRecords());