wangjiadong
/
comp
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、比赛项目问题修改 11.22

Browse Source
main
zhc077 1 year ago
parent c2371a16ec
commit 004424b230
9 changed files with 1495 additions and 1252 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 88
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
  2. 99
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/entity/AnnualComp.java
  3. 135
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
  4. 135
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/entity/AnnualCompAward.java
  5. 7
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
  6. 72
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java
  7. 100
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/entity/Comp.java
  8. 90
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java
  9. 53
      jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAward.data.ts

88
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/controller/AnnualCompController.java
Unescape View File

@ -1,51 +1,37 @@
package org.jeecg.modules.demo.annualcomp.controller; package org.jeecg.modules.demo.annualcomp.controller;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.support.SFunction; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.annual.entity.Annual; import org.jeecg.modules.demo.annual.entity.Annual;
import org.jeecg.modules.demo.annual.service.IAnnualService; import org.jeecg.modules.demo.annual.service.IAnnualService;
import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.annualcomp.vo.AnnualCompVo; import org.jeecg.modules.demo.annualcomp.vo.AnnualCompVo;
import org.jeecg.modules.demo.comp.entity.Comp; import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService; import org.jeecg.modules.demo.comp.service.ICompService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import javax.servlet.http.HttpServletRequest;
import io.swagger.annotations.ApiOperation; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.aspect.annotation.AutoLog; import java.util.Arrays;
import org.apache.shiro.authz.annotation.RequiresPermissions; import java.util.List;
import java.util.stream.Collectors;
/** /**
* @Description: 年度比赛管理 * @Description: 年度比赛管理
@ -84,10 +70,24 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
// QueryWrapper<AnnualComp> queryWrapper = QueryGenerator.initQueryWrapper(annualComp, req.getParameterMap()); // QueryWrapper<AnnualComp> queryWrapper = QueryGenerator.initQueryWrapper(annualComp, req.getParameterMap());
// Page<AnnualComp> page = new Page<AnnualComp>(pageNo, pageSize); // Page<AnnualComp> page = new Page<AnnualComp>(pageNo, pageSize);
// IPage<AnnualComp> pageList = annualCompService.page(page, queryWrapper); // IPage<AnnualComp> pageList = annualCompService.page(page, queryWrapper);
Subject subject = SecurityUtils.getSubject();
// 获取当前登录用户
LoginUser loginUser = (LoginUser) subject.getPrincipal();
//角色名称 管理员&教务处可以查看所有
String realname = loginUser.getRealname();
String compname = annualComp.getCompname(); String compname = annualComp.getCompname();
String compId = null; String compId = null;
LambdaQueryWrapper<Comp> queryWrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<Comp> queryWrapper1 = new LambdaQueryWrapper<>();
if (StringUtils.isNotBlank(compname)) {
queryWrapper1.eq(Comp::getCompName, compname); queryWrapper1.eq(Comp::getCompName, compname);
}
if (StringUtils.equals("管理员", realname) || StringUtils.equals("教务处", realname)) {
} else {
queryWrapper1.eq(Comp::getCompAdmin, loginUser.getUsername());
}
Comp serviceOne = compService.getOne(queryWrapper1); Comp serviceOne = compService.getOne(queryWrapper1);
if (serviceOne != null) { if (serviceOne != null) {
compId = serviceOne.getId(); compId = serviceOne.getId();
@ -113,10 +113,18 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
BeanUtils.copyProperties(item, annualCompVo); BeanUtils.copyProperties(item, annualCompVo);
String state = item.getState(); String state = item.getState();
switch (state) { switch (state) {
case "0":annualCompVo.setState_dictText("待提交");break; case "0":
case "1":annualCompVo.setState_dictText("已提交");break; annualCompVo.setState_dictText("待提交");
case "2":annualCompVo.setState_dictText("已审核");break; break;
case "3":annualCompVo.setState_dictText("已驳回");break; case "1":
annualCompVo.setState_dictText("已提交");
break;
case "2":
annualCompVo.setState_dictText("已审核");
break;
case "3":
annualCompVo.setState_dictText("已驳回");
break;
} }
String compid = item.getCompid(); String compid = item.getCompid();
Comp comp = compService.getById(compid); Comp comp = compService.getById(compid);
@ -129,6 +137,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
pageInfo.setRecords(list); pageInfo.setRecords(list);
return Result.OK(pageInfo); return Result.OK(pageInfo);
} }
@ApiOperation(value = "年度比赛管理-未审核-分页列表查询", notes = "年度比赛管理-未审核-分页列表查询") @ApiOperation(value = "年度比赛管理-未审核-分页列表查询", notes = "年度比赛管理-未审核-分页列表查询")
@GetMapping(value = "/submittedlist") @GetMapping(value = "/submittedlist")
public Result<IPage<AnnualCompVo>> queryPagesubmittedList(AnnualCompVo annualCompVo, public Result<IPage<AnnualCompVo>> queryPagesubmittedList(AnnualCompVo annualCompVo,
@ -138,6 +147,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
String state = "1"; String state = "1";
return getiPageResult(pageNo, pageSize, state, annualCompVo); return getiPageResult(pageNo, pageSize, state, annualCompVo);
} }
@ApiOperation(value = "年度比赛管理-已审核-分页列表查询", notes = "年度比赛管理-已审核-分页列表查询") @ApiOperation(value = "年度比赛管理-已审核-分页列表查询", notes = "年度比赛管理-已审核-分页列表查询")
@GetMapping(value = "/auditedlist") @GetMapping(value = "/auditedlist")
public Result<IPage<AnnualCompVo>> queryPageauditedList(AnnualCompVo annualCompVo, public Result<IPage<AnnualCompVo>> queryPageauditedList(AnnualCompVo annualCompVo,
@ -147,6 +157,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
String state = "2"; String state = "2";
return getiPageResult(pageNo, pageSize, state, annualCompVo); return getiPageResult(pageNo, pageSize, state, annualCompVo);
} }
@ApiOperation(value = "年度比赛管理-已驳回-分页列表查询", notes = "年度比赛管理-已驳回-分页列表查询") @ApiOperation(value = "年度比赛管理-已驳回-分页列表查询", notes = "年度比赛管理-已驳回-分页列表查询")
@GetMapping(value = "/rejectedlist") @GetMapping(value = "/rejectedlist")
public Result<IPage<AnnualCompVo>> queryPagerejectedList(AnnualCompVo annualCompVo, public Result<IPage<AnnualCompVo>> queryPagerejectedList(AnnualCompVo annualCompVo,
@ -156,6 +167,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
String state = "3"; String state = "3";
return getiPageResult(pageNo, pageSize, state, annualCompVo); return getiPageResult(pageNo, pageSize, state, annualCompVo);
} }
@ApiOperation(value = "年度比赛管理-学校/学生-分页列表查询", notes = "年度比赛管理-学校/学生-分页列表查询") @ApiOperation(value = "年度比赛管理-学校/学生-分页列表查询", notes = "年度比赛管理-学校/学生-分页列表查询")
@GetMapping(value = "/schoollist") @GetMapping(value = "/schoollist")
public Result<IPage<AnnualCompVo>> queryPagereschoollist(AnnualCompVo annualComp, public Result<IPage<AnnualCompVo>> queryPagereschoollist(AnnualCompVo annualComp,
@ -330,6 +342,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
annualCompService.updateById(annualComp); annualCompService.updateById(annualComp);
return Result.OK("已通过!"); return Result.OK("已通过!");
} }
/** /**
* 驳回 * 驳回
* *
@ -345,6 +358,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
annualCompService.updateById(annualComp); annualCompService.updateById(annualComp);
return Result.OK("已驳回!"); return Result.OK("已驳回!");
} }
/** /**
* 提交 * 提交
* *
@ -361,6 +375,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
annualCompService.updateById(annualComp); annualCompService.updateById(annualComp);
return Result.OK("已提交!"); return Result.OK("已提交!");
} }
/** /**
* 启用 * 启用
* *
@ -376,6 +391,7 @@ public class AnnualCompController extends JeecgController<AnnualComp, IAnnualCom
annualCompService.updateById(annualComp); annualCompService.updateById(annualComp);
return Result.OK("已启用!"); return Result.OK("已启用!");
} }
/** /**
* 停用 * 停用
* *

99
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcomp/entity/AnnualComp.java
Unescape View File

@ -1,22 +1,19 @@
package org.jeecg.modules.demo.annualcomp.entity; package org.jeecg.modules.demo.annualcomp.entity;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/** /**
* @Description: 年度比赛管理 * @Description: 年度比赛管理
@ -32,90 +29,132 @@ import lombok.experimental.Accessors;
public class AnnualComp implements Serializable { public class AnnualComp implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**主键*/ /**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
/**创建人*/ /**
* 创建人
*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;
/**创建日期*/ /**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private Date createTime; private Date createTime;
/**更新人*/ /**
* 更新人
*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updateBy; private String updateBy;
/**更新日期*/ /**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private Date updateTime; private Date updateTime;
/**所属部门*/ /**
* 所属部门
*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private String sysOrgCode;
/**比赛id*/ /**
* 比赛id
*/
@Excel(name = "比赛id", width = 15) @Excel(name = "比赛id", width = 15)
@ApiModelProperty(value = "比赛id") @ApiModelProperty(value = "比赛id")
private String compid; private String compid;
/**年度id*/ /**
* 年度id
*/
@Excel(name = "年度id", width = 15) @Excel(name = "年度id", width = 15)
@ApiModelProperty(value = "年度id") @ApiModelProperty(value = "年度id")
private String annualid; private String annualid;
/**赛次*/ /**
* 赛次
*/
@Excel(name = "赛次", width = 15) @Excel(name = "赛次", width = 15)
@ApiModelProperty(value = "赛次") @ApiModelProperty(value = "赛次")
private String games; private String games;
/**名称*/ /**
* 名称
*/
@Excel(name = "名称", width = 15) @Excel(name = "名称", width = 15)
@ApiModelProperty(value = "名称") @ApiModelProperty(value = "名称")
private String name; private String name;
/**年度比赛简介*/ /**
* 年度比赛简介
*/
@Excel(name = "年度比赛简介", width = 15) @Excel(name = "年度比赛简介", width = 15)
@ApiModelProperty(value = "年度比赛简介") @ApiModelProperty(value = "年度比赛简介")
private String introduction; private String introduction;
/**年度比赛介绍*/ /**
* 年度比赛介绍
*/
@Excel(name = "年度比赛介绍", width = 15) @Excel(name = "年度比赛介绍", width = 15)
@ApiModelProperty(value = "年度比赛介绍") @ApiModelProperty(value = "年度比赛介绍")
private String introduce; private String introduce;
/**比赛图片*/ /**
* 比赛图片
*/
@Excel(name = "比赛图片", width = 15) @Excel(name = "比赛图片", width = 15)
@ApiModelProperty(value = "比赛图片") @ApiModelProperty(value = "比赛图片")
private String image; private String image;
/**年度比赛介绍文件*/ /**
* 年度比赛介绍文件
*/
@Excel(name = "年度比赛介绍文件", width = 15) @Excel(name = "年度比赛介绍文件", width = 15)
@ApiModelProperty(value = "年度比赛介绍文件") @ApiModelProperty(value = "年度比赛介绍文件")
private String compfile; private String compfile;
/**开始时间*/ /**
* 开始时间
*/
@Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd") @Excel(name = "开始时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "开始时间") @ApiModelProperty(value = "开始时间")
private Date starttime; private Date starttime;
/**结束时间*/ /**
* 结束时间
*/
@Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd") @Excel(name = "结束时间", width = 15, format = "yyyy-MM-dd")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "结束时间") @ApiModelProperty(value = "结束时间")
private Date endtime; private Date endtime;
/**主办方*/ /**
* 主办方
*/
@Excel(name = "主办方", width = 15) @Excel(name = "主办方", width = 15)
@ApiModelProperty(value = "主办方") @ApiModelProperty(value = "主办方")
private String organizer; private String organizer;
/**协办方*/ /**
* 协办方
*/
@Excel(name = "协办方", width = 15) @Excel(name = "协办方", width = 15)
@ApiModelProperty(value = "协办方") @ApiModelProperty(value = "协办方")
private String coorganizer; private String coorganizer;
/**年度比赛状态*/ /**
* 年度比赛状态
*/
@Excel(name = "年度比赛状态", width = 15) @Excel(name = "年度比赛状态", width = 15)
@ApiModelProperty(value = "年度比赛状态") @ApiModelProperty(value = "年度比赛状态")
private String state; private String state;
/**开关*/ /**
* 开关
*/
@Excel(name = "开关", width = 15) @Excel(name = "开关", width = 15)
@ApiModelProperty(value = "开关") @ApiModelProperty(value = "开关")
private String isopen; private String isopen;
/**驳回信息*/ /**
* 驳回信息
*/
@Excel(name = "驳回信息", width = 15) @Excel(name = "驳回信息", width = 15)
@ApiModelProperty(value = "驳回信息") @ApiModelProperty(value = "驳回信息")
private String backinfo; private String backinfo;

