Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

一日流程评估-二次评估

Browse Source
This commit is contained in:
zhanglipeng
2021-05-24 16:55:47 +08:00
parent 6cd38f30fc
commit c1bdf1c3fe
5 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ruoyi-ui/src/views/benyi/dayflowassessment/index.vue
View File

@@ -110,6 +110,15 @@
v-hasPermi="['benyi:dayflowassessment:query']"
>详情</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-show="!checkUpdateable(scope.row)"
@click="handleUpdateAssessment(scope.row)"
v-hasPermi="['benyi:dayflowassessment:query']"
>评估</el-button
>
<el-button
size="mini"
type="text"
@@ -292,6 +301,13 @@ export default {
},
});
},
handleUpdateAssessment(row) {
const id = row.id;
//console.log(id);
this.$router.push({
path: "/benyi/dayflowassessment/teacher/" + id,
});
},
handleAdd() {
this.$router.push({
path: "/benyi/dayflowassessment/teacher/" + Date.now(),
@@ -314,6 +330,12 @@ export default {
})
.catch(function () {});
},
//控制按钮可用
checkUpdateable(row) {
var status = row.status;
//console.log(date.toLocaleDateString());
return status == "1";
},
},
};
</script>

2
ruoyi-ui/src/views/benyi/dayflowassessment/teacher.vue
View File

@@ -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("评估成功");

1
ruoyi/src/main/java/com/ruoyi/project/benyi/controller/ByDayflowassessmentController.java
View File

@@ -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);

15
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessment.java
View File

@@ -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();
}

7
ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentMapper.xml
View File

@@ -29,6 +29,7 @@
<result property="createUserid" column="create_userid"/>
<result property="createTime" column="create_time"/>
<result property="remark" column="remark"/>
<result property="status" column="status" />
<result property="bjpjf" column="bjpjf"/>
<result property="zjjdpjf" column="zjjdpjf"/>
<result property="ycpjf" column="ycpjf"/>
@@ -68,7 +69,7 @@
</resultMap>
<sql id="selectByDayflowassessmentVo">
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
<if test="createUserid != null ">create_userid,</if>
<if test="createTime != null ">create_time,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="status != null and status != ''">status,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="planid != null ">#{planid},</if>
@@ -233,6 +235,7 @@ group by t.pgdx
<if test="createUserid != null ">#{createUserid},</if>
<if test="createTime != null ">#{createTime},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="status != null and status != ''">#{status},</if>
</trim>
</insert>
@@ -261,6 +264,8 @@ group by t.pgdx
<if test="pgdxxm != null ">pgdxxm = #{pgdxxm},</if>
<if test="createUserid != null ">create_userid = #{createUserid},</if>
<if test="createTime != null ">create_time = #{createTime},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="status != null and status != ''">#{status},</if>
</trim>
where id = #{id}
</update>