From acdd617cbd406aeee1254393f7641b363c37073a Mon Sep 17 00:00:00 2001
From: sk1551 <15175617877@163.com>
Date: Mon, 22 Feb 2021 18:10:02 +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=E8=AE=A1=E5=88=92=E5=90=8D=E7=A7=B0=E8=87=AA=E5=8A=A8?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96&=E4=B8=80=E6=97=A5=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E8=AF=84=E4=BC=B0=E7=8F=AD=E7=BA=A7=E6=95=99=E5=B8=88=E8=8E=B7?=
=?UTF-8?q?=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/benyi/dayflowassessment/index.vue | 175 ++++++++++++++----
.../benyi/dayflowassessmentplan/index.vue | 4 +-
.../ByDayflowassessmentController.java | 2 +
.../ByDayflowassessmentplanController.java | 30 +++
.../benyi/domain/ByDayflowassessmentplan.java | 14 ++
.../benyi/ByDayflowassessmentplanMapper.xml | 7 +-
6 files changed, 194 insertions(+), 38 deletions(-)
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
index 1ae90fe38..e3dbbd87f 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
@@ -7,22 +7,29 @@
label-width="70px"
>
-
-
+
+
+
+
-
+ placeholder="请选择班级"
+ >
+
+
-
-
-
-
+
-
-
-
-
-
-
-
+
+
+
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
-
-
-
-
+
+
+
@@ -203,6 +257,12 @@ import {
addDayflowassessment,
updateDayflowassessment,
} from "@/api/benyi/dayflowassessment";
+import {
+ listDayflowassessmentplan,
+ getDayflowassessmentplan,
+} from "@/api/benyi/dayflowassessmentplan";
+import { listClass } from "@/api/system/class";
+import { getUsersByRoleId } from "@/api/system/user";
export default {
name: "Dayflowassessment",
@@ -220,6 +280,16 @@ export default {
total: 0,
// 幼儿园一日流程评估表格数据
dayflowassessmentList: [],
+ // 一日流程评估计划数据
+ dayflowassessmentplanOptions: [],
+ // 班级
+ classOptions: [],
+ //主班教师角色用户
+ zbjsOptions: [],
+ //配班教师角色用户
+ pbjsOptions: [],
+ //助理教师角色用户
+ zljsOptions: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -252,6 +322,14 @@ export default {
},
created() {
this.getList();
+ this.getClassList();
+ this.getDayflowassessmentplan();
+ //获取主班教师角色用户列表
+ getUsersByRoleId().then((response) => {
+ this.zbjsOptions = response.zbjs;
+ this.pbjsOptions = response.pbjs;
+ this.zljsOptions = response.zljs;
+ });
},
methods: {
/** 查询幼儿园一日流程评估列表 */
@@ -263,6 +341,31 @@ export default {
this.loading = false;
});
},
+ /** 查询一日流程评估计划列表 */
+ getDayflowassessmentplan() {
+ listDayflowassessmentplan(null).then((response) => {
+ this.dayflowassessmentplanOptions = response.rows;
+ console.log(this.dayflowassessmentplanOptions);
+ });
+ },
+ // 获取班级列表
+ getClassList() {
+ listClass(null).then((response) => {
+ 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("");
+ },
// 取消按钮
cancel() {
this.open = false;
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
index 4870f8c0b..d2fcd3ad5 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentplan/index.vue
@@ -110,6 +110,7 @@
{{ parseTime(scope.row.month, "{y}-{m}-{d}") }}
-->
+
{
@@ -361,6 +362,7 @@ export default {
reset() {
this.form = {
id: undefined,
+ name: undefined,
deptId: undefined,
month: undefined,
xnxq: undefined,
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 75af3cffd..b0475cbf6 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
@@ -2,6 +2,7 @@ package com.ruoyi.project.benyi.controller;
import java.util.List;
+import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -72,6 +73,7 @@ public class ByDayflowassessmentController extends BaseController {
@Log(title = "幼儿园一日流程评估", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ByDayflowassessment byDayflowassessment) {
+ byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
return toAjax(byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment));
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
index fde02c40e..c4d961cf2 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentplanController.java
@@ -3,6 +3,10 @@ package com.ruoyi.project.benyi.controller;
import java.util.List;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.project.benyi.service.IByDayFlowDetailService;
+import com.ruoyi.project.common.SchoolCommon;
+import com.ruoyi.project.system.service.IByClassService;
+import com.ruoyi.project.system.service.ISysDictDataService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +37,14 @@ import com.ruoyi.framework.web.page.TableDataInfo;
public class ByDayflowassessmentplanController extends BaseController {
@Autowired
private IByDayflowassessmentplanService byDayflowassessmentplanService;
+ @Autowired
+ private IByClassService byClassService;
+ @Autowired
+ private ISysDictDataService sysDictDataService;
+ @Autowired
+ private IByDayFlowDetailService byDayFlowDetailService;
+ @Autowired
+ private SchoolCommon schoolCommon;
/**
* 查询幼儿园一日流程评估计划列表
@@ -73,8 +85,16 @@ public class ByDayflowassessmentplanController extends BaseController {
@Log(title = "幼儿园一日流程评估计划", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ByDayflowassessmentplan byDayflowassessmentplan) {
+ // 通过班级id 查询班级名称
+ String classId = byDayflowassessmentplan.getClassid();
+ // 通过内容id查询一日流程内容
+ Long connentId = Long.parseLong(byDayflowassessmentplan.getConnent());
+ // 通过学年学期查询学期名称
+ String dict_type = "sys_xnxq";
+ String dict_value = byDayflowassessmentplan.getXnxq();
byDayflowassessmentplan.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
byDayflowassessmentplan.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
+ byDayflowassessmentplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-" + sysDictDataService.selectDictLabel(dict_type, dict_value) + "-" + byDayFlowDetailService.selectByDayFlowDetailById(connentId).getName() + "-" + "评估计划" );
return toAjax(byDayflowassessmentplanService.insertByDayflowassessmentplan(byDayflowassessmentplan));
}
@@ -85,6 +105,16 @@ public class ByDayflowassessmentplanController extends BaseController {
@Log(title = "幼儿园一日流程评估计划", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ByDayflowassessmentplan byDayflowassessmentplan) {
+ // 通过班级id 查询班级名称
+ String classId = byDayflowassessmentplan.getClassid();
+ // 通过内容id查询一日流程内容
+ Long connentId = Long.parseLong(byDayflowassessmentplan.getConnent());
+ // 通过学年学期查询学期名称
+ String dict_type = "sys_xnxq";
+ String dict_value = byDayflowassessmentplan.getXnxq();
+ byDayflowassessmentplan.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId());
+ byDayflowassessmentplan.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
+ byDayflowassessmentplan.setName(byClassService.selectByClassById(classId).getBjmc() + "-" + sysDictDataService.selectDictLabel(dict_type, dict_value) + "-" + byDayFlowDetailService.selectByDayFlowDetailById(connentId).getName() + "-" + "评估计划" );
return toAjax(byDayflowassessmentplanService.updateByDayflowassessmentplan(byDayflowassessmentplan));
}
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java
index 9e40cc59b..0ddd32a9e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentplan.java
@@ -22,6 +22,11 @@ public class ByDayflowassessmentplan extends BaseEntity {
*/
private Long id;
+ /**
+ * 计划名称
+ */
+ private String name;
+
/**
* 评估学校
*/
@@ -134,6 +139,7 @@ public class ByDayflowassessmentplan extends BaseEntity {
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
+ .append("name", getName())
.append("deptId", getDeptId())
.append("month", getMonth())
.append("xnxq", getXnxq())
@@ -144,4 +150,12 @@ public class ByDayflowassessmentplan extends BaseEntity {
.append("createTime", getCreateTime())
.toString();
}
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
}
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
index 7081cdbce..382aa2972 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentplanMapper.xml
@@ -6,6 +6,7 @@
+
@@ -17,13 +18,14 @@
- select id, dept_id, month, xnxq, classid, connent, starttime, create_userid, create_time from by_dayflowassessmentplan
+ select id, name, dept_id, month, xnxq, classid, connent, starttime, create_userid, create_time from by_dayflowassessmentplan