135
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/controller/AnnualCompAwardController.java
Unescape View File

@ -1,15 +1,19 @@
package org.jeecg.modules.demo.annualcompaward.controller; package org.jeecg.modules.demo.annualcompaward.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.annual.entity.Annual; import org.jeecg.modules.demo.annual.entity.Annual;
import org.jeecg.modules.demo.annual.service.IAnnualService; import org.jeecg.modules.demo.annual.service.IAnnualService;
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
@ -17,24 +21,18 @@ import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAward; import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAward;
import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAwardvo;
import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService; import org.jeecg.modules.demo.annualcompaward.service.IAnnualCompAwardService;
import org.jeecg.modules.demo.comp.entity.Comp;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.jeecg.modules.demo.comp.service.ICompService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import javax.servlet.http.HttpServletRequest;
import org.jeecg.common.aspect.annotation.AutoLog; import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions; import java.util.*;
import java.util.stream.Collectors;
/** /**
* @Description: 年度比赛奖项设置 * @Description: 年度比赛奖项设置
@ -56,6 +54,9 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
@Autowired @Autowired
private IAnnualCompService annualCompService; private IAnnualCompService annualCompService;
@Autowired
private ICompService iCompService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -68,36 +69,78 @@ public class AnnualCompAwardController extends JeecgController<AnnualCompAward,
//@AutoLog(value = "年度比赛奖项设置-分页列表查询") //@AutoLog(value = "年度比赛奖项设置-分页列表查询")
@ApiOperation(value = "年度比赛奖项设置-分页列表查询", notes = "年度比赛奖项设置-分页列表查询") @ApiOperation(value = "年度比赛奖项设置-分页列表查询", notes = "年度比赛奖项设置-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<AnnualCompAwardvo>> queryPageList(AnnualCompAward annualCompAward, public Result<IPage<AnnualCompAward>> queryPageList(AnnualCompAward annualCompAward,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<AnnualCompAward> queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap());
Subject subject = SecurityUtils.getSubject();
// 获取当前登录用户
LoginUser loginUser = (LoginUser) subject.getPrincipal();
//角色名称 管理员&教务处可以查看所有
String realname = loginUser.getRealname();
Set<String> annualCompPointIds = new TreeSet<>();
// QueryWrapper<AnnualCompAward> queryWrapper = QueryGenerator.initQueryWrapper(annualCompAward, req.getParameterMap());
LambdaQueryWrapper<AnnualCompAward> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.equals("管理员", realname) || StringUtils.equals("教务处", realname)) {
} else {
List<Comp> compList = iCompService.list(new LambdaQueryWrapper<Comp>().eq(Comp::getCompAdmin, loginUser.getUsername()));
if (!ObjectUtils.isEmpty(compList)) {
Set<String> compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet());
List<AnnualComp> annualCompList = annualCompService.list(new LambdaQueryWrapper<AnnualComp>().in(AnnualComp::getCompid, compIds));
if (!ObjectUtils.isEmpty(annualCompList)) {
Set<String> annualCompIds = annualCompList.stream().map(d -> d.getId()).collect(Collectors.toSet());
List<AnnualCompPoint> annualCompPointList = annualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(AnnualCompPoint::getAnnualCompId, annualCompIds));
if (!ObjectUtils.isEmpty(annualCompPointList)) {
annualCompPointIds = annualCompPointList.stream().map(e -> e.getId()).collect(Collectors.toSet());
}
}
}
queryWrapper.in(AnnualCompAward::getAnnucompid, annualCompPointIds);
}
Page<AnnualCompAward> page = new Page<AnnualCompAward>(pageNo, pageSize); Page<AnnualCompAward> page = new Page<AnnualCompAward>(pageNo, pageSize);
Page<AnnualCompAwardvo> page1 = new Page<>();
annualCompAwardService.page(page, queryWrapper); annualCompAwardService.page(page, queryWrapper);
BeanUtils.copyProperties(page, page1,"records");
List<AnnualCompAward> list=page.getRecords(); // Page<AnnualCompAwardvo> page1 = new Page<>();
List<AnnualCompAwardvo> list1=list.stream().map((item)->{ // BeanUtils.copyProperties(page, page1, "records");
AnnualCompAwardvo annualCompAward1=new AnnualCompAwardvo(); // List<AnnualCompAward> list = page.getRecords();
BeanUtils.copyProperties(item,annualCompAward1); // List<AnnualCompAwardvo> list1 = list.stream().map((item) -> {
AnnualCompPoint annualCompPoint = annualCompPointService.query().eq("id", annualCompAward1.getAnnucompid()).one(); // AnnualCompAwardvo annualCompAward1 = new AnnualCompAwardvo();
AnnualComp annualComp = null; // BeanUtils.copyProperties(item, annualCompAward1);
Annual annual = null; // AnnualCompPoint annualCompPoint = annualCompPointService.query().eq("id", annualCompAward1.getAnnucompid()).one();
if (annualCompPoint != null) { // AnnualComp annualComp = null;
annualComp = annualCompService.query().eq("id", annualCompPoint.getAnnualCompId()).one(); // Annual annual = null;
} // if (annualCompPoint != null) {
// annualComp = annualCompService.query().eq("id", annualCompPoint.getAnnualCompId()).one();
// }
// if (annualComp != null) {
// annual = annualService.query().eq("id", annualComp.getAnnualid()).one();
// }
//// if (annualCompPoint != null && annualComp != null && annual != null)
// annualCompAward1.setAnnucompid(annualCompPoint.getObjName());
// annualCompAward1.setComp(annualComp.getName());
// annualCompAward1.setAnnual(annual.getAnnualName());
// return annualCompAward1;
// }).collect(Collectors.toList());
// page1.setRecords(list1);
List<AnnualCompAward> records = page.getRecords();
Optional.ofNullable(records).orElse(new LinkedList<>()).stream().forEach(e -> {
AnnualCompPoint annualCompPoint = annualCompPointService.getById(e.getAnnucompid());
if (!ObjectUtils.isEmpty(annualCompPoint)) {
AnnualComp annualComp = annualCompService.getById(annualCompPoint.getAnnualCompId());
if (annualComp != null) { if (annualComp != null) {
annual = annualService.query().eq("id", annualComp.getAnnualid()).one(); e.setComp(annualComp.getName());
} Annual annual = annualService.getById(annualComp.getAnnualid());
if (annualCompPoint != null && annualComp != null && annual != null) if (annual != null) {
annualCompAward1.setAnnucompid(annualCompPoint.getObjName()); e.setAnnual(annual.getAnnualName());
annualCompAward1.setComp(annualComp.getName()); }
annualCompAward1.setAnnual(annual.getAnnualName()); }
return annualCompAward1; }
}).collect(Collectors.toList()); });
page1.setRecords(list1); return Result.OK(page);
return Result.OK(page1);
} }
/** /**

135
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompaward/entity/AnnualCompAward.java
Unescape View File

@ -1,19 +1,21 @@
package org.jeecg.modules.demo.annualcompaward.entity; package org.jeecg.modules.demo.annualcompaward.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/** /**
* @Description: 年度比赛奖项设置 * @Description: 年度比赛奖项设置
@ -29,115 +31,178 @@ import lombok.experimental.Accessors;
public class AnnualCompAward implements Serializable { public class AnnualCompAward implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**主键*/ /**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
/**创建人*/ /**
* 创建人
*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;
/**创建日期*/ /**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private Date createTime; private Date createTime;
/**更新人*/ /**
* 更新人
*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updateBy; private String updateBy;
/**更新日期*/ /**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private Date updateTime; private Date updateTime;
/**所属部门*/ /**
* 所属部门
*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private String sysOrgCode;
/**年度比赛项目id*/ /**
@Excel(name = "年度比赛项目id", width = 15) * 年度比赛项目id
*/
@Dict(dictTable = "annual_comp_point",dicCode = "id",dicText = "obj_name")
@ApiModelProperty(value = "年度比赛项目id") @ApiModelProperty(value = "年度比赛项目id")
private String annucompid; private String annucompid;
/**是否启用奖项1*/ /**
* 是否启用奖项1
*/
@Excel(name = "是否启用奖项1", width = 15) @Excel(name = "是否启用奖项1", width = 15)
@ApiModelProperty(value = "是否启用奖项1") @ApiModelProperty(value = "是否启用奖项1")
private String isFirstPrize; private String isFirstPrize;
/**第一名奖项名称*/ /**
* 第一名奖项名称
*/
@Excel(name = "第一名奖项名称", width = 15) @Excel(name = "第一名奖项名称", width = 15)
@ApiModelProperty(value = "第一名奖项名称") @ApiModelProperty(value = "第一名奖项名称")
private String firstPrize; private String firstPrize;
/**数量*/ /**
* 数量
*/
@Excel(name = "数量", width = 15) @Excel(name = "数量", width = 15)
@ApiModelProperty(value = "数量") @ApiModelProperty(value = "数量")
private String firstNum; private String firstNum;
/**第一名权重*/ /**
* 第一名权重
*/
@Excel(name = "第一名权重", width = 15) @Excel(name = "第一名权重", width = 15)
@ApiModelProperty(value = "第一名权重") @ApiModelProperty(value = "第一名权重")
private String firstWeight; private String firstWeight;
/**是否启用奖项2*/ /**
* 是否启用奖项2
*/
@Excel(name = "是否启用奖项2", width = 15) @Excel(name = "是否启用奖项2", width = 15)
@ApiModelProperty(value = "是否启用奖项2") @ApiModelProperty(value = "是否启用奖项2")
private String isSecondPrize; private String isSecondPrize;
/**第二名奖项名称*/ /**
* 第二名奖项名称
*/
@Excel(name = "第二名奖项名称", width = 15) @Excel(name = "第二名奖项名称", width = 15)
@ApiModelProperty(value = "第二名奖项名称") @ApiModelProperty(value = "第二名奖项名称")
private String secondPrize; private String secondPrize;
/**奖项2数量*/ /**
* 奖项2数量
*/
@Excel(name = "奖项2数量", width = 15) @Excel(name = "奖项2数量", width = 15)
@ApiModelProperty(value = "奖项2数量") @ApiModelProperty(value = "奖项2数量")
private String secondNum; private String secondNum;
/**第二名权重*/ /**
* 第二名权重
*/
@Excel(name = "第二名权重", width = 15) @Excel(name = "第二名权重", width = 15)
@ApiModelProperty(value = "第二名权重") @ApiModelProperty(value = "第二名权重")
private String secondWeight; private String secondWeight;
/**是否启用奖项3*/ /**
* 是否启用奖项3
*/
@Excel(name = "是否启用奖项3", width = 15) @Excel(name = "是否启用奖项3", width = 15)
@ApiModelProperty(value = "是否启用奖项3") @ApiModelProperty(value = "是否启用奖项3")
private String isThirdPrize; private String isThirdPrize;
/**第三名奖项名称*/ /**
* 第三名奖项名称
*/
@Excel(name = "第三名奖项名称", width = 15) @Excel(name = "第三名奖项名称", width = 15)
@ApiModelProperty(value = "第三名奖项名称") @ApiModelProperty(value = "第三名奖项名称")
private String thirdPrize; private String thirdPrize;
/**奖项3数量*/ /**
* 奖项3数量
*/
@Excel(name = "奖项3数量", width = 15) @Excel(name = "奖项3数量", width = 15)
@ApiModelProperty(value = "奖项3数量") @ApiModelProperty(value = "奖项3数量")
private String thirdNum; private String thirdNum;
/**第三名权重*/ /**
* 第三名权重
*/
@Excel(name = "第三名权重", width = 15) @Excel(name = "第三名权重", width = 15)
@ApiModelProperty(value = "第三名权重") @ApiModelProperty(value = "第三名权重")
private String thirdWeight; private String thirdWeight;
/**是否启用奖项4*/ /**
* 是否启用奖项4
*/
@Excel(name = "是否启用奖项4", width = 15) @Excel(name = "是否启用奖项4", width = 15)
@ApiModelProperty(value = "是否启用奖项4") @ApiModelProperty(value = "是否启用奖项4")
private String isFourthPrize; private String isFourthPrize;
/**第四名奖项名称*/ /**
* 第四名奖项名称
*/
@Excel(name = "第四名奖项名称", width = 15) @Excel(name = "第四名奖项名称", width = 15)
@ApiModelProperty(value = "第四名奖项名称") @ApiModelProperty(value = "第四名奖项名称")
private String fourthPrize; private String fourthPrize;
/**奖项4数量*/ /**
* 奖项4数量
*/
@Excel(name = "奖项4数量", width = 15) @Excel(name = "奖项4数量", width = 15)
@ApiModelProperty(value = "奖项4数量") @ApiModelProperty(value = "奖项4数量")
private String fourthNum; private String fourthNum;
/**第四名权重*/ /**
* 第四名权重
*/
@Excel(name = "第四名权重", width = 15) @Excel(name = "第四名权重", width = 15)
@ApiModelProperty(value = "第四名权重") @ApiModelProperty(value = "第四名权重")
private String fourthWeight; private String fourthWeight;
/**是否启用奖项5*/ /**
* 是否启用奖项5
*/
@Excel(name = "是否启用奖项5", width = 15) @Excel(name = "是否启用奖项5", width = 15)
@ApiModelProperty(value = "是否启用奖项5") @ApiModelProperty(value = "是否启用奖项5")
private String isFifthPrize; private String isFifthPrize;
/**第五名奖项名称*/ /**
* 第五名奖项名称
*/
@Excel(name = "第五名奖项名称", width = 15) @Excel(name = "第五名奖项名称", width = 15)
@ApiModelProperty(value = "第五名奖项名称") @ApiModelProperty(value = "第五名奖项名称")
private String fifthPrize; private String fifthPrize;
/**奖项5数量*/ /**
* 奖项5数量
*/
@Excel(name = "奖项5数量", width = 15) @Excel(name = "奖项5数量", width = 15)
@ApiModelProperty(value = "奖项5数量") @ApiModelProperty(value = "奖项5数量")
private String fifthNum; private String fifthNum;
/**第五名权重*/ /**
* 第五名权重
*/
@Excel(name = "第五名权重", width = 15) @Excel(name = "第五名权重", width = 15)
@ApiModelProperty(value = "第五名权重") @ApiModelProperty(value = "第五名权重")
private String fifthWeight; private String fifthWeight;
/**同分*/ /**
* 同分
*/
@Excel(name = "同分", width = 15) @Excel(name = "同分", width = 15)
@ApiModelProperty(value = "同分") @ApiModelProperty(value = "同分")
private String equalSocre; private String equalSocre;
@TableField(exist = false)
private String annual;
@TableField(exist = false)
private String comp;
} }

