From 9740a679afa460a7308e89435a3f26a5af66ffac Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Fri, 17 Sep 2021 15:11:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=BB=A9=E6=95=88=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/benyi/dayflowassessment/index.vue   | 30 +----------
 .../views/benyi/teacherassessment/index.vue   | 53 ++++++++++---------
 .../benyi/domain/ByTeacherassessment.java     | 14 ++++-
 .../benyi/ByDayflowassessmentMapper.xml       |  4 +-
 .../benyi/ByTeacherassessmentMapper.xml       | 23 +++++++-
 5 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
index 0c4cfb976..102f5cbfe 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
@@ -77,14 +77,12 @@
       <el-table-column
         label="班级名称"
         align="center"
-        prop="classid"
-        :formatter="classFormat"
+        prop="byClass.bjmc"
       />
       <el-table-column
         label="评估对象"
         align="center"
-        prop="pgdx"
-        :formatter="pgdxFormat"
+        prop="pgdxxm"
       />
       <el-table-column label="最终扣分" align="center" prop="zzdf" />
       <el-table-column
@@ -226,18 +224,6 @@ export default {
         this.classOptions = response.rows;
       });
     },
-    // 班级字典翻译
-    classFormat(row, column) {
-      var actions = [];
-      var datas = this.classOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].bjbh == "" + row.classid) {
-          actions.push(datas[key].bjmc);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
     // 学年学期类型--字典状态字典翻译
     xnxqFormat(row, column) {
       return this.selectDictLabel(this.xnxqOptions, row.xnxq);
@@ -249,18 +235,6 @@ export default {
       });
     },
     // 教师字典翻译
