Compare commits

..

No commits in common. "fe0bc8d8d7dc34cbb545665cb8c30949f12367e1" and "a79b1fe65083ec333e2aabed65e215af0875f137" have entirely different histories.

4 changed files with 37 additions and 51 deletions

View File

@ -15,7 +15,7 @@ interface AgeRange {
label: string;
}
interface Record {
[key: number]: number[];
[key: string]: number[];
}
@Injectable()

View File

@ -10,7 +10,7 @@ interface AgeRange {
label: string;
}
interface Record {
[key: number]: number[];
[key: string]: number[];
}
interface ScoreStandard {
ageRanges: AgeRange[];
@ -20,7 +20,7 @@ interface ScoreStandard {
@Injectable()
export class SportStandardService extends BaseService<Prisma.SportStandardDelegate> {
constructor() {
super(db, ObjectType.SPORT_STANDARD, false);
super(db, ObjectType.SPORT_STANDARD, true);
}
async create(args: Prisma.SportStandardCreateArgs) {
console.log(args)
@ -64,10 +64,9 @@ export class SportStandardService extends BaseService<Prisma.SportStandardDelega
select?: Prisma.SportStandardSelect<DefaultArgs>,
include?: Prisma.SportStandardInclude<DefaultArgs>
) {
console.log(data)
this.validateAgeRanges(data.ageRanges);
this.validateScoreTable(data.scoreTable, data.ageRanges.length);
const result = await super.create({
return this.create({
data: {
projectId: data.projectId,
gender: data.gender,
@ -78,8 +77,6 @@ export class SportStandardService extends BaseService<Prisma.SportStandardDelega
select,
include
})
this.emitDataChanged(CrudOperation.CREATED, result)
return result
}
private validateAgeRanges(ranges: AgeRange[]) {
// 检查年龄段是否按顺序排列且无重叠

View File

@ -3,31 +3,22 @@ import { api } from "@nice/client"
import React from "react"
import { useSport } from "@nice/client"
export default function Dashboard() {
const { createSportStandard } = useSport()
const handleCreateSportStandard = async () => {
await createSportStandard.mutateAsync({
data: {
projectId: "cm8nsk1c0000czg9ix8d4yzml",
gender: true,
personType: "学生",
ageRanges: [
{ start: null, end: 24, label: "24岁以下" },
{ start: 24, end: 27, label: "25-27岁" },
{ start: 27, end: 30, label: "28-30岁" },
{ start: 30, end: null, label: "30岁以上" }
],
scoreTable: {
"100": [85, 81, 79, 77],
"95": [74, 70, 68, 66],
"90": [65, 61, 59, 57]
}
}
} as any)
}
// const {createSportProject} = useSport()
// const handleCreateSportProject = () => {
// createSportProject.mutate({
// data:{
// name:"测试项目",
// description:"测试项目描述",
// type:"测试类型",
// unit:"测试单位",
// isAscending:true
// }
// })
// }
return (
<div >
<Button type="primary" onClick={() => handleCreateSportStandard()}></Button>
{/* <Button type="primary" onClick={()=>handleCreateSportProject()}>创建体育项目</Button> */}
</div>
)
}

View File

@ -1,17 +1,13 @@
import { getQueryKey } from "@trpc/react-query";
import { api, RouterOutputs } from "../trpc"; // Adjust path as necessary
import { useQueryClient, UseMutationResult } from "@tanstack/react-query";
import { api } from "../trpc"; // Adjust path as necessary
import { useQueryClient } from "@tanstack/react-query";
import { ObjectType } from "@nice/common";
import { CrudOperation, emitDataChange } from "../../event";
interface SportOperation {
createSportProject: UseMutationResult<RouterOutputs["sportProject"]["create"], Error, Parameters<typeof api.sportProject.create.useMutation>[0], unknown>;
createSportStandard: UseMutationResult<RouterOutputs["sportStandard"]["createStandard"], Error, Parameters<typeof api.sportStandard.createStandard.useMutation<RouterOutputs["sportStandard"]["createStandard"]>>[0], unknown>;
}
export function useSport(): SportOperation {
export function useSport() {
const queryClient = useQueryClient();
const queryKey = getQueryKey(api.sportProject);
const queryKeyStandard = getQueryKey(api.sportStandard.createStandard);
const queryKeyStandard = getQueryKey(api.sportStandard);
const createSportProject = api.sportProject.create.useMutation({
onSuccess: (result) => {
@ -20,14 +16,16 @@ export function useSport(): SportOperation {
},
});
const createSportStandard = api.sportStandard.createStandard.useMutation<RouterOutputs["sportStandard"]["createStandard"]>({
onSuccess: (result) => {
queryClient.invalidateQueries({ queryKey: queryKeyStandard });
emitDataChange(ObjectType.SPORT_STANDARD, result, CrudOperation.CREATED);
},
});
// const createSportStandard = api.sportStandard.createStandard.useMutation({
// onSuccess: (result) => {
// queryClient.invalidateQueries({ queryKey: queryKeyStandard });
// emitDataChange(ObjectType.SPORT_STANDARD, result, CrudOperation.CREATED);
// },
// });
return {
createSportProject: createSportProject as any as UseMutationResult<RouterOutputs["sportProject"]["create"], Error, Parameters<typeof api.sportProject.create.useMutation>[0], unknown>,
createSportStandard: createSportStandard as any as UseMutationResult<RouterOutputs["sportStandard"]["createStandard"], Error, Parameters<typeof api.sportStandard.createStandard.useMutation<RouterOutputs["sportStandard"]["createStandard"]>>[0], unknown>,
createSportProject,
//createSportStandard
};
}
}