master
chen 4 years ago
parent 448078d20d
commit 000675402e
  1. 24
      src/main/java/com/yipin/liuwanr/controller/ProjectManagementController.java
  2. 14
      src/main/java/com/yipin/liuwanr/mapper/ProjectManagementMapper.java
  3. 16
      src/main/java/com/yipin/liuwanr/service/ProjectManagementService.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<String, Object> ret = service.queryManagements(vo,pageNo,pageSize);
int status = (int) ret.get("retcode");
if (status == 200) {

@ -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({"<script>",
"select * from hr_project_management where (roleId NOT LIKE '%3%' AND isdel = 0 AND projectPermissions != 0)",
" <if test='userId!=null'>OR ( isdel = 0 AND projectPermissions != 0 AND userId = #{userId} )</if>",//教师端,一开始进入项目管理,看见自己创建的和其他人看见的
" <if test='systemId!=null'> and systemId=#{systemId}</if>",
"<if test='systemId!=null'> and systemId=#{systemId}</if>",
"<if test='projectName!=null'> and projectName LIKE '% #{projectName} %'</if>",
" ORDER BY creationTime desc",
"</script>"})
List<ProjectManagement> queryManagementsExportTest(ProjectManagement management);

@ -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 {

Loading…
Cancel
Save