From f438de73f8d1fae5adf26207e33816c17ac4b63a Mon Sep 17 00:00:00 2001 From: zhanglipeng Date: Mon, 12 Apr 2021 10:00:45 +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=E7=8F=AD=E7=BA=A7=E8=AF=84=E4=BC=B0=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/api/benyi/dayflowassessment.js | 9 + .../benyi/dayflowassessmentpjf/index.vue | 131 ++++++++++++++ .../ByDayflowassessmentController.java | 12 ++ .../benyi/domain/ByDayflowassessment.java | 164 +++++++++++++++++- .../mapper/ByDayflowassessmentMapper.java | 8 + .../service/IByDayflowassessmentService.java | 9 + .../impl/ByDayflowassessmentServiceImpl.java | 11 ++ .../benyi/ByDayflowassessmentMapper.xml | 41 +++++ 8 files changed, 384 insertions(+), 1 deletion(-) create mode 100644 ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue diff --git a/ruoyi-ui/src/api/benyi/dayflowassessment.js b/ruoyi-ui/src/api/benyi/dayflowassessment.js index 62b3da561..47d504752 100644 --- a/ruoyi-ui/src/api/benyi/dayflowassessment.js +++ b/ruoyi-ui/src/api/benyi/dayflowassessment.js @@ -18,6 +18,15 @@ export function listDayflowassessmentmyself(query) { }); } +// 查询幼儿园一日流程评估列表 +export function listDayflowassessmentPjf(query) { + return request({ + url: "/benyi/dayflowassessment/listpjf", + method: "get", + params: query + }); +} + // 查询幼儿园一日流程评估详细 export function getDayflowassessment(id) { return request({ diff --git a/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue b/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue new file mode 100644 index 000000000..c3a08d3b6 --- /dev/null +++ b/ruoyi-ui/src/views/benyi/dayflowassessmentpjf/index.vue @@ -0,0 +1,131 @@ + + + \ 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 47b9c1f2f..cf7c54f5f 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 @@ -54,6 +54,18 @@ public class ByDayflowassessmentController extends BaseController { return getDataTable(list); } + /** + * 查询幼儿园一日流程评估列表 + */ + @PreAuthorize("@ss.hasPermi('benyi:dayflowassessment:list')") + @GetMapping("/listpjf") + public TableDataInfo listpjf(ByDayflowassessment byDayflowassessment) { + byDayflowassessment.setDeptId(SecurityUtils.getLoginUser().getUser().getDeptId()); + startPage(); + List list = byDayflowassessmentService.selectByDayflowassessmentPjf(byDayflowassessment); + return getDataTable(list); + } + /** * 查询幼儿园一日流程评估列表 */ 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 a5a576781..ce01077f8 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 @@ -147,6 +147,152 @@ public class ByDayflowassessment extends BaseEntity { @Excel(name = "执行人") private Long createUserid; + + public Double getBjpjf() { + return bjpjf; + } + + public void setBjpjf(Double bjpjf) { + this.bjpjf = bjpjf; + } + + public Double getZjjdpjf() { + return zjjdpjf; + } + + public void setZjjdpjf(Double zjjdpjf) { + this.zjjdpjf = zjjdpjf; + } + + public Double getYcpjf() { + return ycpjf; + } + + public void setYcpjf(Double ycpjf) { + this.ycpjf = ycpjf; + } + + public Double getZjzqpjf() { + return zjzqpjf; + } + + public void setZjzqpjf(Double zjzqpjf) { + this.zjzqpjf = zjzqpjf; + } + + public Double getFzjxpjf() { + return fzjxpjf; + } + + public void setFzjxpjf(Double fzjxpjf) { + this.fzjxpjf = fzjxpjf; + } + + public Double getDxsjpjf() { + return dxsjpjf; + } + + public void setDxsjpjf(Double dxsjpjf) { + this.dxsjpjf = dxsjpjf; + } + + public Double getRcxsyspjf() { + return rcxsyspjf; + } + + public void setRcxsyspjf(Double rcxsyspjf) { + this.rcxsyspjf = rcxsyspjf; + } + + public Double getHdgdpjf() { + return hdgdpjf; + } + + public void setHdgdpjf(Double hdgdpjf) { + this.hdgdpjf = hdgdpjf; + } + + public Double getHwhdpjf() { + return hwhdpjf; + } + + public void setHwhdpjf(Double hwhdpjf) { + this.hwhdpjf = hwhdpjf; + } + + public Double getWspjf() { + return wspjf; + } + + public void setWspjf(Double wspjf) { + this.wspjf = wspjf; + } + + public Double getLyzjpjf() { + return lyzjpjf; + } + + public void setLyzjpjf(Double lyzjpjf) { + this.lyzjpjf = lyzjpjf; + } + + public Double getAqpjf() { + return aqpjf; + } + + public void setAqpjf(Double aqpjf) { + this.aqpjf = aqpjf; + } + + public Double getZyhdpjf() { + return zyhdpjf; + } + + public void setZyhdpjf(Double zyhdpjf) { + this.zyhdpjf = zyhdpjf; + } + + public Double getGzyjlyspjf() { + return gzyjlyspjf; + } + + public void setGzyjlyspjf(Double gzyjlyspjf) { + this.gzyjlyspjf = gzyjlyspjf; + } + + public Double getWxkcpjf() { + return wxkcpjf; + } + + public void setWxkcpjf(Double wxkcpjf) { + this.wxkcpjf = wxkcpjf; + } + + public Double getQkcpjf() { + return qkcpjf; + } + + public void setQkcpjf(Double qkcpjf) { + this.qkcpjf = qkcpjf; + } + + private Double bjpjf; + private Double zjjdpjf; + private Double ycpjf; + private Double zjzqpjf; + private Double fzjxpjf; + private Double dxsjpjf; + private Double rcxsyspjf; + private Double hdgdpjf; + private Double hwhdpjf; + private Double wspjf; + private Double lyzjpjf; + private Double aqpjf; + private Double zyhdpjf; + private Double gzyjlyspjf; + private Double wxkcpjf; + private Double qkcpjf; + private List list; public void setId(Long id) { @@ -327,7 +473,23 @@ public class ByDayflowassessment extends BaseEntity { .append("pgdxxm", getPgdxxm()) .append("createUserid", getCreateUserid()) .append("createTime", getCreateTime()) - .append("list",getList()) + .append("list", getList()) + .append("bjpjf", getBjpjf()) + .append("zjjdpjf", getZjjdpjf()) + .append("ycpjf", getYcpjf()) + .append("zjzqpjf", getZjzqpjf()) + .append("fzjxpjf", getFzjxpjf()) + .append("dxsjpjf", getDxsjpjf()) + .append("rcxsyspjf", getRcxsyspjf()) + .append("hdgdpjf", getHdgdpjf()) + .append("hwhdpjf", getHwhdpjf()) + .append("wspjf", getWspjf()) + .append("lyzjpjf", getLyzjpjf()) + .append("aqpjf", getAqpjf()) + .append("zyhdpjf", getZyhdpjf()) + .append("gzyjlyspjf", getGzyjlyspjf()) + .append("wxkcpjf", getWxkcpjf()) + .append("qkcpjf", getQkcpjf()) .toString(); } diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayflowassessmentMapper.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayflowassessmentMapper.java index 9093a0c3a..313b4cc62 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayflowassessmentMapper.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayflowassessmentMapper.java @@ -27,6 +27,14 @@ public interface ByDayflowassessmentMapper { */ public List selectByDayflowassessmentList(ByDayflowassessment byDayflowassessment); + /** + * 查询幼儿园一日流程评估列表 + * + * @param byDayflowassessment 幼儿园一日流程评估 + * @return 幼儿园一日流程评估集合 + */ + public List selectByDayflowassessmentPjf(ByDayflowassessment byDayflowassessment); + /** * 新增幼儿园一日流程评估 * diff --git a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayflowassessmentService.java b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayflowassessmentService.java index 1abc713bf..17d8f5dc0 100644 --- a/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayflowassessmentService.java +++ b/ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayflowassessmentService.java @@ -27,6 +27,15 @@ public interface IByDayflowassessmentService { */ public List selectByDayflowassessmentList(ByDayflowassessment byDayflowassessment); + /** + * 查询幼儿园一日流程评估列表 + * + * @param byDayflowassessment 幼儿园一日流程评估 + * @return 幼儿园一日流程评估集合 + */ + public List selectByDayflowassessmentPjf(ByDayflowassessment byDayflowassessment); + + /** * 新增幼儿园一日流程评估 * 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 544066a73..1ba0cf19e 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 @@ -44,6 +44,17 @@ public class ByDayflowassessmentServiceImpl implements IByDayflowassessmentServi return byDayflowassessmentMapper.selectByDayflowassessmentList(byDayflowassessment); } + /** + * 查询幼儿园一日流程评估列表 + * + * @param byDayflowassessment 幼儿园一日流程评估 + * @return 幼儿园一日流程评估集合 + */ + @Override + public List selectByDayflowassessmentPjf(ByDayflowassessment byDayflowassessment) { + return byDayflowassessmentMapper.selectByDayflowassessmentPjf(byDayflowassessment); + } + /** * 新增幼儿园一日流程评估 * diff --git a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml index ea48d60a9..95e5557dc 100644 --- a/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml +++ b/ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml @@ -28,6 +28,22 @@ + + + + + + + + + + + + + + + + @@ -57,6 +73,7 @@ and d.create_userid = #{createUserid} ${dataScope} + order by d.classid @@ -65,6 +82,30 @@ where d.id = #{id} + + insert into by_dayflowassessment