zhc077
/
hnjd_comp
forked from wangjiadong/comp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://182.92.169.222:3000/zhc077/hnjd_comp

Browse Source
main
喻忠伟 4 months ago
parent faed248d94 59c8c54318
commit b8dc79923d
4 changed files with 601 additions and 404 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 242
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualcompetitionprojectregistration/controller/AnnualCompetitionProjectRegistrationController.java
  2. 82
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
  3. 20
      jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionForm.vue
  4. 1
      jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue

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

@ -18,6 +18,8 @@ import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.demo.annual.service.IAnnualService;
import org.jeecg.modules.demo.annualCompPoint.entity.AnnualCompPoint;
import org.jeecg.modules.demo.annualCompPoint.service.IAnnualCompPointService;
import org.jeecg.modules.demo.annualScore.entity.PersonalCompScore;
import org.jeecg.modules.demo.annualScore.service.IPersonalCompScoreService;
import org.jeecg.modules.demo.annualcomp.entity.AnnualComp;
import org.jeecg.modules.demo.annualcomp.service.IAnnualCompService;
import org.jeecg.modules.demo.annualcompetitionprojectregistration.entity.AnnualCompetitionProjectRegistration;
@ -92,6 +94,8 @@ public class AnnualCompetitionProjectRegistrationController {
private ICompService compService;
@Autowired
private IAwardPersionService awardPersionService;
@Autowired
private IPersonalCompScoreService personalCompScoreService;
/**
@ -985,13 +989,14 @@ public class AnnualCompetitionProjectRegistrationController {
QueryWrapper<Comp> queryWrappercomp = QueryGenerator.initQueryWrapper(comp, req.getParameterMap());
queryWrappercomp.like("comp_admin", user.getUsername());
List<Comp> list = compService.list(queryWrappercomp);
Map<String, Object> map = new HashMap<>();
if (list.size() > 0) {
List<String> ids = list.stream().map(Comp::getId).collect(Collectors.toList());
QueryWrapper<AnnualComp> queryWrapperAnnual = new QueryWrapper<>();
queryWrapperAnnual.in(ids.size() != 0, "compid", ids);
queryWrapperAnnual.orderByDesc("create_time");
List<AnnualComp> annualCompList = annualCompService.list(queryWrapperAnnual);
//List<AnnualComp> annualCompList = getZXAnnualComp(req);
Map<String, Object> map = new HashMap<>();
if (annualCompList.size() > 0) {
//年度比赛名称
map.put("annualCompName", annualCompList.get(0).getName());
//共多少届以及当前第几届
@ -1036,6 +1041,7 @@ public class AnnualCompetitionProjectRegistrationController {
map.put("qwtxmList", xmListMap);
//参加比赛队伍数(报名数)
if(listacp.size()>0){
List<String> acpIds = listacp.stream().map(AnnualCompPoint::getId).collect(Collectors.toList());
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap());
@ -1046,6 +1052,11 @@ public class AnnualCompetitionProjectRegistrationController {
//参数人数
if (listbm.size() == 0) {
map.put("csNumber", 0);
map.put("ydjNumber", 0);
map.put("edjNumber", 0);
map.put("sdjNumber", 0);
map.put("sidjNumber", 0);
map.put("wdjNumber", 0);
} else {
TeamManagement teamManagement = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
@ -1195,11 +1206,234 @@ public class AnnualCompetitionProjectRegistrationController {
}
map.put("bmxsxxList", bmxsxxListMap);
}
}
}
}
}
return Result.OK(map);
}
/**
* 学生角色首页比赛数据接口
*
* @param req
* @return
*/
@ApiOperation(value="学生角色首页比赛数据接口", notes="学生角色首页比赛数据接口")
@GetMapping(value = "/xssybsjs")
public Result<?> xssybsjs( HttpServletRequest req) {
//获取当前登录用户
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
TeamManagement teamManagement = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
queryWrappertm.eq("user_id",user.getId());
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
Map<String, Object> map = new HashMap<>();
if(listtm.size()!=0){
//学生参加比赛的所有报名编号
List<String> bmbhs = listtm.stream().map(TeamManagement::getEnrollCode).collect(Collectors.toList());
//查询报名表报名编号对应的所有年度比赛项目id
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrapperbm = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap());
queryWrapperbm.in("enroll_code",bmbhs);
queryWrapperbm.eq("enroll_static", "2");
List<AnnualCompetitionProjectRegistration> listbm = annualCompetitionProjectRegistrationService.list(queryWrapperbm);
//参加比赛项目数量
map.put("cjbsxmsl",listbm.size());
if(listbm.size()!=0){
//年度比赛项目ids
List<String> ndbsxmids = listbm.stream().map(AnnualCompetitionProjectRegistration::getAnnualCompid).collect(Collectors.toList());
AnnualCompPoint annualCompPoint = new AnnualCompPoint();
QueryWrapper<AnnualCompPoint> queryWrapperacp = QueryGenerator.initQueryWrapper(annualCompPoint, req.getParameterMap());
queryWrapperacp.in("id",ndbsxmids);
List<AnnualCompPoint> listacp = annualCompPointService.list(queryWrapperacp);
//报名比赛项目
List<Map<String,Object>> xmListMap = new ArrayList<>();
if(listacp.size()>6){
for (int k = 0 ; k < 6 ; k++){
Map<String, Object> map2 = new HashMap<>();
//项目名称
map2.put("xmname",listacp.get(k).getObjName());
//参与形式
map2.put("cyxs",listacp.get(k).getEntryForm().equals("N") ? "个人":"团队");
//项目id
map2.put("xmid",listacp.get(k).getId());
//状态
Date date = new Date();
if(date.getTime()>=listacp.get(k).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(k).getApplyEndTime().getTime()){
map2.put("zt","报名");
}
if(date.getTime()>=listacp.get(k).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(k).getTopicEndTime().getTime()){
map2.put("zt","选题");
}
if(date.getTime()>=listacp.get(k).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(k).getUploadEndTime().getTime()){
map2.put("zt","上传作品");
}
if(date.getTime()>=listacp.get(k).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","评分");
}
if(date.getTime()>listacp.get(k).getScoreEndTime().getTime()){
map2.put("zt","已结束");
}
xmListMap.add(map2);
}
}else {
for (int o = 0 ; o < listacp.size() ; o++){
Map<String, Object> map3 = new HashMap<>();
//项目名称
map3.put("xmname",listacp.get(o).getObjName());
//参与形式
map3.put("cyxs",listacp.get(o).getEntryForm().equals("N") ? "个人":"团队");
//项目id
map3.put("xmid",listacp.get(o).getId());
//状态
Date date = new Date();
if(date.getTime()>=listacp.get(o).getApplyStartTime().getTime()&&date.getTime()<=listacp.get(o).getApplyEndTime().getTime()){
map3.put("zt","报名");
}
if(date.getTime()>=listacp.get(o).getTopicStartTime().getTime()&&date.getTime()<=listacp.get(o).getTopicEndTime().getTime()){
map3.put("zt","选题");
}
if(date.getTime()>=listacp.get(o).getUploadStartTime().getTime()&&date.getTime()<=listacp.get(o).getUploadEndTime().getTime()){
map3.put("zt","上传作品");
}
if(date.getTime()>=listacp.get(o).getScoreStartTime().getTime()&&date.getTime()<=listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","评分");
}
if(date.getTime()>listacp.get(o).getScoreEndTime().getTime()){
map3.put("zt","已结束");
}
xmListMap.add(map3);
}
}
map.put("bmbsxm",xmListMap);
int gjj = 0;
int shengj = 0;
int shij = 0;
int xj = 0;
for (int i = 0 ; i < listacp.size() ; i++){
if(listacp.get(i).getObjLevel().equals("1809121223401168898")){
//国家
gjj = gjj+1;
}
if(map.isEmpty()){
return Result.error("无可用的比赛项目");
if(listacp.get(i).getObjLevel().equals("1809121301201313793")){
//省
shengj = shengj+1;
}
if(listacp.get(i).getObjLevel().equals("1809121356582903809")){
//市
shij = shij+1;
}
if(listacp.get(i).getObjLevel().equals("1809121454654119937")){
//校
xj = xj+1;
}
}
map.put("gjj",gjj);
map.put("shengj",shengj);
map.put("shij",shij);
map.put("xj",xj);
}else{
map.put("gjj",0);
map.put("shengj",0);
map.put("shij",0);
map.put("xj",0);
}
//获奖数
//一等奖数
AwardPersion awardPersion1 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap1 = QueryGenerator.initQueryWrapper(awardPersion1, req.getParameterMap());
queryWrapperap1.eq("awardsort",1);
queryWrapperap1.eq("studentcode",user.getUsername());
queryWrapperap1.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list1 = awardPersionService.list(queryWrapperap1);
map.put("ydjNumber",list1.size());
//二等奖数
AwardPersion awardPersion2 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap2 = QueryGenerator.initQueryWrapper(awardPersion2, req.getParameterMap());
queryWrapperap2.eq("awardsort",2);
queryWrapperap2.eq("studentcode",user.getUsername());
queryWrapperap2.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list2 = awardPersionService.list(queryWrapperap2);
map.put("edjNumber",list2.size());
//三等奖数
AwardPersion awardPersion3 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap3 = QueryGenerator.initQueryWrapper(awardPersion3, req.getParameterMap());
queryWrapperap3.eq("awardsort",3);
queryWrapperap3.eq("studentcode",user.getUsername());
queryWrapperap3.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list3 = awardPersionService.list(queryWrapperap3);
map.put("sdjNumber",list3.size());
//四等奖数
AwardPersion awardPersion4 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap4 = QueryGenerator.initQueryWrapper(awardPersion4, req.getParameterMap());
queryWrapperap4.eq("awardsort",4);
queryWrapperap4.eq("studentcode",user.getUsername());
queryWrapperap4.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list4 = awardPersionService.list(queryWrapperap4);
map.put("sidjNumber",list4.size());
//五等奖数
AwardPersion awardPersion5 = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperap5 = QueryGenerator.initQueryWrapper(awardPersion5, req.getParameterMap());
queryWrapperap5.eq("awardsort",5);
queryWrapperap5.eq("studentcode",user.getUsername());
queryWrapperap5.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> list5 = awardPersionService.list(queryWrapperap5);
map.put("wdjNumber",list5.size());
//所有奖项(前六条)
AwardPersion awardPersionAll = new AwardPersion();
QueryWrapper<AwardPersion> queryWrapperapAll = QueryGenerator.initQueryWrapper(awardPersionAll, req.getParameterMap());
queryWrapperapAll.eq("studentcode",user.getUsername());
queryWrapperapAll.in(bmbhs.size()!=0,"enroll_code",bmbhs);
List<AwardPersion> listAll = awardPersionService.list(queryWrapperapAll);
List<Map<String,Object>> allApListMap = new ArrayList<>();
if(listAll.size()>6){
for (int y = 0 ; y < 6; y++){
Map<String, Object> mapall1 = new HashMap<>();
mapall1.put("jxname",listAll.get(y).getAwardname());
mapall1.put("ndbs",annualCompService.getById(listAll.get(y).getAnnalComp()).getName());
mapall1.put("ndbsxm",annualCompPointService.getById(listAll.get(y).getAnnualCompP()).getObjName());
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>();
queryWrapperpcs.eq("annual_comp_id",listAll.get(y).getAnnalComp());
queryWrapperpcs.eq("annual_comp_p",listAll.get(y).getAnnualCompP());
queryWrapperpcs.eq("work_on",user.getUsername());
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall1.put("jf",0);
}else {
mapall1.put("jf",listpcs.get(0).getScore());
}
allApListMap.add(mapall1);
}
}else{
for (int n = 0 ; n < listAll.size(); n++){
Map<String, Object> mapall2 = new HashMap<>();
mapall2.put("jxname",listAll.get(n).getAwardname());
mapall2.put("ndbs",annualCompService.getById(listAll.get(n).getAnnalComp()).getName());
mapall2.put("ndbsxm",annualCompPointService.getById(listAll.get(n).getAnnualCompP()).getObjName());
QueryWrapper<PersonalCompScore> queryWrapperpcs = new QueryWrapper<>();
queryWrapperpcs.eq("annual_comp_id",listAll.get(n).getAnnalComp());
queryWrapperpcs.eq("annual_comp_p",listAll.get(n).getAnnualCompP());
queryWrapperpcs.eq("work_on",user.getUsername());
List<PersonalCompScore> listpcs = personalCompScoreService.list(queryWrapperpcs);
if(listpcs.size()==0){
mapall2.put("jf",0);
}else {
mapall2.put("jf",listpcs.get(0).getScore());
}
allApListMap.add(mapall2);
}
}
map.put("allApList",allApListMap);
}
return Result.OK(map);
}

