From f1e8889a598a7b5bb5e35e16fcb33505ff5e4a3b Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Thu, 29 Apr 2021 15:55:20 +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=E7=BB=93=E6=9E=9C=E5=BD=B1=E5=93=8D=E4=B8=BB=E7=8F=AD?=
 =?UTF-8?q?=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ByDayflowassessmentController.java        | 53 +++++++++++++++----
 .../benyi/ByDayflowassessmentMapper.xml       |  3 ++
 2 files changed, 45 insertions(+), 11 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 b78abd5a6..df7582629 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
@@ -10,6 +10,8 @@ import com.ruoyi.project.benyi.service.IByDayFlowStandardService;
 import com.ruoyi.project.benyi.service.IByDayflowassessmentitemService;
 import com.ruoyi.project.benyi.service.IByDayflowassessmentplanService;
 import com.ruoyi.project.common.SchoolCommon;
+import com.ruoyi.project.system.domain.ByClass;
+import com.ruoyi.project.system.service.IByClassService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -34,9 +36,7 @@ public class ByDayflowassessmentController extends BaseController {
     @Autowired
     private IByDayflowassessmentService byDayflowassessmentService;
     @Autowired
-    private IByDayFlowStandardService byDayFlowStandardService;
-    @Autowired
-    private IByDayflowassessmentplanService byDayflowassessmentplanService;
+    private IByClassService byClassService;
     @Autowired
     private SchoolCommon schoolCommon;
     @Autowired
@@ -118,11 +118,43 @@ public class ByDayflowassessmentController extends BaseController {
     @Log(title = "幼儿园一日流程评估", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ByDayflowassessment byDayflowassessment) {
-        byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
-        byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
-        byDayflowassessment.setXnxq(schoolCommon.getCurrentXnXq());
-        //获取总得分
-        byDayflowassessment.setZzdf(GetDf(byDayflowassessment.getList()));
+        //判断当前评估对象的角色是主班 配班 还是助理教师
+        Long pgdx = byDayflowassessment.getPgdx();
+        //获取班级信息
+        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());
+            //获取总得分
+            byDayflowassessment.setZzdf(GetDf(byDayflowassessment.getList()));
+            //如果评估对象非主班教师，那么对主班教师产生相同的扣分项
+            if (byClass.getZbjs() == pgdx) {
+                int iRows = addDayFlowAssessment(byDayflowassessment);
+                return toAjax(iRows);
+            } else {
+                //评估对象为助理教师和配班教师
+                int iRows = addDayFlowAssessment(byDayflowassessment);
+                ByDayflowassessment byDayflowassessmentNew = byDayflowassessment;
+                if (byClass.getZbjs() == null) {
+                    System.out.println("未设置主班教师");
+                } else {
+                    byDayflowassessmentNew.setPgdx(byClass.getZbjs());//设置评估对象为主班教师
+                    byDayflowassessmentNew.setPgdxxm(byClass.getZbjsxm());
+                    byDayflowassessmentNew.setRemark("被评估："+byDayflowassessment.getId());
+
+                    iRows = iRows + addDayFlowAssessment(byDayflowassessmentNew);
+                }
+                return toAjax(iRows);
+            }
+        } else {
+            return AjaxResult.error("班级信息错误");
+        }
+    }
+
+    //
+    public Integer addDayFlowAssessment(ByDayflowassessment byDayflowassessment) {
         int iRows = byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment);
 
         List<ByDayFlowStandard> list = byDayflowassessment.getList();
@@ -139,13 +171,12 @@ public class ByDayflowassessmentController extends BaseController {
                         byDayflowassessmentitem.setPid(byDayflowassessment.getId());
                         byDayflowassessmentitem.setItem(list.get(i).getId());
                         byDayflowassessmentitem.setValue(dMrz);
-                        byDayflowassessmentitemService.insertByDayflowassessmentitem(byDayflowassessmentitem);
+                        iRows = iRows + byDayflowassessmentitemService.insertByDayflowassessmentitem(byDayflowassessmentitem);
                     }
                 }
             }
         }
-
-        return toAjax(iRows);
+        return iRows;
     }
 
     public Double GetDf(List<ByDayFlowStandard> list) {
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
index ccd9ea35e..a458c173e 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
@@ -28,6 +28,7 @@
         <result property="pgdxxm" column="pgdxxm"/>
         <result property="createUserid" column="create_userid"/>
         <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
         <result property="bjpjf" column="bjpjf"/>
         <result property="zjjdpjf" column="zjjdpjf"/>
         <result property="ycpjf" column="ycpjf"/>
@@ -206,6 +207,7 @@ group by t.pgdx
             <if test="pgdxxm != null ">pgdxxm,</if>
             <if test="createUserid != null ">create_userid,</if>
             <if test="createTime != null ">create_time,</if>
+            <if test="remark != null  and remark != ''">remark,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="planid != null ">#{planid},</if>
@@ -230,6 +232,7 @@ group by t.pgdx
             <if test="pgdxxm != null ">#{pgdxxm},</if>
             <if test="createUserid != null ">#{createUserid},</if>
             <if test="createTime != null ">#{createTime},</if>
+            <if test="remark != null  and remark != ''">#{remark},</if>
         </trim>
     </insert>