7
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
Unescape View File

@ -354,9 +354,10 @@ public class AnnualCompetitionProjectRegistrationController {
String enrollStatic = record.getEnrollStatic(); String enrollStatic = record.getEnrollStatic();
//对驳回信息添加默认信息 //对驳回信息添加默认信息
if (!enrollStatic.equals("3")){ // 学生端年度比赛项目之后在驳回状态下才显示驳回原因 modify by zhc 11.21
record.setBackinfo("无驳回信息"); // if (!enrollStatic.equals("3")){
} // record.setBackinfo("无驳回信息");
// }
record.setAnnual(record.getEnrollCode().substring(0, 4)); record.setAnnual(record.getEnrollCode().substring(0, 4));
} }

72
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/controller/CompController.java
Unescape View File

@ -1,46 +1,41 @@
package org.jeecg.modules.demo.comp.controller; package org.jeecg.modules.demo.comp.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
//import org.apache.shiro.authz.annotation.RequiresPermissions; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import org.jeecg.modules.demo.comp.entity.Comp; import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService; import org.jeecg.modules.demo.comp.service.ICompService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.comptype.entity.CompType;
import org.jeecg.modules.demo.comptype.service.ICompTypeService; import org.jeecg.modules.demo.comptype.service.ICompTypeService;
import org.jeecg.modules.system.entity.SysDepart; import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.service.ISysDepartService; import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.service.ISysUserService;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import javax.servlet.http.HttpServletRequest;
import org.jeecg.common.aspect.annotation.AutoLog; import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/** /**
* @Description: 比赛 * @Description: 比赛
* @Author: jeecg-boot * @Author: jeecg-boot
@ -82,6 +77,17 @@ public class CompController extends JeecgController<Comp, ICompService> {
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
//只显示自己管理的比赛
Subject subject = SecurityUtils.getSubject();
// 获取当前登录用户
LoginUser loginUser = (LoginUser) subject.getPrincipal();
//角色名称 管理员&教务处可以查看所有
String realname = loginUser.getRealname();
if (StringUtils.equals("管理员", realname) || StringUtils.equals("教务处", realname)) {
} else {
comp.setCompAdmin(loginUser.getUsername());
}
QueryWrapper<Comp> queryWrapper = QueryGenerator.initQueryWrapper(comp, req.getParameterMap()); QueryWrapper<Comp> queryWrapper = QueryGenerator.initQueryWrapper(comp, req.getParameterMap());
Page<Comp> page = new Page<Comp>(pageNo, pageSize); Page<Comp> page = new Page<Comp>(pageNo, pageSize);
IPage<Comp> pageList = compService.page(page, queryWrapper); IPage<Comp> pageList = compService.page(page, queryWrapper);
@ -118,7 +124,7 @@ public class CompController extends JeecgController<Comp, ICompService> {
List<String> list = Arrays.asList(comp.getCompAdmin().split(",")); List<String> list = Arrays.asList(comp.getCompAdmin().split(","));
List list1 = new ArrayList<>(); /* List list1 = new ArrayList<>();
for (String s : list) { for (String s : list) {
LambdaQueryWrapper<SysUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
userLambdaQueryWrapper.eq(SysUser::getUsername, s); userLambdaQueryWrapper.eq(SysUser::getUsername, s);
@ -130,15 +136,11 @@ public class CompController extends JeecgController<Comp, ICompService> {
//一个人只能属于一个部门，可以属于该部门上级部门 //一个人只能属于一个部门，可以属于该部门上级部门
//三级id departIdOne //三级id departIdOne
//二级id //二级id
if ( if (!StringUtils.isBlank(departIdOne)) {
!StringUtils.isBlank(departIdOne)
){
SysDepart depart1 = iSysDepartService.getById(departIdOne); SysDepart depart1 = iSysDepartService.getById(departIdOne);
departIdTwo = depart1.getParentId(); departIdTwo = depart1.getParentId();
} }
if ( if (!StringUtils.isBlank(departIdTwo)) {
!StringUtils.isBlank(departIdTwo)
){
SysDepart depart1 = iSysDepartService.getById(departIdTwo); SysDepart depart1 = iSysDepartService.getById(departIdTwo);
departIdThree = depart1.getParentId(); departIdThree = depart1.getParentId();
} }
@ -152,7 +154,13 @@ public class CompController extends JeecgController<Comp, ICompService> {
list1.add(id); list1.add(id);
} }
String join = Joiner.on(",").join(list1); String join = Joiner.on(",").join(list1);
comp.setCompAdmin(join); comp.setCompAdmin(join);*/
//现业务只有一个有效负责人，值为 sys_user表username modify by zhc 11.21
if(!ObjectUtils.isEmpty(list)){
comp.setCompAdmin(list.get(0));
}
/*--------------------------王家东添加开始============================*/ /*--------------------------王家东添加开始============================*/
//获取比赛类型 //获取比赛类型
Double comptypeweight = compTypeService.getById(comp.getCompTypeId()).getScore(); Double comptypeweight = compTypeService.getById(comp.getCompTypeId()).getScore();

