diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java index 501074d..c5936a9 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java @@ -96,8 +96,8 @@ public class ProjectController { @Operation(summary = "获得项目列表") @PreAuthorize("@ss.hasPermission('license:project:query')") public CommonResult> getProjectPage(@Valid ProjectListReqVO pageReqVO) { - List listResult = projectService.getProjectList(pageReqVO); - return success(BeanUtils.toBean(listResult, ProjectRespVO.class)); + List listResult = projectService.getProjectList(pageReqVO); + return success(listResult); } @GetMapping("/export-excel") diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectListReqVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectListReqVO.java index 1de1cbc..98ab958 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectListReqVO.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectListReqVO.java @@ -71,4 +71,9 @@ public class ProjectListReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + @Schema(description = "sn") + private String serialNo; + + @Schema(description = "技术负责人") + private Long technicalOwner; } \ No newline at end of file diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java index 62d41b3..f753fff 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java @@ -84,6 +84,8 @@ public interface ProjectMapper extends BaseMapperX { IPage queryPage(IPage page, @Param("query") ProjectPageReqVO reqVO); + List queryList(@Param("query") ProjectListReqVO reqVO); + List getLicenseProjects(@Param("query") ProjectListReqVO reqVO); ProjectDO getBySnAndProjectAndCustomer(@Param("serialNo") String serialNo, @Param("projectName") String projectName, @Param("customerName") String customerName); diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectService.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectService.java index 668e94e..78497e9 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectService.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectService.java @@ -63,7 +63,7 @@ public interface ProjectService { * @param pageReqVO 列表查询 * @return 项目列表 */ - List getProjectList(ProjectListReqVO reqVO); + List getProjectList(ProjectListReqVO reqVO); /** * 校验项目名称是否唯一 diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java index 0c22911..943c8cc 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java @@ -139,8 +139,8 @@ public class ProjectServiceImpl implements ProjectService { } @Override - public List getProjectList(ProjectListReqVO reqVO) { - return projectMapper.selectList(reqVO); + public List getProjectList(ProjectListReqVO reqVO) { + return projectMapper.queryList(reqVO); } @Override diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml index b400a03..a86038b 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml @@ -11,6 +11,14 @@ + + + + SELECT p.*, c.serial_no @@ -64,10 +72,9 @@ OR p.technical_owner_b = #{query.technicalOwner} OR p.technical_owner_c = #{query.technicalOwner}) - ORDER BY p.id DESC - +