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

Merge remote-tracking branch 'origin/main'

Browse Source
main
王家东 5 months ago
parent a5eeddddf2 d2f39e82c9
commit cde521505b
3 changed files with 37 additions and 2 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. 31
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/controller/AwardPersionController.java
  2. 4
      jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/entity/AwardPersion.java
  3. 4
      jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue

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

@ -41,6 +41,9 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.modules.demo.comp.entity.Comp;
import org.jeecg.modules.demo.comp.service.ICompService;
import org.jeecg.modules.system.entity.SysUser;
import org.jeecg.modules.system.entity.SysUserDepart;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecg.modules.system.service.ISysUserDepartService;
import org.jeecg.modules.system.service.ISysUserService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@ -88,6 +91,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
private ISysUserService sysUserService;
@Resource
private JeecgBaseConfig jeecgBaseConfig;
@Autowired
private ISysUserDepartService sysUserDepartService;
@Autowired
private ISysDepartService sysDepartService;
/**
* 分页列表查询
@ -197,6 +204,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
SysUser sysUser = sysUserService.getById(listtm1.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername());
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());
awardPersionService.save(awardPersion);
AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP());
annualCompPoint.setIsPj(1);
@ -206,6 +217,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername());
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());
awardPersionService.save(awardPersion);
AnnualCompPoint annualCompPoint = annualCompPointService.getById(awardPersion.getAnnualCompP());
annualCompPoint.setIsPj(1);
@ -255,12 +270,20 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
SysUser sysUser = sysUserService.getById(listtm1.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername());
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());
awardPersionService.updateById(awardPersion);
return Result.OK("编辑成功!");
}else {
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
awardPersion.setStudentname(sysUser.getRealname());
awardPersion.setStudentcode(sysUser.getUsername());
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());
awardPersionService.updateById(awardPersion);
return Result.OK("编辑成功!");
}
@ -459,6 +482,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
queryWrappertm1.eq("captain","1");
List<TeamManagement> listtm1 = teamManagementService.list(queryWrappertm1);
SysUser sysUser = sysUserService.getById(listtm1.get(0).getUserId());
SysUserDepart sysUserDepart = new SysUserDepart(null,null);
QueryWrapper<SysUserDepart> queryWrappersud = QueryGenerator.initQueryWrapper(sysUserDepart, request.getParameterMap());
queryWrappersud.eq("user_id",sysUser.getId());
list.get(i).setStudentorg(sysDepartService.getById(sysUserDepartService.getOne(queryWrappersud).getDepId()).getOrgCode());
if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(1);
list.get(i).setAwardid(listaca.get(0).getId());
@ -490,6 +517,10 @@ public class AwardPersionController extends JeecgController<AwardPersion, IAward
}else {
SysUser sysUser = sysUserService.getById(listtm.get(0).getUserId());
SysUserDepart sysUserDepart = new SysUserDepart(null,null);
QueryWrapper<SysUserDepart> queryWrappersud = QueryGenerator.initQueryWrapper(sysUserDepart, request.getParameterMap());
queryWrappersud.eq("user_id",sysUser.getId());
list.get(i).setStudentorg(sysDepartService.getById(sysUserDepartService.getOne(queryWrappersud).getDepId()).getOrgCode());
if(listaca.get(0).getFirstPrize().equals(list.get(i).getAwardname())){
list.get(i).setAwardsort(1);
list.get(i).setAwardid(listaca.get(0).getId());

4
jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/awardpersion/entity/AwardPersion.java
Unescape View File

@ -109,4 +109,8 @@ public class AwardPersion implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "角色标识")
private String rolename;
/**学生所属学院*/
@ApiModelProperty(value = "学生所属学院")
private String studentorg;
}

4
jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
Unescape View File

@ -358,12 +358,12 @@
onClick: handlePersonalAbilityEvaluation.bind(null, record),
});
}
if (record.isCjhz == 1 && record.annualCompState != "9") {
/* if (record.isCjhz == 1 && record.annualCompState != "9") {
actions.unshift({
label: '同分复评',
onClick: cltongfenfuping.bind(null, record),
});
}
}*/
/* if (record.annualCompState === "8") {
actions.unshift({
label: '评奖',

Write Preview
Loading…
Cancel
Save