100
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/comp/entity/Comp.java
Unescape View File

@ -1,20 +1,21 @@
package org.jeecg.modules.demo.comp.entity; package org.jeecg.modules.demo.comp.entity;
import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType;
import java.io.UnsupportedEncodingException; import com.baomidou.mybatisplus.annotation.TableField;
import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId;
import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
/** /**
* @Description: 比赛 * @Description: 比赛
@ -30,82 +31,119 @@ import lombok.experimental.Accessors;
public class Comp implements Serializable { public class Comp implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**主键*/ /**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
/**创建人*/ /**
* 创建人
*/
@ApiModelProperty(value = "创建人") @ApiModelProperty(value = "创建人")
private String createBy; private String createBy;
/**创建日期*/ /**
* 创建日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @ApiModelProperty(value = "创建日期")
private Date createTime; private Date createTime;
/**更新人*/ /**
* 更新人
*/
@ApiModelProperty(value = "更新人") @ApiModelProperty(value = "更新人")
private String updateBy; private String updateBy;
/**更新日期*/ /**
* 更新日期
*/
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @ApiModelProperty(value = "更新日期")
private Date updateTime; private Date updateTime;
/**所属部门*/ /**
* 所属部门
*/
@ApiModelProperty(value = "所属部门") @ApiModelProperty(value = "所属部门")
private String sysOrgCode; private String sysOrgCode;
/**比赛名称*/ /**
* 比赛名称
*/
@Excel(name = "比赛名称", width = 15) @Excel(name = "比赛名称", width = 15)
@ApiModelProperty(value = "比赛名称") @ApiModelProperty(value = "比赛名称")
private String compName; private String compName;
/**比赛负责人*/
@Excel(name = "比赛负责人", width = 15, dictTable = "sys_user", dicText = "realname", dicCode = "username") /**
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id") * 比赛负责人
*/
@Excel(name = "比赛负责人", width = 15)
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "username")
@ApiModelProperty(value = "比赛负责人") @ApiModelProperty(value = "比赛负责人")
private String compAdmin; private String compAdmin;
/**比赛简介*/
/**
* 比赛简介
*/
@Excel(name = "比赛简介", width = 15) @Excel(name = "比赛简介", width = 15)
@ApiModelProperty(value = "比赛简介") @ApiModelProperty(value = "比赛简介")
private String compInfo; private String compInfo;
/**比赛logo*/ /**
* 比赛logo
*/
@Excel(name = "比赛logo", width = 15) @Excel(name = "比赛logo", width = 15)
@ApiModelProperty(value = "比赛logo") @ApiModelProperty(value = "比赛logo")
private String compLogo; private String compLogo;
/**比赛图片*/ /**
* 比赛图片
*/
@Excel(name = "比赛图片", width = 15) @Excel(name = "比赛图片", width = 15)
@ApiModelProperty(value = "比赛图片") @ApiModelProperty(value = "比赛图片")
private String compImg; private String compImg;
/**比赛详情*/ /**
* 比赛详情
*/
@Excel(name = "比赛详情", width = 15) @Excel(name = "比赛详情", width = 15)
@ApiModelProperty(value = "比赛详情") @ApiModelProperty(value = "比赛详情")
private String compDetail; private String compDetail;
/**比赛介绍文件*/ /**
* 比赛介绍文件
*/
@Excel(name = "比赛介绍文件", width = 15) @Excel(name = "比赛介绍文件", width = 15)
@ApiModelProperty(value = "比赛介绍文件") @ApiModelProperty(value = "比赛介绍文件")
private String compFile; private String compFile;
/**比赛类型*/ /**
* 比赛类型
*/
@Dict(dictTable = "comp_type", dicText = "type_name", dicCode = "id") @Dict(dictTable = "comp_type", dicText = "type_name", dicCode = "id")
@Excel(name = "比赛类型", width = 15) @Excel(name = "比赛类型", width = 15)
@ApiModelProperty(value = "比赛类型") @ApiModelProperty(value = "比赛类型")
private String compTypeId; private String compTypeId;
/**排名*/ /**
* 排名
*/
@Excel(name = "排名", width = 15) @Excel(name = "排名", width = 15)
@ApiModelProperty(value = "排名") @ApiModelProperty(value = "排名")
private Integer compOrder; private Integer compOrder;
/**负责部门*/ /**
* 负责部门
*/
@Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@ApiModelProperty(value = "负责部门") @ApiModelProperty(value = "负责部门")
private String compOrgan; private String compOrgan;
/**负责部门*/ /**
* 负责部门
*/
/*@Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") /*@Excel(name = "负责部门", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
@ApiModelProperty(value = "负责部门")*/ @ApiModelProperty(value = "负责部门")*/
private Integer compweight; private Integer compweight;
/**
/**比赛类型*/ * 比赛类型
*/
@TableField(exist = false) @TableField(exist = false)
private String compTypeName; private String compTypeName;

