From c1bdf1c3fe0b37155919e3d8d3cad157c3c1dd54 Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Mon, 24 May 2021 16:55:47 +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 --- .../views/benyi/dayflowassessment/index.vue | 22 +++++++++++++++++++ .../views/benyi/dayflowassessment/teacher.vue | 2 ++ .../ByDayflowassessmentController.java | 1 + .../benyi/domain/ByDayflowassessment.java | 15 +++++++++++++ .../benyi/ByDayflowassessmentMapper.xml | 7 +++++- 5 files changed, 46 insertions(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue index e571935d1..3e4fdbd8d 100644 --- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue +++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue @@ -110,6 +110,15 @@ v-hasPermi="['benyi:dayflowassessment:query']" >详情 + 评估 diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/teacher.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/teacher.vue index 7648a7826..301490a87 100644 --- a/ruoyi-ui/src/views/benyi/dayflowassessment/teacher.vue +++ b/ruoyi-ui/src/views/benyi/dayflowassessment/teacher.vue @@ -233,6 +233,7 @@ export default { pgdxxm: undefined, createUserid: undefined, createTime: undefined, + status: undefined, list: [], }; this.resetForm("form"); @@ -251,6 +252,7 @@ export default { if (action === "confirm") { this.loading = true; this.form.list = this.dayflowstandardList; + this.form.status = "1"; addDayflowassessment(this.form).then((response) => { if (response.code === 200) { this.msgSuccess("评估成功"); 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 df7582629..17e60d04c 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 @@ -142,6 +142,7 @@ public class ByDayflowassessmentController extends BaseController { } else { byDayflowassessmentNew.setPgdx(byClass.getZbjs());//设置评估对象为主班教师 byDayflowassessmentNew.setPgdxxm(byClass.getZbjsxm()); + byDayflowassessmentNew.setStatus("1");//永远是提交状态，因为是助理或配班教师所产生的数据项 byDayflowassessmentNew.setRemark("被评估："+byDayflowassessment.getId()); iRows = iRows + addDayFlowAssessment(byDayflowassessmentNew); diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java index ecb209263..9c4e10a66 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java @@ -155,6 +155,12 @@ public class ByDayflowassessment extends BaseEntity { // @Excel(name = "创建时间") // private Date createTime; + /** + * 状态 + */ + @Excel(name = "状态") + private String status; + public Double getBjpjf() { return bjpjf; } @@ -464,6 +470,14 @@ public class ByDayflowassessment extends BaseEntity { this.byClass = byClass; } + public void setStatus(String status) { + this.status = status; + } + + public String getStatus() { + return status; + } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -508,6 +522,7 @@ public class ByDayflowassessment extends BaseEntity { .append("wxkcpjf", getWxkcpjf()) .append("qkcpjf", getQkcpjf()) .append("byClass", getByClass()) + .append("status", getStatus()) .toString(); } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml index 192fbd455..a6593a539 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml @@ -29,6 +29,7 @@ + @@ -68,7 +69,7 @@ - select d.id, d.planid, d.dept_id, d.classid, e.bjmc, d.bzbh, d.bzxm, d.pbbh, d.pbxm, d.zlbh, d.zlxm, d.xnxq, d.bzid, d.bzmf, d.kfz, d.kfcs, d.zzdf, d.classdf, d.items, d.values, d.pgdx, f.nick_name as pgdxxm, d.create_userid, d.create_time, + select d.id, d.planid, d.dept_id, d.classid, e.bjmc, d.bzbh, d.bzxm, d.pbbh, d.pbxm, d.zlbh, d.zlxm, d.xnxq, d.bzid, d.bzmf, d.kfz, d.kfcs, d.zzdf, d.classdf, d.items, d.values, d.pgdx, f.nick_name as pgdxxm, d.create_userid, d.create_time, d.status, (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 zjjdpjf, (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 ycpjf, (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 zjzqpjf, @@ -208,6 +209,7 @@ group by t.pgdx create_userid, create_time, remark, + status, #{planid}, @@ -233,6 +235,7 @@ group by t.pgdx #{createUserid}, #{createTime}, #{remark}, + #{status}, @@ -261,6 +264,8 @@ group by t.pgdx pgdxxm = #{pgdxxm}, create_userid = #{createUserid}, create_time = #{createTime}, + #{remark}, + #{status}, where id = #{id}