Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

一日流程评估-二次评估

Browse Source
This commit is contained in:
zhanglipeng 2021-05-26 10:19:55 +08:00
parent 92f4556d22
commit 678ad365ae
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
View File

@ -126,11 +126,15 @@ public class ByDayflowassessmentController extends BaseController {
String classId = byDayflowassessment.getClassid(); String classId = byDayflowassessment.getClassid();
ByClass byClass = byClassService.selectByClassById(classId); ByClass byClass = byClassService.selectByClassById(classId);
if (byClass != null) { if (byClass != null) {
byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId()); Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId()); Long userId=SecurityUtils.getLoginUser().getUser().getUserId();
byDayflowassessment.setXnxq(schoolCommon.getCurrentXnXq()); String xnXq=schoolCommon.getCurrentXnXq();
byDayflowassessment.setDeptId(deptId);
byDayflowassessment.setCreateUserid(userId);
byDayflowassessment.setXnxq(xnXq);
//获取总得分 //获取总得分
byDayflowassessment.setZzdf(GetDf(byDayflowassessment.getList())); Double dTotal=GetDf(byDayflowassessment.getList());
byDayflowassessment.setZzdf(dTotal);
//如果评估对象非主班教师，那么对主班教师产生相同的扣分项 //如果评估对象非主班教师，那么对主班教师产生相同的扣分项
if (byClass.getZbjs() == pgdx) { if (byClass.getZbjs() == pgdx) {
int iRows = addDayFlowAssessment(byDayflowassessment); int iRows = addDayFlowAssessment(byDayflowassessment);
@ -138,7 +142,14 @@ public class ByDayflowassessmentController extends BaseController {
} else { } else {
//评估对象为助理教师和配班教师 //评估对象为助理教师和配班教师
int iRows = addDayFlowAssessment(byDayflowassessment); int iRows = addDayFlowAssessment(byDayflowassessment);
ByDayflowassessment byDayflowassessmentNew = byDayflowassessment; ByDayflowassessment byDayflowassessmentNew = new ByDayflowassessment();
byDayflowassessmentNew.setClassid(classId);
byDayflowassessmentNew.setDeptId(deptId);
byDayflowassessmentNew.setCreateUserid(userId);
byDayflowassessmentNew.setXnxq(xnXq);
//获取总得分
byDayflowassessmentNew.setZzdf(dTotal);
if (byClass.getZbjs() == null) { if (byClass.getZbjs() == null) {
System.out.println("未设置主班教师"); System.out.println("未设置主班教师");
} else { } else {
@ -157,8 +168,10 @@ public class ByDayflowassessmentController extends BaseController {
} else { } else {
//id 不为空，说明是修改 //id 不为空，说明是修改
ByDayflowassessment byDayflowassessmentModel = byDayflowassessmentService.selectByDayflowassessmentById(byDayflowassessment.getId()); ByDayflowassessment byDayflowassessmentModel = byDayflowassessmentService.selectByDayflowassessmentById(byDayflowassessment.getId());
byDayflowassessmentModel.setZzdf(GetDf(byDayflowassessment.getList())); Double dTotal=GetDf(byDayflowassessment.getList());
byDayflowassessmentModel.setZzdf(dTotal);
byDayflowassessmentModel.setList(byDayflowassessment.getList()); byDayflowassessmentModel.setList(byDayflowassessment.getList());
byDayflowassessmentModel.setStatus(byDayflowassessment.getStatus());
//判断当前评估对象的角色是主班 配班 还是助理教师 //判断当前评估对象的角色是主班 配班 还是助理教师
Long pgdx = byDayflowassessmentModel.getPgdx(); Long pgdx = byDayflowassessmentModel.getPgdx();
//获取班级信息 //获取班级信息
@ -170,9 +183,13 @@ public class ByDayflowassessmentController extends BaseController {
int iRows = addDayFlowAssessment(byDayflowassessmentModel); int iRows = addDayFlowAssessment(byDayflowassessmentModel);
return toAjax(iRows); return toAjax(iRows);
} else { } else {
//清空item
byDayflowassessmentitemService.deleteByDayflowassessmentitemByPid(byDayflowassessmentModel.getId());
//评估对象为助理教师和配班教师 //评估对象为助理教师和配班教师
int iRows = addDayFlowAssessment(byDayflowassessmentModel); int iRows = addDayFlowAssessment(byDayflowassessmentModel);
ByDayflowassessment byDayflowassessmentNew = byDayflowassessmentModel; ByDayflowassessment byDayflowassessmentNew = new ByDayflowassessment();
byDayflowassessmentNew.setZzdf(dTotal);
byDayflowassessmentNew.setList(byDayflowassessment.getList());
if (byClass.getZbjs() == null) { if (byClass.getZbjs() == null) {
System.out.println("未设置主班教师"); System.out.println("未设置主班教师");
} else { } else {