From 993736bb6422720996362744dec23abc066310d9 Mon Sep 17 00:00:00 2001 From: zty <1048209592@qq.com> Date: Tue, 9 Jul 2024 16:42:58 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AD=A3=E5=BA=A6=E8=80=83=E6=A0=B8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=9F=A5=E8=AF=A2dto=202.=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6page=E6=B3=9B=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/xqopen/kehui/Api.java | 5 ++- .../mapper/ProjectQuarterlyEvaluationDao.java | 10 ++++- .../xml}/ProjectQuarterlyEvaluationMapper.xml | 17 +++++++- .../ProjectQuarterlyEvaluationController.java | 43 ++++++++++++++++++- .../action/ProjectWeeklyController.java | 2 +- .../api/ProjectQuarterlyEvaluationApi.java | 14 +++++- .../ProjectQuarterlyEvaluationListDto.java | 10 +++++ .../ProjectQuarterlyEvaluationService.java | 7 ++- ...ProjectQuarterlyEvaluationServiceImpl.java | 12 +++++- .../com/xqopen/kehui/util/PageNoUtil.java | 10 +++++ 10 files changed, 120 insertions(+), 10 deletions(-) rename src/main/{resources/mapper => java/com/xqopen/kehui/mapper/xml}/ProjectQuarterlyEvaluationMapper.xml (55%) create mode 100644 src/main/java/com/xqopen/kehui/project/dto/ProjectQuarterlyEvaluationListDto.java create mode 100644 src/main/java/com/xqopen/kehui/util/PageNoUtil.java diff --git a/src/main/java/com/xqopen/kehui/Api.java b/src/main/java/com/xqopen/kehui/Api.java index 9cc437c..96f4e60 100644 --- a/src/main/java/com/xqopen/kehui/Api.java +++ b/src/main/java/com/xqopen/kehui/Api.java @@ -377,7 +377,10 @@ public class Api { public static final String PROJECT_WEEKLY_BUDGET_DEL = PROJECT_WEEKLY_BUDGET + "/del"; public static final String PROJECT_INFO_GETPROJECTS = PROJECT_INFO; - + /* + 季度考核管理 + */ + public static final String PROJECT_QUARTERLY_EVALUATION=PROJECT_PREFIX+"/quarterExamine"; public static final String PROJECT_INFO_GET_ACCEPT_PROJECTS = PROJECT_INFO + "/accept"; public static final String PROJECT_INFO_MODEL = PROJECT_INFO + "/model"; diff --git a/src/main/java/com/xqopen/kehui/mapper/ProjectQuarterlyEvaluationDao.java b/src/main/java/com/xqopen/kehui/mapper/ProjectQuarterlyEvaluationDao.java index d0587c7..d22bf6b 100644 --- a/src/main/java/com/xqopen/kehui/mapper/ProjectQuarterlyEvaluationDao.java +++ b/src/main/java/com/xqopen/kehui/mapper/ProjectQuarterlyEvaluationDao.java @@ -2,7 +2,13 @@ package com.xqopen.kehui.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.plugins.Page; +import com.xqopen.kehui.project.dto.ProjectQuarterlyEvaluationListDto; import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * @author admin @@ -10,7 +16,7 @@ import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; * @createDate 2024-07-09 14:45:38 * @Entity .domain.com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation */ +@Repository public interface ProjectQuarterlyEvaluationDao extends BaseMapper { - - + List getList(Page page, @Param("evaluation") ProjectQuarterlyEvaluation evaluation); } diff --git a/src/main/resources/mapper/ProjectQuarterlyEvaluationMapper.xml b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml similarity index 55% rename from src/main/resources/mapper/ProjectQuarterlyEvaluationMapper.xml rename to src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml index 4044dc4..99f93a5 100644 --- a/src/main/resources/mapper/ProjectQuarterlyEvaluationMapper.xml +++ b/src/main/java/com/xqopen/kehui/mapper/xml/ProjectQuarterlyEvaluationMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -20,4 +20,17 @@ is_deleted,created_by,created_at, updated_by,updated_at + + + + + + + + + diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java index e70d918..c24d4b0 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectQuarterlyEvaluationController.java @@ -1,4 +1,45 @@ package com.xqopen.kehui.project.action; -public class ProjectQuarterlyEvaluationController { +import com.alibaba.fastjson.support.spring.FastJsonJsonView; +import com.baomidou.mybatisplus.plugins.Page; +import com.xqopen.kehui.Api; +import com.xqopen.kehui.exception.ErrorCode; +import com.xqopen.kehui.exception.XQException; +import com.xqopen.kehui.project.api.ProjectQuarterlyEvaluationApi; +import com.xqopen.kehui.project.dto.ProjectQuarterlyEvaluationListDto; +import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; +import com.xqopen.kehui.project.service.ProjectQuarterlyEvaluationService; +import com.xqopen.kehui.util.ApiResponse; +import com.xqopen.kehui.util.PageNoUtil; +import com.xqopen.kehui.util.ResultListReqUtil; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Slf4j +@RestController +@RequestMapping(produces = FastJsonJsonView.DEFAULT_CONTENT_TYPE) +public class ProjectQuarterlyEvaluationController implements ProjectQuarterlyEvaluationApi { + @Autowired + ProjectQuarterlyEvaluationService quarterlyEvaluationService; + + @Override + @PostMapping(Api.PROJECT_QUARTERLY_EVALUATION) + public String list(@RequestHeader Long userId, @RequestBody PageNoUtil pageNoUtil) throws XQException { + try { + Page page = new Page<>(pageNoUtil.getPageNo(),pageNoUtil.getPageSize()); + ProjectQuarterlyEvaluation evaluation = pageNoUtil.getT(); + List list = quarterlyEvaluationService.getList(page, evaluation); + ResultListReqUtil listReqUtil = new ResultListReqUtil<>(); + listReqUtil.setLs(list); + listReqUtil.setPages(page.getPages()); + listReqUtil.setTotal(page.getTotal()); + return ApiResponse.fillSuccess(listReqUtil); + }catch (Exception e){ + log.error("ProjectQuarterlyEvaluationController.list", e); + throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); + } + } } diff --git a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java index 6df5ebc..fe3abe0 100644 --- a/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java +++ b/src/main/java/com/xqopen/kehui/project/action/ProjectWeeklyController.java @@ -159,7 +159,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi { log.error("ProjectWeeklyController.list", e); throw new XQException(ErrorCode.PROJECTINFO_EXCEPTION_ERROR, null); } - return null; + return ApiResponse.fillFail("获取失败!"); } diff --git a/src/main/java/com/xqopen/kehui/project/api/ProjectQuarterlyEvaluationApi.java b/src/main/java/com/xqopen/kehui/project/api/ProjectQuarterlyEvaluationApi.java index 9011689..2299b27 100644 --- a/src/main/java/com/xqopen/kehui/project/api/ProjectQuarterlyEvaluationApi.java +++ b/src/main/java/com/xqopen/kehui/project/api/ProjectQuarterlyEvaluationApi.java @@ -1,9 +1,21 @@ package com.xqopen.kehui.project.api; +import com.xqopen.kehui.exception.XQException; +import com.xqopen.kehui.project.dto.ProjectInfoListResp; +import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; import com.xqopen.kehui.util.Constants; +import com.xqopen.kehui.util.PageNoUtil; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; @Api(value = "季度考核管理", tags = Constants.MODULE_PROJECT, description = "项目模块") public interface ProjectQuarterlyEvaluationApi { - + @ApiOperation(value = "获取考核管理列表", notes = "获取考核管理列表", response = ProjectInfoListResp.class) + @ApiImplicitParams({ + @ApiImplicitParam(name = "token", value = "登录标识符", required = true, paramType = "header", dataType = "String"), + }) + String list(Long userId, PageNoUtil pageNoUtil + ) throws XQException; } diff --git a/src/main/java/com/xqopen/kehui/project/dto/ProjectQuarterlyEvaluationListDto.java b/src/main/java/com/xqopen/kehui/project/dto/ProjectQuarterlyEvaluationListDto.java new file mode 100644 index 0000000..96fff89 --- /dev/null +++ b/src/main/java/com/xqopen/kehui/project/dto/ProjectQuarterlyEvaluationListDto.java @@ -0,0 +1,10 @@ +package com.xqopen.kehui.project.dto; + +import com.xqopen.kehui.project.entity.ProjectInfo; +import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; +import lombok.Data; + +@Data +public class ProjectQuarterlyEvaluationListDto extends ProjectQuarterlyEvaluation { + private ProjectInfo projectInfo; +} diff --git a/src/main/java/com/xqopen/kehui/project/service/ProjectQuarterlyEvaluationService.java b/src/main/java/com/xqopen/kehui/project/service/ProjectQuarterlyEvaluationService.java index 7298057..be04e28 100644 --- a/src/main/java/com/xqopen/kehui/project/service/ProjectQuarterlyEvaluationService.java +++ b/src/main/java/com/xqopen/kehui/project/service/ProjectQuarterlyEvaluationService.java @@ -1,8 +1,13 @@ package com.xqopen.kehui.project.service; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.IService; +import com.xqopen.kehui.project.dto.ProjectQuarterlyEvaluationListDto; import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @author admin @@ -10,5 +15,5 @@ import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; * @createDate 2024-07-09 14:45:38 */ public interface ProjectQuarterlyEvaluationService extends IService { - + List getList(Page page, @Param("evaluation") ProjectQuarterlyEvaluation evaluation); } diff --git a/src/main/java/com/xqopen/kehui/project/service/impl/ProjectQuarterlyEvaluationServiceImpl.java b/src/main/java/com/xqopen/kehui/project/service/impl/ProjectQuarterlyEvaluationServiceImpl.java index 79b8179..39a3705 100644 --- a/src/main/java/com/xqopen/kehui/project/service/impl/ProjectQuarterlyEvaluationServiceImpl.java +++ b/src/main/java/com/xqopen/kehui/project/service/impl/ProjectQuarterlyEvaluationServiceImpl.java @@ -1,12 +1,17 @@ package com.xqopen.kehui.project.service.impl; +import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.xqopen.kehui.mapper.ProjectQuarterlyEvaluationDao; +import com.xqopen.kehui.project.dto.ProjectQuarterlyEvaluationListDto; import com.xqopen.kehui.project.entity.ProjectQuarterlyEvaluation; import com.xqopen.kehui.project.service.ProjectQuarterlyEvaluationService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author admin * @description 针对表【project_quarterly_evaluation】的数据库操作Service实现 @@ -15,5 +20,10 @@ import org.springframework.stereotype.Service; @Service public class ProjectQuarterlyEvaluationServiceImpl extends ServiceImpl implements ProjectQuarterlyEvaluationService { - + @Autowired + ProjectQuarterlyEvaluationDao evaluationDao; + @Override + public List getList(Page page, ProjectQuarterlyEvaluation evaluation) { + return evaluationDao.getList(page,evaluation); + } } diff --git a/src/main/java/com/xqopen/kehui/util/PageNoUtil.java b/src/main/java/com/xqopen/kehui/util/PageNoUtil.java new file mode 100644 index 0000000..8d98361 --- /dev/null +++ b/src/main/java/com/xqopen/kehui/util/PageNoUtil.java @@ -0,0 +1,10 @@ +package com.xqopen.kehui.util; + +import lombok.Data; + +@Data +public class PageNoUtil { + private T t; + private Integer pageNo; + private Integer pageSize; +}