diff --git a/ruoyi-ui/src/api/benyi/dayflowassessment.js b/ruoyi-ui/src/api/benyi/dayflowassessment.js
index 2332b7d42..62b3da561 100644
--- a/ruoyi-ui/src/api/benyi/dayflowassessment.js
+++ b/ruoyi-ui/src/api/benyi/dayflowassessment.js
@@ -9,6 +9,15 @@ export function listDayflowassessment(query) {
});
}
+// 查询幼儿园一日流程评估列表
+export function listDayflowassessmentmyself(query) {
+ return request({
+ url: "/benyi/dayflowassessment/listmyself",
+ method: "get",
+ params: query
+ });
+}
+
// 查询幼儿园一日流程评估详细
export function getDayflowassessment(id) {
return request({
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
index 78810fcfc..2691d9b2d 100644
--- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
+++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
@@ -169,10 +169,6 @@ import {
getDayflowassessment,
delDayflowassessment,
} from "@/api/benyi/dayflowassessment";
-import {
- listDayflowassessmentplan,
- getDayflowassessmentplan,
-} from "@/api/benyi/dayflowassessmentplan";
import { listClass } from "@/api/system/class";
import { listUser } from "@/api/system/user";
import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger";
diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
new file mode 100644
index 000000000..446f476b3
--- /dev/null
+++ b/ruoyi-ui/src/views/benyi/dayflowassessmentmyself/index.vue
@@ -0,0 +1,255 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 详情
+ 删除
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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 231e20a00..47b9c1f2f 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
@@ -48,7 +48,19 @@ public class ByDayflowassessmentController extends BaseController {
@PreAuthorize("@ss.hasPermi('benyi:dayflowassessment:list')")
@GetMapping("/list")
public TableDataInfo list(ByDayflowassessment byDayflowassessment) {
- byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
+// byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId());
+ startPage();
+ List list = byDayflowassessmentService.selectByDayflowassessmentList(byDayflowassessment);
+ return getDataTable(list);
+ }
+
+ /**
+ * 查询幼儿园一日流程评估列表
+ */
+ @PreAuthorize("@ss.hasPermi('benyi:dayflowassessment:list')")
+ @GetMapping("/listmyself")
+ public TableDataInfo listmyself(ByDayflowassessment byDayflowassessment) {
+ byDayflowassessment.setPgdx(SecurityUtils.getLoginUser().getUser().getUserId());
startPage();
List list = byDayflowassessmentService.selectByDayflowassessmentList(byDayflowassessment);
return getDataTable(list);
diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java
index 11f3ab993..544066a73 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentServiceImpl.java
@@ -3,6 +3,7 @@ package com.ruoyi.project.benyi.service.impl;
import java.util.List;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.project.benyi.mapper.ByDayflowassessmentMapper;
@@ -38,6 +39,7 @@ public class ByDayflowassessmentServiceImpl implements IByDayflowassessmentServi
* @return 幼儿园一日流程评估
*/
@Override
+ @DataScope(deptAlias = "d")
public List selectByDayflowassessmentList(ByDayflowassessment byDayflowassessment) {
return byDayflowassessmentMapper.selectByDayflowassessmentList(byDayflowassessment);
}
diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
index 6726bd91e..ea48d60a9 100644
--- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
+++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
@@ -31,37 +31,38 @@
- select id, planid, dept_id, classid, bzbh, bzxm, pbbh, pbxm, zlbh, zlxm, xnxq, bzid, bzmf, kfz, kfcs, zzdf, classdf, items, 'values', pgdx, pgdxxm, create_userid, create_time from by_dayflowassessment
+ select d.id, d.planid, d.dept_id, d.classid, 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, d.pgdxxm, d.create_userid, d.create_time from by_dayflowassessment d