From 678ad365aecdce9b6c8453da879fc7470b30f47b Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Wed, 26 May 2021 10:19:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0-=E4=BA=8C=E6=AC=A1=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ByDayflowassessmentController.java        | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
index c6df5d425..da3596723 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
@@ -126,11 +126,15 @@ public class ByDayflowassessmentController extends BaseController {
             String classId = byDayflowassessment.getClassid();
             ByClass byClass = byClassService.selectByClassById(classId);
             if (byClass != null) {
-                byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
-                byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
-                byDayflowassessment.setXnxq(schoolCommon.getCurrentXnXq());
+                Long deptId=SecurityUtils.getLoginUser().getUser().getDeptId();
+                Long userId=SecurityUtils.getLoginUser().getUser().getUserId();
+                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) {
                     int iRows = addDayFlowAssessment(byDayflowassessment);
@@ -138,7 +142,14 @@ public class ByDayflowassessmentController extends BaseController {
                 } else {
                     //评估对象为助理教师和配班教师
                     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) {
                         System.out.println("未设置主班教师");
                     } else {
@@ -157,8 +168,10 @@ public class ByDayflowassessmentController extends BaseController {
         } else {
             //id 不为空，说明是修改
             ByDayflowassessment byDayflowassessmentModel = byDayflowassessmentService.selectByDayflowassessmentById(byDayflowassessment.getId());
-            byDayflowassessmentModel.setZzdf(GetDf(byDayflowassessment.getList()));
+            Double dTotal=GetDf(byDayflowassessment.getList());
+            byDayflowassessmentModel.setZzdf(dTotal);
             byDayflowassessmentModel.setList(byDayflowassessment.getList());
+            byDayflowassessmentModel.setStatus(byDayflowassessment.getStatus());
             //判断当前评估对象的角色是主班 配班 还是助理教师
             Long pgdx = byDayflowassessmentModel.getPgdx();
             //获取班级信息
@@ -170,9 +183,13 @@ public class ByDayflowassessmentController extends BaseController {
                 int iRows = addDayFlowAssessment(byDayflowassessmentModel);
                 return toAjax(iRows);
             } else {
+                //清空item
+                byDayflowassessmentitemService.deleteByDayflowassessmentitemByPid(byDayflowassessmentModel.getId());
                 //评估对象为助理教师和配班教师
                 int iRows = addDayFlowAssessment(byDayflowassessmentModel);
-                ByDayflowassessment byDayflowassessmentNew = byDayflowassessmentModel;
+                ByDayflowassessment byDayflowassessmentNew = new ByDayflowassessment();
+                byDayflowassessmentNew.setZzdf(dTotal);
+                byDayflowassessmentNew.setList(byDayflowassessment.getList());
                 if (byClass.getZbjs() == null) {
                     System.out.println("未设置主班教师");
                 } else {