diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java index c6450a7..cff3af0 100644 --- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java +++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java @@ -47,6 +47,7 @@ RecordController { List recordDtos = new ArrayList<>(); for (Record record : records) { RecordDto recordDto = modelMapper.map(record, RecordDto.class); + recordDto.setId(record.getId()); recordDto.setCategoryName(categoryService.getCategoryName(record.getCategoryId())); recordDto.setSubCategoryName(categoryService.getsubCategoryName(record.getCategoryId())); recordDtos.add(recordDto); @@ -67,6 +68,7 @@ RecordController { List records = recordService.getMyAllRecords(page, size, userId); for (Record record : records) { RecordDto recordDto = modelMapper.map(record, RecordDto.class); + recordDto.setId(record.getId()); recordDto.setCategoryName(categoryService.getCategoryName(record.getCategoryId())); recordDto.setSubCategoryName(categoryService.getsubCategoryName(record.getCategoryId())); recordDtos.add(recordDto); diff --git a/src/main/java/top/suyiiyii/sims/controller/RevokedController.java b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java new file mode 100644 index 0000000..f13741f --- /dev/null +++ b/src/main/java/top/suyiiyii/sims/controller/RevokedController.java @@ -0,0 +1,30 @@ +package top.suyiiyii.sims.controller; + +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import top.suyiiyii.sims.service.RevokedService; + +/** + * @Author tortoise + * @Date 2024/9/6 10:03 + * @PackageName:top.suyiiyii.sims.controller + * @ClassName: RevokedController + * @Description: TODO + * @Version 1.0 + */ +@RestController +@RequestMapping("/revoked") +@Slf4j +public class RevokedController { + @Autowired + RevokedService revokedService; + //TODO 普通成员向管理员申请撤销 + + //TODO 管理员查看所有撤销申请 + + //TODO 管理员可以撤销某一成员的奖励或惩罚记录,需填写撤销原因,撤销备注 +} diff --git a/src/main/java/top/suyiiyii/sims/mapper/MpRevRecordMapper.java b/src/main/java/top/suyiiyii/sims/mapper/MpRevRecordMapper.java new file mode 100644 index 0000000..9ca809f --- /dev/null +++ b/src/main/java/top/suyiiyii/sims/mapper/MpRevRecordMapper.java @@ -0,0 +1,15 @@ +package top.suyiiyii.sims.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import top.suyiiyii.sims.entity.RevokedRecord; + +/** + * @Author tortoise + * @Date 2024/9/6 10:04 + * @PackageName:top.suyiiyii.sims.mapper + * @ClassName: MpRevRecordMapper + * @Description: TODO + * @Version 1.0 + */ +public interface MpRevRecordMapper extends BaseMapper { +} diff --git a/src/main/java/top/suyiiyii/sims/service/RevokedService.java b/src/main/java/top/suyiiyii/sims/service/RevokedService.java new file mode 100644 index 0000000..7ff5a4c --- /dev/null +++ b/src/main/java/top/suyiiyii/sims/service/RevokedService.java @@ -0,0 +1,20 @@ +package top.suyiiyii.sims.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import top.suyiiyii.sims.mapper.MpRevRecordMapper; +import top.suyiiyii.sims.mapper.RoleMapper; + +/** + * @Author tortoise + * @Date 2024/9/6 10:06 + * @PackageName:top.suyiiyii.sims.service + * @ClassName: RevokedService + * @Description: TODO + * @Version 1.0 + */ +@Service +public class RevokedService { + @Autowired + MpRevRecordMapper mpRevRecordMapper; +}