-    pgdxFormat(row, column) {
-      var actions = [];
-      var datas = this.userOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].userId == "" + row.pgdx) {
-          actions.push(datas[key].nickName);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
-    // 教师字典翻译
     createUserFormat(row, column) {
       var actions = [];
       var datas = this.userOptions;
diff --git a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
index 05bfea41b..9f82d4f6f 100644
--- a/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/teacherassessment/index.vue
@@ -109,13 +109,7 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="编号" align="center" prop="id" /> -->
-      <el-table-column
-        label="班级"
-        align="center"
-        prop="classid"
-        :formatter="classFormat"
-        fixed
-      />
+      <el-table-column label="班级" align="center" prop="byClass.bjmc" fixed />
       <el-table-column
         label="教师"
         align="center"
@@ -348,7 +342,7 @@ export default {
       }
     },
     "form.classid": function (val) {
-      //console.log(val);
+      console.log(val);
       if (val == "undefined" || val == "" || val == null) {
       } else {
         getUserList(val)
@@ -360,19 +354,40 @@ export default {
       }
     },
     "form.month": function (val) {
-      //console.log(val);
+      console.log(val);
       this.month = val;
     },
     "form.jsid": function (val) {
-      //console.log(val);
+      console.log(val);
       this.queryParams_pg.pgdx = val;
       this.dateRange[0] = this.month + "-01";
-      this.dateRange[1] = this.month + "-31";
+      var y = this.month.split("-")[0];
+      var m = this.month.split("-")[1];
+      if (
+        m == "01" ||
+        m == "03" ||
+        m == "05" ||
+        m == "07" ||
+        m == "08" ||
+        m == "10" ||
+        m == "12"
+      ) {
+        this.dateRange[1] = this.month + "-31";
+      } else if (m == "04" || m == "06" || m == "09" || m == "11") {
+        this.dateRange[1] = this.month + "-30";
+      }else{
+        if(y % 4 == 0 && y % 100 !== 0 || y % 400 == 0){
+          this.dateRange[1] = this.month + "-29";
+        }else{
+          this.dateRange[1] = this.month + "-28";
+        }
+      }
+
       //console.log(this.dateRange);
       listDayflowassessmentbyJsid(
         this.addDateRange(this.queryParams_pg, this.dateRange)
       ).then((response) => {
-        //console.log(response);
+        console.log(response);
         var total = 100;
         response.rows.forEach((item) => {
           total = total + item.zzdf;
@@ -387,6 +402,7 @@ export default {
     getList() {
       this.loading = true;
       listTeacherassessment(this.queryParams).then((response) => {
+        //console.log(response.rows);
         this.teacherassessmentList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -408,19 +424,6 @@ export default {
         this.userOptions = response.rows;
       });
     },
-    // 字典翻译
-    classFormat(row, column) {
-      // return this.selectDictLabel(this.classOptions, row.classid);
-      var actions = [];
-      var datas = this.classOptions;
-      Object.keys(datas).map((key) => {
-        if (datas[key].bjbh == "" + row.classid) {
-          actions.push(datas[key].bjmc);
-          return false;
-        }
-      });
-      return actions.join("");
-    },
     userFormat(row, column) {
       var actions = [];
       var datas = this.userOptions;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java
index a2a2899fe..78f4e874f 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByTeacherassessment.java
@@ -1,5 +1,6 @@
 package com.ruoyi.project.benyi.domain;
 
+import com.ruoyi.project.system.domain.ByClass;
 import com.ruoyi.project.system.domain.SysDept;
 import com.ruoyi.project.system.domain.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -91,6 +92,16 @@ public class ByTeacherassessment extends BaseEntity {
 
     private SysUser sysUser;
 
+    public ByClass getByClass() {
+        return byClass;
+    }
+
+    public void setByClass(ByClass byClass) {
+        this.byClass = byClass;
+    }
+
+    private ByClass byClass;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -194,7 +205,8 @@ public class ByTeacherassessment extends BaseEntity {
                 .append("wsbl", getWsbl())
                 .append("zfbl", getZfbl())
                 .append("createTime", getCreateTime())
-                .append("sysUser",getSysUser())
+                .append("sysUser", getSysUser())
+                .append("byClass", getByClass())
                 .toString();
     }
 }
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
index 245334b93..53d6fd334 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
@@ -85,7 +85,9 @@
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='规则与纪律约束')) as gzyjlyspjf,
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='微型课程')) as wxkcpjf,
 (select sum(b.value) from by_dayflowassessmentitem b where d.id=b.pid and b.item in (select id from by_day_flow where name='潜课程')) as qkcpjf
-         from by_dayflowassessment d left join by_class e on d.classid=e.bjbh left join sys_user f on d.pgdx=f.user_id
+         from by_dayflowassessment d
+         left join by_class e on d.classid=e.bjbh
+         left join sys_user f on d.pgdx=f.user_id
     </sql>
 
     <select id="selectByDayflowassessmentList" parameterType="ByDayflowassessment"
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml
index 02829c6c3..6919e3bea 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByTeacherassessmentMapper.xml
@@ -18,6 +18,7 @@
         <result property="zfbl" column="zfbl"/>
         <result property="createTime" column="create_time"/>
         <association property="sysUser" column="jsid" javaType="SysUser" resultMap="SysUserResult"/>
+        <association property="byClass" column="classid" javaType="ByClass" resultMap="ByClassResult"/>
     </resultMap>
 
     <resultMap type="SysUser" id="SysUserResult">
@@ -26,9 +27,29 @@
         <result property="nickName" column="nick_name"/>
     </resultMap>
 
+    <resultMap type="ByClass" id="ByClassResult">
+        <result property="bjbh" column="bjbh"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="bjtype" column="bjtype"/>
+        <result property="bhxh" column="bhxh"/>
+        <result property="xn" column="xn"/>
+        <result property="bjmc" column="bjmc"/>
+        <result property="bjrych" column="bjrych"/>
+        <result property="jbny" column="jbny"/>
+        <result property="zbjs" column="zbjs"/>
+        <result property="zbjsxm" column="zbjsxm"/>
+        <result property="pbjs" column="pbjs"/>
+        <result property="pbjsxm" column="pbjsxm"/>
+        <result property="zljs" column="zljs"/>
+        <result property="zljsxm" column="zljsxm"/>
+        <result property="isdel" column="isdel"/>
+        <result property="createtime" column="createtime"/>
+    </resultMap>
+
     <sql id="selectByTeacherassessmentVo">
-        select a.id, a.jsid, a.classid, a.dept_id, a.month, a.yrlcbl, a.jskqbl, a.yekqbl, a.sgbl, a.wsbl, a.zfbl, a.create_time,b.nick_name from by_teacherassessment a
+        select a.id, a.jsid, a.classid, c.bjmc, a.dept_id, a.month, a.yrlcbl, a.jskqbl, a.yekqbl, a.sgbl, a.wsbl, a.zfbl, a.create_time,b.nick_name from by_teacherassessment a
         left join sys_user b on a.jsid=b.user_id
+        left join by_class c on a.classid=c.bjbh
     </sql>
 
     <select id="selectByTeacherassessmentList" parameterType="ByTeacherassessment"