From fd6a5bfa6c681e8c5a2916ae3c73ce48227dfddc Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Fri, 9 Apr 2021 15:00:10 +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=AF=A6=E6=83=85=E5=92=8C=E8=AE=A1=E5=88=92=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/benyi/dayflow/biaozhun/standard.js | 9 + ruoyi-ui/src/router/index.js | 15 + .../views/benyi/dayflowassessment/details.vue | 293 ++++++++++++++++++ .../views/benyi/dayflowassessment/index.vue | 2 +- .../ByDayFlowStandardController.java | 7 + .../ByDayflowassessmentController.java | 18 ++ .../ByDayflowassessmentplanController.java | 70 +---- .../benyi/mapper/ByDayFlowStandardMapper.java | 8 + .../service/IByDayFlowStandardService.java | 9 + .../impl/ByDayFlowStandardServiceImpl.java | 47 +-- .../mybatis/benyi/ByDayFlowStandardMapper.xml | 6 + 11 files changed, 393 insertions(+), 91 deletions(-) create mode 100644 ruoyi-ui/src/views/benyi/dayflowassessment/details.vue diff --git a/ruoyi-ui/src/api/benyi/dayflow/biaozhun/standard.js b/ruoyi-ui/src/api/benyi/dayflow/biaozhun/standard.js index 14c668135..e06eef2b3 100644 --- a/ruoyi-ui/src/api/benyi/dayflow/biaozhun/standard.js +++ b/ruoyi-ui/src/api/benyi/dayflow/biaozhun/standard.js @@ -9,6 +9,15 @@ export function listStandard(query) { }) } +// 查询一日流程标准列表 +export function listStandardAssessment(query) { + return request({ + url: '/benyi/dayflow/biaozhun/standard/listassessment', + method: 'get', + params: query + }) +} + // 查询一日流程标准详细 export function getStandard(sid) { return request({ diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index 443d4ba3d..e27be8ace 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -463,6 +463,21 @@ export const constantRoutes = [{ component: () => import ('@/views/benyi/dayflowassessment/teacher'), name: 'dayflowassessmentteacher', + meta: { + title: '一日流程评估', + icon: '' + } + }] + }, + { + path: '/benyi/dayflowassessments', + component: Layout, + hidden: true, + children: [{ + path: 'details/:id(\\d+)', + component: () => + import ('@/views/benyi/dayflowassessment/details'), + name: 'dayflowassessmentteacherdetails', meta: { title: '一日流程评估详情', icon: '' diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/details.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/details.vue new file mode 100644 index 000000000..da7588f87 --- /dev/null +++ b/ruoyi-ui/src/views/benyi/dayflowassessment/details.vue @@ -0,0 +1,293 @@ + + + diff --git a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue index 37370ae9d..78810fcfc 100644 --- a/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue +++ b/ruoyi-ui/src/views/benyi/dayflowassessment/index.vue @@ -319,7 +319,7 @@ export default { }, handleAssessment(row) { const id = row.id; - this.$router.push({ path: "/benyi/dayflowassessment/teacher/" + id }); + this.$router.push({ path: "/benyi/dayflowassessments/details/" + id }); }, handleAdd() { this.$router.push({ path: "/benyi/dayflowassessment/teacher" }); diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java index aa1d77455..93645303f 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayFlowStandardController.java @@ -48,6 +48,13 @@ public class ByDayFlowStandardController extends BaseController return getDataTable(list); } + @GetMapping("/listassessment") + public TableDataInfo listassessment(ByDayFlowStandard byDayFlowStandard) + { + List list = byDayFlowStandardService.selectByDayFlowStandardListAssessment(byDayFlowStandard); + return getDataTable(list); + } + /** * 导出一日流程标准列表 */ 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 02dcdc404..231e20a00 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 @@ -85,6 +85,8 @@ public class ByDayflowassessmentController extends BaseController { byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId()); byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId()); byDayflowassessment.setXnxq(schoolCommon.getCurrentXnXq()); + //获取总得分 + byDayflowassessment.setZzdf(GetDf(byDayflowassessment.getList())); int iRows = byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment); List list = byDayflowassessment.getList(); @@ -110,6 +112,22 @@ public class ByDayflowassessmentController extends BaseController { return toAjax(iRows); } + public Double GetDf(List list) { + Double df = (double) 0; + if (list != null && list.size() > 0) { + for (int i = 0; i < list.size(); i++) { + String mrz = list.get(i).getMrz(); + if (mrz != "0" && !schoolCommon.isStringEmpty(mrz)) { + Double dMrz = Double.valueOf(mrz); + if (dMrz != 0) { + df = df + dMrz; + } + } + } + } + return df; + } + /** * 修改幼儿园一日流程评估 */ 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 842380636..5fe02ea6c 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 @@ -100,76 +100,8 @@ public class ByDayflowassessmentplanController extends BaseController { 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() + "-" + "评估计划"); - if (byClassService.selectByClassById(classId).getZbjs() == null && - byClassService.selectByClassById(classId).getPbjs() == null && - byClassService.selectByClassById(classId).getZljs() == null) { - return AjaxResult.error("当前班级下没有教师，无法创建评估计划"); - } int iCount = byDayflowassessmentplanService.insertByDayflowassessmentplan(byDayflowassessmentplan); - if (iCount > 0) { - // 判断班级下是否有老师 - Long zbjsNew = byClassService.selectByClassById(classId).getZbjs(); - Long pbjsNew = byClassService.selectByClassById(classId).getPbjs(); - Long zljsNew = byClassService.selectByClassById(classId).getZljs(); - ByDayflowassessment byDayflowassessment = null; - if (zbjsNew != null) { - byDayflowassessment = new ByDayflowassessment(); - byDayflowassessment.setPlanid(byDayflowassessmentplan.getId()); - byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId()); - byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId()); - byDayflowassessment.setBzbh(zbjsNew); - byDayflowassessment.setPgdx(zbjsNew); - byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore()); - byDayflowassessment.setClassid(classId); - byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq()); - byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent())); - if (pbjsNew != null) { - byDayflowassessment.setPbbh(pbjsNew); - } - if (zljsNew != null) { - byDayflowassessment.setZlbh(zljsNew); - } - byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment); - } - if (pbjsNew != null) { - byDayflowassessment = new ByDayflowassessment(); - byDayflowassessment.setPlanid(byDayflowassessmentplan.getId()); - byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId()); - byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId()); - byDayflowassessment.setPbbh(pbjsNew); - byDayflowassessment.setPgdx(pbjsNew); - byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore()); - byDayflowassessment.setClassid(classId); - byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq()); - byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent())); - if (zbjsNew != null) { - byDayflowassessment.setBzbh(zbjsNew); - } - if (zljsNew != null) { - byDayflowassessment.setZlbh(zljsNew); - } - byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment); - } - if (zljsNew != null) { - byDayflowassessment = new ByDayflowassessment(); - byDayflowassessment.setPlanid(byDayflowassessmentplan.getId()); - byDayflowassessment.setCreateUserid(SecurityUtils.getLoginUser().getUser().getUserId()); - byDayflowassessment.setDeptId(byDayflowassessmentplan.getDeptId()); - byDayflowassessment.setZlbh(zljsNew); - byDayflowassessment.setPgdx(zljsNew); - byDayflowassessment.setBzmf(byDayflowassessmentplan.getScore()); - byDayflowassessment.setClassid(classId); - byDayflowassessment.setXnxq(byDayflowassessmentplan.getXnxq()); - byDayflowassessment.setBzid(Long.parseLong(byDayflowassessmentplan.getConnent())); - if (pbjsNew != null) { - byDayflowassessment.setPbbh(pbjsNew); - } - if (zbjsNew != null) { - byDayflowassessment.setBzbh(zbjsNew); - } - byDayflowassessmentService.insertByDayflowassessment(byDayflowassessment); - } - } + return toAjax(iCount); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowStandardMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowStandardMapper.java index 789526efc..1033fdf15 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowStandardMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayFlowStandardMapper.java @@ -27,6 +27,14 @@ public interface ByDayFlowStandardMapper */ public List selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard); + /** + * 查询一日流程标准列表 + * + * @param byDayFlowStandard 一日流程标准 + * @return 一日流程标准集合 + */ + public List selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard); + /** * 新增一日流程标准 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowStandardService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowStandardService.java index 7e09dc2f5..2484c5053 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowStandardService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayFlowStandardService.java @@ -27,6 +27,15 @@ public interface IByDayFlowStandardService */ public List selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard); + /** + * 查询一日流程标准列表 + * + * @param byDayFlowStandard 一日流程标准 + * @return 一日流程标准集合 + */ + public List selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard); + + /** * 新增一日流程标准 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowStandardServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowStandardServiceImpl.java index 12bffb9c7..cd2ff650e 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowStandardServiceImpl.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayFlowStandardServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.project.benyi.service.impl; import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.project.benyi.mapper.ByDayFlowStandardMapper; @@ -9,85 +10,89 @@ import com.ruoyi.project.benyi.service.IByDayFlowStandardService; /** * 一日流程标准Service业务层处理 - * + * * @author tsbz * @date 2020-05-18 */ @Service -public class ByDayFlowStandardServiceImpl implements IByDayFlowStandardService -{ +public class ByDayFlowStandardServiceImpl implements IByDayFlowStandardService { @Autowired private ByDayFlowStandardMapper byDayFlowStandardMapper; /** * 查询一日流程标准 - * + * * @param sid 一日流程标准ID * @return 一日流程标准 */ @Override - public ByDayFlowStandard selectByDayFlowStandardById(Long sid) - { + public ByDayFlowStandard selectByDayFlowStandardById(Long sid) { return byDayFlowStandardMapper.selectByDayFlowStandardById(sid); } /** * 查询一日流程标准列表 - * + * * @param byDayFlowStandard 一日流程标准 * @return 一日流程标准 */ @Override - public List selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard) - { + public List selectByDayFlowStandardList(ByDayFlowStandard byDayFlowStandard) { return byDayFlowStandardMapper.selectByDayFlowStandardList(byDayFlowStandard); } + /** + * 查询一日流程标准列表 + * + * @param byDayFlowStandard 一日流程标准 + * @return 一日流程标准集合 + */ + @Override + public List selectByDayFlowStandardListAssessment(ByDayFlowStandard byDayFlowStandard) { + return byDayFlowStandardMapper.selectByDayFlowStandardListAssessment(byDayFlowStandard); + } + /** * 新增一日流程标准 - * + * * @param byDayFlowStandard 一日流程标准 * @return 结果 */ @Override - public int insertByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) - { + public int insertByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) { return byDayFlowStandardMapper.insertByDayFlowStandard(byDayFlowStandard); } /** * 修改一日流程标准 - * + * * @param byDayFlowStandard 一日流程标准 * @return 结果 */ @Override - public int updateByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) - { + public int updateByDayFlowStandard(ByDayFlowStandard byDayFlowStandard) { return byDayFlowStandardMapper.updateByDayFlowStandard(byDayFlowStandard); } /** * 批量删除一日流程标准 - * + * * @param sids 需要删除的一日流程标准ID * @return 结果 */ @Override - public int deleteByDayFlowStandardByIds(Long[] sids) - { + public int deleteByDayFlowStandardByIds(Long[] sids) { return byDayFlowStandardMapper.deleteByDayFlowStandardByIds(sids); } /** * 删除一日流程标准信息 - * + * * @param sid 一日流程标准ID * @return 结果 */ @Override - public int deleteByDayFlowStandardById(Long sid) - { + public int deleteByDayFlowStandardById(Long sid) { return byDayFlowStandardMapper.deleteByDayFlowStandardById(sid); } } diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml index 28f6c3df5..6a57acda8 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayFlowStandardMapper.xml @@ -15,6 +15,7 @@ + @@ -37,6 +38,11 @@ + +