From 000675402e654bcfbdb2c4b6a84a830599bfdc6f Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Tue, 2 Mar 2021 17:53:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectManagementController.java | 24 ++++++++----------- .../mapper/ProjectManagementMapper.java | 14 ++++------- .../service/ProjectManagementService.java | 16 ++++++------- 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java index 33ce22d..ba546be 100644 --- a/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java +++ b/src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java @@ -1,24 +1,16 @@ package com.yipin.liuwanr.controller; -import java.util.HashMap; -import java.util.List; - import com.yipin.liuwanr.entity.*; +import com.yipin.liuwanr.service.ProjectManagementService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import com.yipin.liuwanr.entity.ProjectManagement; -import com.yipin.liuwanr.service.ProjectManagementService; +import org.springframework.web.bind.annotation.*; + +import java.util.HashMap; +import java.util.List; @Api(value = "项目管理", tags = "项目管理相关方法") @RestController @@ -168,7 +160,8 @@ public class ProjectManagementController { @ApiParam(name = "systemId", value = "系统id", required = true) @RequestParam(required = false) Integer systemId, @ApiParam(name = "userId", value = "用户id", required = true) @RequestParam(required = false) Integer userId, @ApiParam(name = "pageNo", value = "第几页，页码", required = true) @RequestParam Integer pageNo, - @ApiParam(name = "pageSize", value = "每页展示的数据条数", required = true) @RequestParam Integer pageSize) { + @ApiParam(name = "pageSize", value = "每页展示的数据条数", required = true) @RequestParam Integer pageSize, + @ApiParam(name = "projectName", value = "项目名称", required = true) @RequestParam String projectName) { Response resp = new Response(); ProjectManagement vo = new ProjectManagement(); if (null != systemId) { @@ -177,6 +170,9 @@ public class ProjectManagementController { if (null != userId) { vo.setUserId(userId); } + if (null != projectName) { + vo.setProjectName(projectName); + } HashMap ret = service.queryManagements(vo,pageNo,pageSize); int status = (int) ret.get("retcode"); if (status == 200) { diff --git a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java index d2109cc..3ceacc9 100644 --- a/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java +++ b/src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java @@ -1,14 +1,9 @@ package com.yipin.liuwanr.mapper; -import java.util.List; - import com.yipin.liuwanr.entity.*; -import org.apache.ibatis.annotations.Delete; -import org.apache.ibatis.annotations.Insert; -import org.apache.ibatis.annotations.Options; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; -import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.*; + +import java.util.List; /** * 项目管理系统 项目管理表 @@ -74,7 +69,8 @@ public interface ProjectManagementMapper { @Select({""}) List queryManagementsExportTest(ProjectManagement management); diff --git a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java index eadd5e5..9b86f31 100644 --- a/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java +++ b/src/main/java/com/yipin/liuwanr/service/ProjectManagementService.java @@ -1,23 +1,21 @@ package com.yipin.liuwanr.service; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.yipin.liuwanr.entity.*; +import com.yipin.liuwanr.helper.UserUtil; +import com.yipin.liuwanr.mapper.ProjectManagementMapper; +import com.yipin.liuwanr.mapper.ScoreIndexMapper; import org.apache.commons.lang3.StringUtils; import org.jboss.logging.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.yipin.liuwanr.helper.UserUtil; -import com.yipin.liuwanr.mapper.ProjectManagementMapper; -import com.yipin.liuwanr.mapper.ScoreIndexMapper; -import org.springframework.util.LinkedMultiValueMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; @Service public class ProjectManagementService {