修改名称
This commit is contained in:
@@ -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<Map<String, Object>> add(
|
||||
@Parameter(description = "实体", required = true) @RequestBody LbAssessmentApplication entity) {
|
||||
Map<String, Object> result = lbAssessmentApplicationService.add(entity);
|
||||
@Parameter(description = "实体", required = true) @RequestBody LbAssessmentApply entity) {
|
||||
Map<String, Object> 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<Map<String, Object>> update(
|
||||
@Parameter(description = "实体", required = true) @RequestBody LbAssessmentApplication entity) {
|
||||
Map<String, Object> result = lbAssessmentApplicationService.update(entity);
|
||||
@Parameter(description = "实体", required = true) @RequestBody LbAssessmentApply entity) {
|
||||
Map<String, Object> 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<Map<String, Object>> delete(
|
||||
@Parameter(description = "主键ID(UUID)", required = true) @PathVariable String id) {
|
||||
Map<String, Object> result = lbAssessmentApplicationService.deleteById(id);
|
||||
Map<String, Object> 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<String, Object> result = lbAssessmentApplicationService.pageQuery(
|
||||
Map<String, Object> result = lbAssessmentApplyService.pageQuery(
|
||||
current, size, tenantId, applicantName, applicantPhone, colleagueName, teamLeaderName
|
||||
);
|
||||
Boolean success = (Boolean) result.get("success");
|
||||
@@ -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;
|
||||
|
||||
@@ -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<LbAssessmentApplication> {
|
||||
}
|
||||
9
src/main/java/com/rj/mapper/LbAssessmentApplyMapper.java
Normal file
9
src/main/java/com/rj/mapper/LbAssessmentApplyMapper.java
Normal file
@@ -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<LbAssessmentApply> {
|
||||
}
|
||||
@@ -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<LbAssessmentApplication> {
|
||||
public interface ILbAssessmentApplyService extends IService<LbAssessmentApply> {
|
||||
|
||||
Map<String, Object> add(LbAssessmentApplication entity);
|
||||
Map<String, Object> add(LbAssessmentApply entity);
|
||||
|
||||
Map<String, Object> update(LbAssessmentApplication entity);
|
||||
Map<String, Object> update(LbAssessmentApply entity);
|
||||
|
||||
Map<String, Object> deleteById(String id);
|
||||
|
||||
@@ -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<LbAssessmentApplicationMapper, LbAssessmentApplication>
|
||||
implements ILbAssessmentApplicationService {
|
||||
public class LbAssessmentApplyServiceImpl
|
||||
extends ServiceImpl<LbAssessmentApplyMapper, LbAssessmentApply>
|
||||
implements ILbAssessmentApplyService {
|
||||
|
||||
@Override
|
||||
public Map<String, Object> add(LbAssessmentApplication entity) {
|
||||
public Map<String, Object> add(LbAssessmentApply entity) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
try {
|
||||
if (entity.getTenantId() == null) {
|
||||
@@ -62,7 +62,7 @@ public class LbAssessmentApplicationServiceImpl
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> update(LbAssessmentApplication entity) {
|
||||
public Map<String, Object> update(LbAssessmentApply entity) {
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
try {
|
||||
if (entity.getId() == null || entity.getId().trim().isEmpty()) {
|
||||
@@ -117,26 +117,26 @@ public class LbAssessmentApplicationServiceImpl
|
||||
size = 10;
|
||||
}
|
||||
|
||||
LambdaQueryWrapper<LbAssessmentApplication> queryWrapper = new LambdaQueryWrapper<>();
|
||||
LambdaQueryWrapper<LbAssessmentApply> 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<LbAssessmentApplication> page = this.page(new Page<>(current, size), queryWrapper);
|
||||
Page<LbAssessmentApply> page = this.page(new Page<>(current, size), queryWrapper);
|
||||
result.put("success", true);
|
||||
result.put("message", "查询成功");
|
||||
result.put("data", page.getRecords());
|
||||
Reference in New Issue
Block a user