90
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/compskill/controller/CompskillController.java
Unescape View File

@ -1,57 +1,45 @@
package org.jeecg.modules.demo.compskill.controller; package org.jeecg.modules.demo.compskill.controller;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.subject.Subject;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.demo.annual.entity.Annual; import org.jeecg.modules.demo.annual.entity.Annual;
import org.jeecg.modules.demo.annual.service.IAnnualService; import org.jeecg.modules.demo.annual.service.IAnnualService;
import org.jeecg.modules.demo.annual.service.impl.AnnualServiceImpl;
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint; import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService; import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
import org.jeecg.modules.demo.annualcomp.entity.AnnualComp; import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService; import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import org.jeecg.modules.demo.annualcomp.vo.AnnualCompVo;
import org.jeecg.modules.demo.annualcompaward.entity.AnnualCompAwardvo;
import org.jeecg.modules.demo.basicsskill.entity.Basicsskill; import org.jeecg.modules.demo.basicsskill.entity.Basicsskill;
import org.jeecg.modules.demo.basicsskill.service.IBasicsskillService; import org.jeecg.modules.demo.basicsskill.service.IBasicsskillService;
import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService;
import org.jeecg.modules.demo.compskill.entity.Compskill; import org.jeecg.modules.demo.compskill.entity.Compskill;
import org.jeecg.modules.demo.compskill.entity.Compskillvo; import org.jeecg.modules.demo.compskill.entity.Compskillvo;
import org.jeecg.modules.demo.compskill.service.ICompskillService; import org.jeecg.modules.demo.compskill.service.ICompskillService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api; import javax.servlet.http.HttpServletRequest;
import io.swagger.annotations.ApiOperation; import javax.servlet.http.HttpServletResponse;
import org.jeecg.common.aspect.annotation.AutoLog; import java.util.Arrays;
import org.apache.shiro.authz.annotation.RequiresPermissions; import java.util.List;
import java.util.Set;
import java.util.TreeSet;
import java.util.stream.Collectors;
/** /**
* @Description: 项目能力设置 * @Description: 项目能力设置
@ -75,6 +63,9 @@ public class CompskillController extends JeecgController<Compskill, ICompskillSe
@Autowired @Autowired
private IAnnualCompService annualCompService; private IAnnualCompService annualCompService;
@Autowired
private ICompService iCompService;
/** /**
* 分页列表查询 * 分页列表查询
@ -92,7 +83,34 @@ public class CompskillController extends JeecgController<Compskill, ICompskillSe
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
QueryWrapper<Compskill> queryWrapper = QueryGenerator.initQueryWrapper(compskill, req.getParameterMap());
Subject subject = SecurityUtils.getSubject();
// 获取当前登录用户
LoginUser loginUser = (LoginUser) subject.getPrincipal();
//角色名称 管理员&教务处可以查看所有
String realname = loginUser.getRealname();
Set<String> annualCompPointIds = new TreeSet<>();
// QueryWrapper<Compskill> queryWrapper = QueryGenerator.initQueryWrapper(compskill, req.getParameterMap());
LambdaQueryWrapper<Compskill> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.equals("管理员", realname) || StringUtils.equals("教务处", realname)) {
} else {
List<Comp> compList = iCompService.list(new LambdaQueryWrapper<Comp>().eq(Comp::getCompAdmin, loginUser.getUsername()));
if (!ObjectUtils.isEmpty(compList)) {
Set<String> compIds = compList.stream().map(c -> c.getId()).collect(Collectors.toSet());
List<AnnualComp> annualCompList = annualCompService.list(new LambdaQueryWrapper<AnnualComp>().in(AnnualComp::getCompid, compIds));
if (!ObjectUtils.isEmpty(annualCompList)) {
Set<String> annualCompIds = annualCompList.stream().map(d -> d.getId()).collect(Collectors.toSet());
List<AnnualCompPoint> annualCompPointList = annualCompPointService.list(new LambdaQueryWrapper<AnnualCompPoint>().in(AnnualCompPoint::getAnnualCompId, annualCompIds));
if (!ObjectUtils.isEmpty(annualCompPointList)) {
annualCompPointIds = annualCompPointList.stream().map(e -> e.getId()).collect(Collectors.toSet());
}
}
}
queryWrapper.in(Compskill::getAnnucompid, annualCompPointIds);
}
Page<Compskill> page = new Page<Compskill>(pageNo, pageSize); Page<Compskill> page = new Page<Compskill>(pageNo, pageSize);
Page<Compskillvo> page1 = new Page<>(); Page<Compskillvo> page1 = new Page<>();
compskillService.page(page, queryWrapper); compskillService.page(page, queryWrapper);

53
jeecgboot-vue3-master/src/views/annualcompaward/AnnualCompAward.data.ts
Unescape View File

@ -1,7 +1,4 @@
import { BasicColumn } from '/@/components/Table'; import {BasicColumn, FormSchema} from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import { rules } from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
let isFirstPrize = ''; let isFirstPrize = '';
let isSecondPrize = ''; let isSecondPrize = '';
@ -25,7 +22,8 @@ export const columns: BasicColumn[] = [
{ {
title: '年度比赛项目', title: '年度比赛项目',
align: 'center', align: 'center',
dataIndex: 'annucompid', // dataIndex: 'annucompid',
dataIndex: 'annucompid_dictText',
}, },
{ {
title: '第一等奖项名称', title: '第一等奖项名称',
@ -105,27 +103,45 @@ export const columns: BasicColumn[] = [
]; ];
//查询数据 //查询数据
export const searchFormSchema: FormSchema[] = []; export const searchFormSchema: FormSchema[] = [];
//表单数据 //表单数据
export const formSchema: FormSchema[] = [ export const formSchema: FormSchema[] = [
{ {
label: '年度比赛项目', label: '年度比赛项目',
field: 'annucompid', field: 'annucompid',
component: 'JPopup', component: 'JDictSelectTag',
componentProps: ({ formActionType }) => { componentProps: {
const { setFieldsValue } = formActionType; dictCode: "annual_comp_point,obj_name,id"
return {
setFieldsValue: setFieldsValue,
code: 'bsxm',
fieldConfig: [{ source: 'obj_name', target: 'annucompid' }],
multi: true,
};
}, },
dynamicRules: ({model, schema}) => { dynamicRules: ({model, schema}) => {
return [{ required: true, message: '请输入年度比赛项目id!' }]; return [
{required: true, message: '请输入年度比赛项目!'},
];
}, },
}, },
// {
//
// label: '年度比赛项目88',
// field: 'annucompid',
// component: 'JPopup',
// componentProps: ({formActionType}) => {
// const {setFieldsValue} = formActionType;
// return {
// setFieldsValue: setFieldsValue,
// code: 'bsxm',
// fieldConfig: [
// {source: 'id', target: 'annucompid'},
// // { source: '名称', target: 'annucompid_dictText' }
// ],
// multi: true,
// };
// },
//
// dynamicRules: ({model, schema}) => {
// return [{required: true, message: '请输入年度比赛项目id!'}];
// },
// },
{ {
label: '是否启用奖项1', label: '是否启用奖项1',
field: 'isFirstPrize', field: 'isFirstPrize',
@ -172,8 +188,7 @@ export const formSchema: FormSchema[] = [
componentProps: { componentProps: {
placeholder: '自定义placeholder', placeholder: '自定义placeholder',
onChange: (e) => { onChange: (e) => {
if(e=='Y') if (e == 'Y') {
{
isThirdPrize = 'N'; isThirdPrize = 'N';
} }
console.log(e); console.log(e);

Write Preview
Loading…
Cancel
Save