82
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
Unescape View File

@ -221,37 +221,17 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, req.getParameterMap());
queryWrappertm.eq("enroll_code",awardPersion.getEnrollCode());
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
if(listtm.size()>1){
TeamManagement teamManagement1 = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm1 = QueryGenerator.initQueryWrapper(teamManagement1, req.getParameterMap());
queryWrappertm1.eq("enroll_code",awardPersion.getEnrollCode());
queryWrappertm1.eq("captain","1");
List<TeamManagement> listtm1 = teamManagementService.list(queryWrappertm1);
SysUser sysUser = sysUserService.getById(listtm1.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername());
awardPersion.setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getOrgCode());
awardPersionService.save(awardPersion);
AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP());
annualCompPoint.setIsPj(1);
annualCompPointService.updateById(annualCompPoint);
return Result.OK("添加成功！");
}else {
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
for (int l = 0 ; l < listtm.size() ; l++){
SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId());
awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername());
awardPersion.setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getOrgCode());
awardPersionService.save(awardPersion);
}
AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP());
annualCompPoint.setIsPj(1);
annualCompPointService.updateById(annualCompPoint);
return Result.OK("添加成功！");
/* SysUserDepart sysUserDepart = new SysUserDepart(null,null);
QueryWrapper<SysUserDepart> queryWrappersud = QueryGenerator.initQueryWrapper(sysUserDepart, req.getParameterMap());
queryWrappersud.eq("user_id",sysUser.getId());
awardPersion.setStudentorg(sysDepartService.getById(sysUserDepartService.getOne(queryWrappersud).getDepId()).getOrgCode());*/
}
}
}
@ -267,7 +247,7 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
//@RequiresPermissions("awardpersion:award_persion:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<String> edit(@RequestBody AwardPersion awardPersion,HttpServletRequest req) {
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
/* AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrappera = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, req.getParameterMap());
queryWrappera.eq("annual_compid",awardPersion.getAnnualCompP());
queryWrappera.eq("enroll_static","2");
@ -306,7 +286,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
return Result.OK("编辑成功!");
}
}
}*/
awardPersionService.updateById(awardPersion);
return Result.OK("编辑成功!");
}
@ -500,6 +483,7 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
params.setNeedSave(true);
try {
List<AwardPersion> list = ExcelImportUtil.importExcel(file.getInputStream(), AwardPersion.class, params);
List<AwardPersion> listsave = new ArrayList<>();
for(int i = 0 ; i < list.size() ; i++){
AnnualCompetitionProjectRegistration annualCompetitionProjectRegistration = new AnnualCompetitionProjectRegistration();
QueryWrapper<AnnualCompetitionProjectRegistration> queryWrappera = QueryGenerator.initQueryWrapper(annualCompetitionProjectRegistration, request.getParameterMap());
@ -525,71 +509,39 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
QueryWrapper<TeamManagement> queryWrappertm = QueryGenerator.initQueryWrapper(teamManagement, request.getParameterMap());
queryWrappertm.eq("enroll_code",list.get(i).getEnrollCode());
List<TeamManagement> listtm = teamManagementService.list(queryWrappertm);
if(listtm.size()>1){
TeamManagement teamManagement1 = new TeamManagement();
QueryWrapper<TeamManagement> queryWrappertm1 = QueryGenerator.initQueryWrapper(teamManagement1, request.getParameterMap());
queryWrappertm1.eq("enroll_code",list.get(i).getEnrollCode());
queryWrappertm1.eq("captain","1");
List<TeamManagement> listtm1 = teamManagementService.list(queryWrappertm1);
SysUser sysUser = sysUserService.getById(listtm1.get(0).getUserId());
list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getOrgCode());
if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(1);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
}else if(listaca.get(0).getSecondPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(2);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
}else if(listaca.get(0).getThirdPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(3);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
}else if(listaca.get(0).getFourthPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(4);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
}else if(listaca.get(0).getFifthPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(5);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
}else {
return Result.error("文件导入失败:第"+(i+1)+"行奖项名称不存在");
}
}else {
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
for (int l = 0 ; l < listtm.size() ; l++){
SysUser sysUser = sysUserService.getById(listtm.get(l).getUserId());
list.get(i).setStudentorg(sysDepartService.queryDepartsByUsername(sysUser.getUsername()).get(0).getOrgCode());
if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(1);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
listsave.add(list.get(i));
}else if(listaca.get(0).getSecondPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(2);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
listsave.add(list.get(i));
}else if(listaca.get(0).getThirdPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(3);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
listsave.add(list.get(i));
}else if(listaca.get(0).getFourthPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(4);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
listsave.add(list.get(i));
}else if(listaca.get(0).getFifthPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(5);
list.get(i).setAwardid(listaca.get(0).getId());
list.get(i).setStudentcode(sysUser.getUsername());
list.get(i).setStudentname(sysUser.getRealname());
listsave.add(list.get(i));
}else {
return Result.error("文件导入失败:第"+(i+1)+"行奖项名称不存在");
}
@ -597,7 +549,7 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
}
//update-begin-author:taoyan date:20190528 for:批量插入数据
long start = System.currentTimeMillis();
awardPersionService.saveBatch(list);
awardPersionService.saveBatch(listsave);
for (int k = 0 ; k < list.size() ; k++){
AnnualCompPoint annualCompPoint = annualCompPointService.getById(list.get(k).getAnnualCompP());
annualCompPoint.setIsPj(1);

20
jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionForm.vue
Unescape View File

@ -4,27 +4,29 @@
<a-row>
<a-col :span="24">
<a-form-item label="年度" v-bind="validateInfos.annualid">
<j-dict-select-tag v-model:value="formData.annualid" dictCode="annual,annual_name,id" placeholder="请选择年度" :disabled="disabled"/>
<j-dict-select-tag v-model:value="formData.annualid" dictCode="annual,annual_name,id" placeholder="请选择年度"
:disabled="disabled || isT" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="年度比赛" v-bind="validateInfos.annalComp">
<j-search-select v-model:value="formData.annalComp" :dict="strst" :disabled="disabled" />
<j-search-select v-model:value="formData.annalComp" :dict="strst" :disabled="disabled || isT" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="年度比赛项目" v-bind="validateInfos.annualCompP">
<j-search-select v-model:value="formData.annualCompP" :dict="ndbsxm" :disabled="disabled" />
<j-search-select v-model:value="formData.annualCompP" :dict="ndbsxm" :disabled="disabled || isT" />
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="报名编号" v-bind="validateInfos.enrollCode">
<a-input v-model:value="formData.enrollCode" placeholder="请输入报名编号" :disabled="disabled"></a-input>
<a-input v-model:value="formData.enrollCode" placeholder="请输入报名编号" :disabled="disabled || isT"></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="奖项名称" v-bind="validateInfos.awardname">
<j-dict-select-tag v-model:value="formData.awardname" dictCode="" :options="options" placeholder="请选择奖项名称" :disabled="disabled"/>
<j-dict-select-tag v-model:value="formData.awardname" dictCode="" :options="options" placeholder="请选择奖项名称"
:disabled="disabled" />
</a-form-item>
</a-col>
<!-- <a-col :span="24">
@ -133,6 +135,13 @@
}
});
/**
* 特定的禁用
*/
let isT = ref(false)
function setIsT(bool=false){
isT.value=bool
}
/**
* 新增
@ -205,6 +214,7 @@
add,
edit,
submitForm,
setIsT
});
</script>

1
jeecgboot-vue3-master/src/views/awardpersion/components/AwardPersionModal.vue
Unescape View File

@ -35,6 +35,7 @@
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);
registerForm.value.setIsT(true);
});
}

Write Preview
Loading…
Cancel
Save