WFC/agt-cloud
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 项目的列表查询改用sql,并且查出sn

Browse Source
This commit is contained in:
caiyuchao
2025-08-28 12:06:33 +08:00
parent bafbbe7a3d
commit 4b8fedf1d9
6 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java
View File

@@ -96,8 +96,8 @@ public class ProjectController {
@Operation(summary = "获得项目列表")
@PreAuthorize("@ss.hasPermission('license:project:query')")
public CommonResult<List<ProjectRespVO>> getProjectPage(@Valid ProjectListReqVO pageReqVO) {
List<ProjectDO> listResult = projectService.getProjectList(pageReqVO);
return success(BeanUtils.toBean(listResult, ProjectRespVO.class));
List<ProjectRespVO> listResult = projectService.getProjectList(pageReqVO);
return success(listResult);
}
@GetMapping("/export-excel")

5
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/vo/ProjectListReqVO.java
View File

@@ -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;
}

2
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java
View File

@@ -84,6 +84,8 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
IPage<ProjectRespVO> queryPage(IPage<?> page, @Param("query") ProjectPageReqVO reqVO);
List<ProjectRespVO> queryList(@Param("query") ProjectListReqVO reqVO);
List<ProjectRespVO> getLicenseProjects(@Param("query") ProjectListReqVO reqVO);
ProjectDO getBySnAndProjectAndCustomer(@Param("serialNo") String serialNo, @Param("projectName") String projectName, @Param("customerName") String customerName);

2
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectService.java
View File

@@ -63,7 +63,7 @@ public interface ProjectService {
* @param pageReqVO 列表查询
* @return 项目列表
*/
List<ProjectDO> getProjectList(ProjectListReqVO reqVO);
List<ProjectRespVO> getProjectList(ProjectListReqVO reqVO);
/**
* 校验项目名称是否唯一

4
agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java
View File

@@ -139,8 +139,8 @@ public class ProjectServiceImpl implements ProjectService {
}
@Override
public List<ProjectDO> getProjectList(ProjectListReqVO reqVO) {
return projectMapper.selectList(reqVO);
public List<ProjectRespVO> getProjectList(ProjectListReqVO reqVO) {
return projectMapper.queryList(reqVO);
}
@Override

11
agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml
View File

@@ -11,6 +11,14 @@
</select>
<select id="queryPage" resultType="org.agt.module.license.controller.admin.project.vo.ProjectRespVO">
<include refid="queryProjects"></include>
</select>
<select id="queryList" resultType="org.agt.module.license.controller.admin.project.vo.ProjectRespVO">
<include refid="queryProjects"></include>
</select>
<sql id="queryProjects">
SELECT
p.*,
c.serial_no
@@ -64,10 +72,9 @@
OR p.technical_owner_b = #{query.technicalOwner}
OR p.technical_owner_c = #{query.technicalOwner})
</if>
ORDER BY
p.id DESC
</select>
</sql>
<select id="getLicenseProjects" resultType="org.agt.module.license.controller.admin.project.vo.ProjectRespVO">
SELECT