评估一日流程
This commit is contained in:
		| @@ -67,4 +67,12 @@ export function listClassCheck(query) { | ||||
|         method: 'get', | ||||
|         params: query | ||||
|     }) | ||||
| } | ||||
|  | ||||
| // 根据班级编号查询教师列表 | ||||
| export function getUserList(bjbh) { | ||||
|     return request({ | ||||
|         url: '/system/class/getUserList/' + bjbh, | ||||
|         method: 'get' | ||||
|     }) | ||||
| } | ||||
| @@ -55,7 +55,7 @@ | ||||
|       </el-form-item> | ||||
|     </el-form> | ||||
|  | ||||
|  <div class="mb8 btn-list"> | ||||
|     <div class="mb8 btn-list"> | ||||
|       <el-button | ||||
|         type="primary" | ||||
|         icon="el-icon-plus" | ||||
| @@ -104,7 +104,7 @@ | ||||
|         prop="zlbh" | ||||
|         :formatter="zlbhFormat" | ||||
|       /> --> | ||||
|        <el-table-column | ||||
|       <el-table-column | ||||
|         label="评估对象" | ||||
|         align="center" | ||||
|         prop="pgdx" | ||||
| @@ -117,7 +117,7 @@ | ||||
|         :formatter="dayFlowFormat" | ||||
|       /> | ||||
|       <el-table-column label="环节满分" align="center" prop="bzmf" /> | ||||
|       <el-table-column label="扣分值" align="center" prop="kfz" /> | ||||
|       <!-- <el-table-column label="扣分值" align="center" prop="kfz" /> --> | ||||
|       <!-- <el-table-column label="扣分次数" align="center" prop="kfcs" /> --> | ||||
|       <el-table-column label="最终得分" align="center" prop="zzdf" /> | ||||
|       <el-table-column | ||||
| @@ -444,6 +444,9 @@ export default { | ||||
|       const id = row.id; | ||||
|       this.$router.push({ path: "/benyi/dayflowassessment/teacher/" + id }); | ||||
|     }, | ||||
|     handleAdd() { | ||||
|       this.$router.push({ path: "/benyi/dayflowassessment/teacher/0"}); | ||||
|     }, | ||||
|     /** 修改按钮操作 */ | ||||
|     handleUpdate(row) { | ||||
|       this.reset(); | ||||
|   | ||||
| @@ -1,15 +1,54 @@ | ||||
| <template> | ||||
|   <div class="app-container"> | ||||
|     <div class="flex align-center justify-between student-main-title"> | ||||
|       <p class="title flex align-center"> | ||||
|         <span>幼儿园:{{ deptFormat(deptId) }} </span> | ||||
|         <span>行为人:{{ teacherFormat(teacherName)  }} </span> | ||||
|         <span>班级:{{ classFormat(classid) }} </span> | ||||
|         <span>学期:{{ xnxqFormat(xnxq) }} </span> | ||||
|         <span>班长:{{ teacherFormat(zbjsxm) }} </span> | ||||
|         <span>配班教师:{{ teacherFormat(pbjs) }} </span> | ||||
|         <span>助理教师:{{ teacherFormat(zljs) }} </span> | ||||
|       </p> | ||||
|     <el-form ref="form" :model="form" :rules="rules" label-width="90px"> | ||||
|       <el-row :gutter="10"> | ||||
|         <el-col :xs="24" :ms="12" :md="5"> | ||||
|           <el-form-item label="班级名称" prop="classid"> | ||||
|             <el-select | ||||
|               v-model="form.classid" | ||||
|               size="small" | ||||
|               placeholder="请选择班级" | ||||
|             > | ||||
|               <el-option | ||||
|                 v-for="dict in classOptions" | ||||
|                 :key="dict.bjbh" | ||||
|                 :label="dict.bjmc" | ||||
|                 :value="dict.bjbh" | ||||
|               ></el-option> | ||||
|             </el-select> | ||||
|           </el-form-item> | ||||
|         </el-col> | ||||
|         <el-col :xs="24" :ms="12" :md="5"> | ||||
|           <el-form-item label="评估对象" prop="pgdx"> | ||||
|             <el-select | ||||
|               v-model="form.pgdx" | ||||
|               size="small" | ||||
|               placeholder="请选择评估对象" | ||||
|             > | ||||
|               <el-option | ||||
|                 v-for="dict in pgdxOptions" | ||||
|                 :key="dict.userId" | ||||
|                 :label="dict.nickName" | ||||
|                 :value="dict.userId" | ||||
|               ></el-option> | ||||
|             </el-select> | ||||
|           </el-form-item> | ||||
|         </el-col> | ||||
|         <el-col :xs="24" :ms="12" :md="5"> | ||||
|           <el-form-item label="评估内容" prop="bzid"> | ||||
|             <el-select v-model="form.bzid" placeholder="请选择评估内容"> | ||||
|               <el-option | ||||
|                 v-for="dict in detailOptions" | ||||
|                 :key="dict.id" | ||||
|                 :label="dict.name" | ||||
|                 :value="dict.id" | ||||
|               ></el-option> | ||||
|             </el-select> | ||||
|           </el-form-item> | ||||
|         </el-col> | ||||
|       </el-row> | ||||
|     </el-form> | ||||
|     <div class="mb8 btn-list"> | ||||
|       <el-button | ||||
|         type="primary" | ||||
|         icon="el-icon-s-data" | ||||
| @@ -38,15 +77,19 @@ | ||||
|           :key="itemBz.id" | ||||
|         > | ||||
|           <p class="checkbox-item flex align-center"> | ||||
|             <el-checkbox-group v-model="checkList"> | ||||
|               <el-checkbox :label="itemBz.id" :key="itemBz.id" | ||||
|             <el-row v-model="checkList"> | ||||
|               <div :label="itemBz.id" :key="itemBz.id" | ||||
|                 >{{ itemBz.standardTitle }}分值: {{ itemBz.score }}分 | ||||
|               </el-checkbox> | ||||
|             </el-checkbox-group> | ||||
|                 <el-input-number | ||||
|                   v-model="num" | ||||
|                   :precision="1" | ||||
|                   :step="0.1" | ||||
|                   :min="-itemBz.score" | ||||
|                   :max="itemBz.score" | ||||
|                 ></el-input-number | ||||
|               ></div> | ||||
|             </el-row> | ||||
|           </p> | ||||
|           <div class="check-info" v-if="itemBz.score"> | ||||
|             <!-- {{ itemBz.score }} --> | ||||
|           </div> | ||||
|         </div> | ||||
|       </div> | ||||
|     </el-tabs> | ||||
| @@ -61,9 +104,10 @@ import { | ||||
|   updateDayflowassessment, | ||||
| } from "@/api/benyi/dayflowassessment"; | ||||
| import { listDayflowtask } from "@/api/benyi/dayflow/dayflowtask"; | ||||
| import { listDetail, getDetail } from "@/api/benyi/dayflow/dayflowmanger"; | ||||
| import { listStandard } from "@/api/benyi/dayflow/biaozhun/standard"; | ||||
| import { listDept, getDept } from "@/api/system/dept"; | ||||
| import { listClass } from "@/api/system/class"; | ||||
| import { listClass, getUserList } from "@/api/system/class"; | ||||
| import { listUser } from "@/api/system/user"; | ||||
|  | ||||
| export default { | ||||
| @@ -71,18 +115,8 @@ export default { | ||||
|  | ||||
|   data() { | ||||
|     return { | ||||
|       teacherName: "", | ||||
|       planid: "", | ||||
|       xnxq: "", | ||||
|       classid: "", | ||||
|       zbjsxm: "", | ||||
|       pbjs: "", | ||||
|       zljs: "", | ||||
|       deptId: "", | ||||
|       bzmf: "", | ||||
|       kfz: "", | ||||
|       classdf: "", | ||||
|       assessmentsCode: "", | ||||
|       num: 0, | ||||
|       dayflowassessmentId: null, | ||||
|       // 遮罩层 | ||||
|       loading: true, | ||||
|       // 选中数组 | ||||
| @@ -94,14 +128,12 @@ export default { | ||||
|       dayflowtaskList: [], | ||||
|       // 根据任务查询到名下标准 | ||||
|       dayflowstandardList: [], | ||||
|       // 学校列表 | ||||
|       deptOptions: [], | ||||
|       //班级 | ||||
|       classOptions: [], | ||||
|       // 所有教师 | ||||
|       userOptions: [], | ||||
|       // 学年学期 | ||||
|       xnxqOptions: [], | ||||
|       //评估对象 | ||||
|       pgdxOptions: [], | ||||
|       // 一日流程表格数据 | ||||
|       detailOptions: [], | ||||
|       // 表单参数 | ||||
|       form: {}, | ||||
|       // 查询一日流程任务 | ||||
| @@ -123,53 +155,44 @@ export default { | ||||
|       activeName: "一日流程评估", | ||||
|       checked: false, | ||||
|       checkList: [], | ||||
|       // 表单参数 | ||||
|       form: {}, | ||||
|       // 表单校验 | ||||
|       rules: { | ||||
|         classid: [{ required: true, message: "班级不能为空", trigger: "blur" }], | ||||
|         pgdx: [ | ||||
|           { required: true, message: "评估对象不能为空", trigger: "blur" }, | ||||
|         ], | ||||
|         bzid: [ | ||||
|           { required: true, message: "评估内容不能为空", trigger: "blur" }, | ||||
|         ], | ||||
|       }, | ||||
|     }; | ||||
|   }, | ||||
|   created() { | ||||
|     // this.getList(); | ||||
|     const dayflowassessmentId = this.$route.params && this.$route.params.id; | ||||
|     this.dayflowassessmentId = dayflowassessmentId; | ||||
|     this.getDayflowassessmentContent(dayflowassessmentId); | ||||
|     this.getDeptList();   | ||||
|     // this.dayflowassessmentId = dayflowassessmentId; | ||||
|     this.getClassList(); | ||||
|     this.getUserList(); | ||||
|     this.getDicts("sys_xnxq").then((response) => { | ||||
|       this.xnxqOptions = response.data; | ||||
|     }); | ||||
|     this.getDayFlowList(); | ||||
|   }, | ||||
|   watch: { | ||||
|     "form.classid": function (val) { | ||||
|       this.getUserListByBjbh(val); | ||||
|     }, | ||||
|     "form.bzid": function (val) { | ||||
|       this.dayflowassessmentId = val; | ||||
|       this.queryParams_detail.detailId = val; | ||||
|       this.getTaskList(); | ||||
|     }, | ||||
|   }, | ||||
|   methods: { | ||||
|     getDayflowassessmentContent(dayflowassessmentId) { | ||||
|       getDayflowassessment(dayflowassessmentId).then((response) => { | ||||
|         if (response.code == "200") { | ||||
|           this.teacherName = response.data.pgdx; | ||||
|           this.xnxq = response.data.xnxq; | ||||
|           this.classid = response.data.classid; | ||||
|           this.bzmf = response.data.bzmf; | ||||
|           this.kfz = response.data.kfz; | ||||
|           this.zbjsxm = response.data.bzbh; | ||||
|           this.pbjs = response.data.pbbh; | ||||
|           this.zljs = response.data.zlbh; | ||||
|           this.deptId = response.data.deptId; | ||||
|           this.planid = response.data.planid; | ||||
|           this.classdf = response.data.classdf; | ||||
|           this.queryParams_detail.detailId = response.data.bzid; | ||||
|           this.assessmentsCode = response.data.code; | ||||
|           this.getTaskList(); | ||||
|         } | ||||
|     /** 查询一日流程列表 */ | ||||
|     getDayFlowList() { | ||||
|       listDetail(null).then((response) => { | ||||
|         this.detailOptions = response.rows; | ||||
|       }); | ||||
|     }, | ||||
|     // 学校字典翻译 | ||||
|     deptFormat(deptId) { | ||||
|       var actions = []; | ||||
|       var datas = this.deptOptions; | ||||
|       Object.keys(datas).map((key) => { | ||||
|         if (datas[key].deptId == "" + deptId) { | ||||
|           actions.push(datas[key].deptName); | ||||
|           return false; | ||||
|         } | ||||
|       }); | ||||
|       return actions.join(""); | ||||
|     }, | ||||
|     // 班级字典翻译 | ||||
|     classFormat(classid) { | ||||
|       var actions = []; | ||||
| @@ -182,42 +205,18 @@ export default { | ||||
|       }); | ||||
|       return actions.join(""); | ||||
|     }, | ||||
|     // 教师字典翻译 | ||||
|     teacherFormat(val) { | ||||
|       var actions = []; | ||||
|       var datas = this.userOptions; | ||||
|       Object.keys(datas).map((key) => { | ||||
|         if (datas[key].userId == "" + val) { | ||||
|           actions.push(datas[key].nickName); | ||||
|           return false; | ||||
|         } | ||||
|       }); | ||||
|       return actions.join(""); | ||||
|     }, | ||||
|     // 学年学期类型--字典状态字典翻译 | ||||
|     xnxqFormat(xnxq) { | ||||
|       return this.selectDictLabel(this.xnxqOptions, xnxq); | ||||
|     }, | ||||
|     /** 查询用户列表 */ | ||||
|     getUserList() { | ||||
|       listUser(null).then( | ||||
|         (response) => { | ||||
|           this.userOptions = response.rows; | ||||
|         } | ||||
|       ); | ||||
|     }, | ||||
|     /** 查询幼儿园机构列表 */ | ||||
|     getDeptList() { | ||||
|       listDept(null).then(response => { | ||||
|         this.deptOptions = response.data; | ||||
|       }); | ||||
|     }, | ||||
|     //班级列表 | ||||
|     getClassList() { | ||||
|       listClass(null).then((response) => { | ||||
|         this.classOptions = response.rows; | ||||
|       }); | ||||
|     }, | ||||
|     //班级列表 | ||||
|     getUserListByBjbh(val) { | ||||
|       getUserList(val).then((response) => { | ||||
|         this.pgdxOptions = response.rows; | ||||
|       }); | ||||
|     }, | ||||
|     /** 查询一日流程任务列表 */ | ||||
|     getTaskList() { | ||||
|       listDayflowtask(this.queryParams_detail).then((response) => { | ||||
| @@ -227,7 +226,35 @@ export default { | ||||
|         this.dayflowstandardList = response.rows; | ||||
|       }); | ||||
|     }, | ||||
|  | ||||
|     // 表单重置 | ||||
|     reset() { | ||||
|       this.form = { | ||||
|         id: undefined, | ||||
|         planid: undefined, | ||||
|         deptId: undefined, | ||||
|         classid: undefined, | ||||
|         bzbh: undefined, | ||||
|         bzxm: undefined, | ||||
|         pbbh: undefined, | ||||
|         pbxm: undefined, | ||||
|         zlbh: undefined, | ||||
|         zlxm: undefined, | ||||
|         xnxq: undefined, | ||||
|         bzid: undefined, | ||||
|         bzmf: undefined, | ||||
|         kfz: undefined, | ||||
|         kfcs: undefined, | ||||
|         zzdf: undefined, | ||||
|         classdf: undefined, | ||||
|         items: undefined, | ||||
|         values: undefined, | ||||
|         pgdx: undefined, | ||||
|         pgdxxm: undefined, | ||||
|         createUserid: undefined, | ||||
|         createTime: undefined, | ||||
|       }; | ||||
|       this.resetForm("form"); | ||||
|     }, | ||||
|     /** 提交按钮 */ | ||||
|     submitForm: function () { | ||||
|       this.$confirm("确认评估数据?评估后数据不能取消", "警告", { | ||||
| @@ -255,8 +282,8 @@ export default { | ||||
|               updateDayflowassessment(this.form).then((response) => { | ||||
|                 if (response.code === 200) { | ||||
|                   this.msgSuccess("评估成功"); | ||||
|                   this.$router.go(-1) | ||||
|                   this.$store.dispatch('tagsView/delView', this.$route) | ||||
|                   this.$router.go(-1); | ||||
|                   this.$store.dispatch("tagsView/delView", this.$route); | ||||
|                   // this.$router.push({ | ||||
|                   //   path: | ||||
|                   //     "/benyi/dayflowassessment", | ||||
|   | ||||
| @@ -27,8 +27,6 @@ public class ByDayflowassessment extends BaseEntity { | ||||
|     @Excel(name = "所属计划") | ||||
|     private Long planid; | ||||
|  | ||||
|     private String items; | ||||
|  | ||||
|     /** | ||||
|      * 学校编号 | ||||
|      */ | ||||
| @@ -107,6 +105,18 @@ public class ByDayflowassessment extends BaseEntity { | ||||
|     @Excel(name = "班级得分") | ||||
|     private Double classdf; | ||||
|  | ||||
|     /** | ||||
|      * 评估对象记录 | ||||
|      */ | ||||
|     @Excel(name = "评估对象记录") | ||||
|     private String items; | ||||
|  | ||||
|     /** | ||||
|      * 评估对象记录值 | ||||
|      */ | ||||
|     @Excel(name = "评估对象记录值") | ||||
|     private String values; | ||||
|  | ||||
|     /** | ||||
|      * 扣分次数 | ||||
|      */ | ||||
| @@ -125,6 +135,12 @@ public class ByDayflowassessment extends BaseEntity { | ||||
|     @Excel(name = "评估对象") | ||||
|     private Long pgdx; | ||||
|  | ||||
|     /** | ||||
|      * 评估对象姓名 | ||||
|      */ | ||||
|     @Excel(name = "评估对象姓名") | ||||
|     private String pgdxxm; | ||||
|  | ||||
|     /** | ||||
|      * 执行人 | ||||
|      */ | ||||
| @@ -243,6 +259,14 @@ public class ByDayflowassessment extends BaseEntity { | ||||
|         return kfcs; | ||||
|     } | ||||
|  | ||||
|     public void setValues(String values) { | ||||
|         this.values = values; | ||||
|     } | ||||
|  | ||||
|     public String getValues() { | ||||
|         return values; | ||||
|     } | ||||
|  | ||||
|     public void setPgdx(Long pgdx) { | ||||
|         this.pgdx = pgdx; | ||||
|     } | ||||
| @@ -251,6 +275,14 @@ public class ByDayflowassessment extends BaseEntity { | ||||
|         return pgdx; | ||||
|     } | ||||
|  | ||||
|     public void setPgdxxm(String pgdxxm) { | ||||
|         this.pgdxxm = pgdxxm; | ||||
|     } | ||||
|  | ||||
|     public String getPgdxxm() { | ||||
|         return pgdxxm; | ||||
|     } | ||||
|  | ||||
|     public void setCreateUserid(Long createUserid) { | ||||
|         this.createUserid = createUserid; | ||||
|     } | ||||
| @@ -279,8 +311,10 @@ public class ByDayflowassessment extends BaseEntity { | ||||
|                 .append("kfcs", getKfcs()) | ||||
|                 .append("bzmf", getBzmf()) | ||||
|                 .append("zzdf", getZzdf()) | ||||
|                 .append("pgdx", getPgdx()) | ||||
|                 .append("items", getItems()) | ||||
|                 .append("values", getValues()) | ||||
|                 .append("pgdx", getPgdx()) | ||||
|                 .append("pgdxxm", getPgdxxm()) | ||||
|                 .append("createUserid", getCreateUserid()) | ||||
|                 .append("createTime", getCreateTime()) | ||||
|                 .toString(); | ||||
|   | ||||
| @@ -0,0 +1,83 @@ | ||||
| package com.ruoyi.project.benyi.domain; | ||||
|  | ||||
| import org.apache.commons.lang3.builder.ToStringBuilder; | ||||
| import org.apache.commons.lang3.builder.ToStringStyle; | ||||
| import com.ruoyi.framework.aspectj.lang.annotation.Excel; | ||||
| import com.ruoyi.framework.web.domain.BaseEntity; | ||||
|  | ||||
| /** | ||||
|  * 幼儿园一日流程评估得分项对象 by_dayflowassessmentitem | ||||
|  * | ||||
|  * @author tsbz | ||||
|  * @date 2021-04-05 | ||||
|  */ | ||||
| public class ByDayflowassessmentitem extends BaseEntity { | ||||
|     private static final long serialVersionUID = 1L; | ||||
|  | ||||
|     /** | ||||
|      * 编号 | ||||
|      */ | ||||
|     private Long id; | ||||
|  | ||||
|     /** | ||||
|      * 所属评估环节 | ||||
|      */ | ||||
|     @Excel(name = "所属评估环节") | ||||
|     private Long pid; | ||||
|  | ||||
|     /** | ||||
|      * 标准编号 | ||||
|      */ | ||||
|     @Excel(name = "标准编号") | ||||
|     private Long item; | ||||
|  | ||||
|     /** | ||||
|      * 得分 | ||||
|      */ | ||||
|     @Excel(name = "得分") | ||||
|     private Double value; | ||||
|  | ||||
|     public void setId(Long id) { | ||||
|         this.id = id; | ||||
|     } | ||||
|  | ||||
|     public Long getId() { | ||||
|         return id; | ||||
|     } | ||||
|  | ||||
|     public void setPid(Long pid) { | ||||
|         this.pid = pid; | ||||
|     } | ||||
|  | ||||
|     public Long getPid() { | ||||
|         return pid; | ||||
|     } | ||||
|  | ||||
|     public void setItem(Long item) { | ||||
|         this.item = item; | ||||
|     } | ||||
|  | ||||
|     public Long getItem() { | ||||
|         return item; | ||||
|     } | ||||
|  | ||||
|     public void setValue(Double value) { | ||||
|         this.value = value; | ||||
|     } | ||||
|  | ||||
|     public Double getValue() { | ||||
|         return value; | ||||
|     } | ||||
|  | ||||
|     @Override | ||||
|     public String toString() { | ||||
|         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) | ||||
|                 .append("id", getId()) | ||||
|                 .append("pid", getPid()) | ||||
|                 .append("item", getItem()) | ||||
|                 .append("value", getValue()) | ||||
|                 .append("remark", getRemark()) | ||||
|                 .append("createTime", getCreateTime()) | ||||
|                 .toString(); | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,61 @@ | ||||
| package com.ruoyi.project.benyi.mapper; | ||||
|  | ||||
| import java.util.List; | ||||
|  | ||||
| import com.ruoyi.project.benyi.domain.ByDayflowassessmentitem; | ||||
|  | ||||
| /** | ||||
|  * 幼儿园一日流程评估得分项Mapper接口 | ||||
|  * | ||||
|  * @author tsbz | ||||
|  * @date 2021-04-05 | ||||
|  */ | ||||
| public interface ByDayflowassessmentitemMapper { | ||||
|     /** | ||||
|      * 查询幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param id 幼儿园一日流程评估得分项ID | ||||
|      * @return 幼儿园一日流程评估得分项 | ||||
|      */ | ||||
|     public ByDayflowassessmentitem selectByDayflowassessmentitemById(Long id); | ||||
|  | ||||
|     /** | ||||
|      * 查询幼儿园一日流程评估得分项列表 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 幼儿园一日流程评估得分项集合 | ||||
|      */ | ||||
|     public List<ByDayflowassessmentitem> selectByDayflowassessmentitemList(ByDayflowassessmentitem byDayflowassessmentitem); | ||||
|  | ||||
|     /** | ||||
|      * 新增幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int insertByDayflowassessmentitem(ByDayflowassessmentitem byDayflowassessmentitem); | ||||
|  | ||||
|     /** | ||||
|      * 修改幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int updateByDayflowassessmentitem(ByDayflowassessmentitem byDayflowassessmentitem); | ||||
|  | ||||
|     /** | ||||
|      * 删除幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param id 幼儿园一日流程评估得分项ID | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int deleteByDayflowassessmentitemById(Long id); | ||||
|  | ||||
|     /** | ||||
|      * 批量删除幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param ids 需要删除的数据ID | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int deleteByDayflowassessmentitemByIds(Long[] ids); | ||||
| } | ||||
| @@ -0,0 +1,61 @@ | ||||
| package com.ruoyi.project.benyi.service; | ||||
|  | ||||
| import java.util.List; | ||||
|  | ||||
| import com.ruoyi.project.benyi.domain.ByDayflowassessmentitem; | ||||
|  | ||||
| /** | ||||
|  * 幼儿园一日流程评估得分项Service接口 | ||||
|  * | ||||
|  * @author tsbz | ||||
|  * @date 2021-04-05 | ||||
|  */ | ||||
| public interface IByDayflowassessmentitemService { | ||||
|     /** | ||||
|      * 查询幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param id 幼儿园一日流程评估得分项ID | ||||
|      * @return 幼儿园一日流程评估得分项 | ||||
|      */ | ||||
|     public ByDayflowassessmentitem selectByDayflowassessmentitemById(Long id); | ||||
|  | ||||
|     /** | ||||
|      * 查询幼儿园一日流程评估得分项列表 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 幼儿园一日流程评估得分项集合 | ||||
|      */ | ||||
|     public List<ByDayflowassessmentitem> selectByDayflowassessmentitemList(ByDayflowassessmentitem byDayflowassessmentitem); | ||||
|  | ||||
|     /** | ||||
|      * 新增幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int insertByDayflowassessmentitem(ByDayflowassessmentitem byDayflowassessmentitem); | ||||
|  | ||||
|     /** | ||||
|      * 修改幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int updateByDayflowassessmentitem(ByDayflowassessmentitem byDayflowassessmentitem); | ||||
|  | ||||
|     /** | ||||
|      * 批量删除幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param ids 需要删除的幼儿园一日流程评估得分项ID | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int deleteByDayflowassessmentitemByIds(Long[] ids); | ||||
|  | ||||
|     /** | ||||
|      * 删除幼儿园一日流程评估得分项信息 | ||||
|      * | ||||
|      * @param id 幼儿园一日流程评估得分项ID | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     public int deleteByDayflowassessmentitemById(Long id); | ||||
| } | ||||
| @@ -0,0 +1,89 @@ | ||||
| package com.ruoyi.project.benyi.service.impl; | ||||
|  | ||||
| import java.util.List; | ||||
|  | ||||
| import com.ruoyi.common.utils.DateUtils; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.stereotype.Service; | ||||
| import com.ruoyi.project.benyi.mapper.ByDayflowassessmentitemMapper; | ||||
| import com.ruoyi.project.benyi.domain.ByDayflowassessmentitem; | ||||
| import com.ruoyi.project.benyi.service.IByDayflowassessmentitemService; | ||||
|  | ||||
| /** | ||||
|  * 幼儿园一日流程评估得分项Service业务层处理 | ||||
|  * | ||||
|  * @author tsbz | ||||
|  * @date 2021-04-05 | ||||
|  */ | ||||
| @Service | ||||
| public class ByDayflowassessmentitemServiceImpl implements IByDayflowassessmentitemService { | ||||
|     @Autowired | ||||
|     private ByDayflowassessmentitemMapper byDayflowassessmentitemMapper; | ||||
|  | ||||
|     /** | ||||
|      * 查询幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param id 幼儿园一日流程评估得分项ID | ||||
|      * @return 幼儿园一日流程评估得分项 | ||||
|      */ | ||||
|     @Override | ||||
|     public ByDayflowassessmentitem selectByDayflowassessmentitemById(Long id) { | ||||
|         return byDayflowassessmentitemMapper.selectByDayflowassessmentitemById(id); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * 查询幼儿园一日流程评估得分项列表 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 幼儿园一日流程评估得分项 | ||||
|      */ | ||||
|     @Override | ||||
|     public List<ByDayflowassessmentitem> selectByDayflowassessmentitemList(ByDayflowassessmentitem byDayflowassessmentitem) { | ||||
|         return byDayflowassessmentitemMapper.selectByDayflowassessmentitemList(byDayflowassessmentitem); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * 新增幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     @Override | ||||
|     public int insertByDayflowassessmentitem(ByDayflowassessmentitem byDayflowassessmentitem) { | ||||
|         byDayflowassessmentitem.setCreateTime(DateUtils.getNowDate()); | ||||
|         return byDayflowassessmentitemMapper.insertByDayflowassessmentitem(byDayflowassessmentitem); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * 修改幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param byDayflowassessmentitem 幼儿园一日流程评估得分项 | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     @Override | ||||
|     public int updateByDayflowassessmentitem(ByDayflowassessmentitem byDayflowassessmentitem) { | ||||
|         return byDayflowassessmentitemMapper.updateByDayflowassessmentitem(byDayflowassessmentitem); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * 批量删除幼儿园一日流程评估得分项 | ||||
|      * | ||||
|      * @param ids 需要删除的幼儿园一日流程评估得分项ID | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     @Override | ||||
|     public int deleteByDayflowassessmentitemByIds(Long[] ids) { | ||||
|         return byDayflowassessmentitemMapper.deleteByDayflowassessmentitemByIds(ids); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * 删除幼儿园一日流程评估得分项信息 | ||||
|      * | ||||
|      * @param id 幼儿园一日流程评估得分项ID | ||||
|      * @return 结果 | ||||
|      */ | ||||
|     @Override | ||||
|     public int deleteByDayflowassessmentitemById(Long id) { | ||||
|         return byDayflowassessmentitemMapper.deleteByDayflowassessmentitemById(id); | ||||
|     } | ||||
| } | ||||
| @@ -1,5 +1,6 @@ | ||||
| package com.ruoyi.project.system.controller; | ||||
|  | ||||
| import java.util.ArrayList; | ||||
| import java.util.Date; | ||||
| import java.util.List; | ||||
| import java.util.UUID; | ||||
| @@ -8,6 +9,8 @@ import com.ruoyi.common.utils.SecurityUtils; | ||||
| import com.ruoyi.project.benyi.domain.ByChild; | ||||
| import com.ruoyi.project.benyi.service.IByChildService; | ||||
| import com.ruoyi.project.common.SchoolCommon; | ||||
| import com.ruoyi.project.system.domain.SysUser; | ||||
| import com.ruoyi.project.system.service.ISysUserService; | ||||
| import org.springframework.security.access.prepost.PreAuthorize; | ||||
| import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.GetMapping; | ||||
| @@ -26,6 +29,7 @@ import com.ruoyi.framework.web.controller.BaseController; | ||||
| import com.ruoyi.framework.web.domain.AjaxResult; | ||||
| import com.ruoyi.common.utils.poi.ExcelUtil; | ||||
| import com.ruoyi.framework.web.page.TableDataInfo; | ||||
| import sun.tools.jconsole.JConsole; | ||||
|  | ||||
| /** | ||||
|  * 班级信息Controller | ||||
| @@ -42,6 +46,8 @@ public class ByClassController extends BaseController { | ||||
|     private SchoolCommon schoolCommon; | ||||
|     @Autowired | ||||
|     private IByChildService byChildService; | ||||
|     @Autowired | ||||
|     private ISysUserService userService; | ||||
|  | ||||
|  | ||||
|     /** | ||||
| @@ -251,5 +257,28 @@ public class ByClassController extends BaseController { | ||||
|         return getDataTable(list); | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * 根据班级编号查询教师列表 | ||||
|      */ | ||||
|     @GetMapping("/getUserList/{bjbh}") | ||||
|     public TableDataInfo getUserList(@PathVariable String bjbh) { | ||||
|         ByClass byClass = byClassService.selectByClassById(bjbh); | ||||
|         List<SysUser> list = new ArrayList<>(); | ||||
|         if (byClass.getZbjs() != null) { | ||||
|             SysUser sysUser = userService.selectUserById(byClass.getZbjs()); | ||||
|             list.add(sysUser); | ||||
|         } | ||||
|         if (byClass.getPbjs() != null) { | ||||
|             SysUser sysUser = userService.selectUserById(byClass.getPbjs()); | ||||
|             list.add(sysUser); | ||||
|         } | ||||
|         if (byClass.getZljs() != null) { | ||||
|             SysUser sysUser = userService.selectUserById(byClass.getZljs()); | ||||
|             list.add(sysUser); | ||||
|         } | ||||
|  | ||||
|         return getDataTable(list); | ||||
|     } | ||||
|  | ||||
|  | ||||
| } | ||||
| @@ -21,14 +21,17 @@ | ||||
|         <result property="zzdf" column="zzdf"/> | ||||
|         <result property="kfz" column="kfz"/> | ||||
|         <result property="classdf" column="classdf"/> | ||||
|         <result property="items" column="items"/> | ||||
|         <result property="values" column="values"/> | ||||
|         <result property="kfcs" column="kfcs"/> | ||||
|         <result property="pgdx" column="pgdx"/> | ||||
|         <result property="pgdxxm" column="pgdxxm"/> | ||||
|         <result property="createUserid" column="create_userid"/> | ||||
|         <result property="createTime" column="create_time"/> | ||||
|     </resultMap> | ||||
|  | ||||
|     <sql id="selectByDayflowassessmentVo"> | ||||
|         select id, planid, dept_id, classid, classdf, bzbh, bzxm, pbbh, pbxm, zlbh, zlxm, bzmf, zzdf, xnxq, bzid, kfz, kfcs, pgdx, create_userid, create_time from by_dayflowassessment | ||||
|         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 | ||||
|     </sql> | ||||
|  | ||||
|     <select id="selectByDayflowassessmentList" parameterType="ByDayflowassessment" | ||||
| @@ -77,10 +80,13 @@ | ||||
|             <if test="bzid != null ">bzid,</if> | ||||
|             <if test="kfz != null ">kfz,</if> | ||||
|             <if test="classdf != null ">classdf,</if> | ||||
|             <if test="items != null  and items != ''">items,</if> | ||||
|             <if test="values != null  and values != ''">values,</if> | ||||
|             <if test="bzmf != null ">bzmf,</if> | ||||
|             <if test="zzdf != null ">zzdf,</if> | ||||
|             <if test="kfcs != null ">kfcs,</if> | ||||
|             <if test="pgdx != null ">pgdx,</if> | ||||
|             <if test="pgdxxm != null ">pgdxxm,</if> | ||||
|             <if test="createUserid != null ">create_userid,</if> | ||||
|             <if test="createTime != null ">create_time,</if> | ||||
|         </trim> | ||||
| @@ -98,10 +104,13 @@ | ||||
|             <if test="bzid != null ">#{bzid},</if> | ||||
|             <if test="kfz != null ">#{kfz},</if> | ||||
|             <if test="classdf != null ">#{classdf},</if> | ||||
|             <if test="items != null  and items != ''">#{items},</if> | ||||
|             <if test="values != null  and values != ''">#{values},</if> | ||||
|             <if test="bzmf != null ">#{bzmf},</if> | ||||
|             <if test="zzdf != null ">#{zzdf},</if> | ||||
|             <if test="kfcs != null ">#{kfcs},</if> | ||||
|             <if test="pgdx != null ">#{pgdx},</if> | ||||
|             <if test="pgdxxm != null ">#{pgdxxm},</if> | ||||
|             <if test="createUserid != null ">#{createUserid},</if> | ||||
|             <if test="createTime != null ">#{createTime},</if> | ||||
|         </trim> | ||||
| @@ -123,10 +132,13 @@ | ||||
|             <if test="bzid != null ">bzid = #{bzid},</if> | ||||
|             <if test="kfz != null ">kfz = #{kfz},</if> | ||||
|             <if test="classdf != null ">classdf = #{classdf},</if> | ||||
|             <if test="items != null  and items != ''">items = #{items},</if> | ||||
|             <if test="values != null  and values != ''">values = #{values},</if> | ||||
|             <if test="bzmf != null ">bzmf = #{bzmf},</if> | ||||
|             <if test="zzdf != null ">zzdf = #{zzdf},</if> | ||||
|             <if test="kfcs != null ">kfcs = #{kfcs},</if> | ||||
|             <if test="pgdx != null ">pgdx = #{pgdx},</if> | ||||
|             <if test="pgdxxm != null ">pgdxxm = #{pgdxxm},</if> | ||||
|             <if test="createUserid != null ">create_userid = #{createUserid},</if> | ||||
|             <if test="createTime != null ">create_time = #{createTime},</if> | ||||
|         </trim> | ||||
|   | ||||
| @@ -0,0 +1,77 @@ | ||||
| <?xml version="1.0" encoding="UTF-8" ?> | ||||
| <!DOCTYPE mapper | ||||
|         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" | ||||
|         "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> | ||||
| <mapper namespace="com.ruoyi.project.benyi.mapper.ByDayflowassessmentitemMapper"> | ||||
|  | ||||
|     <resultMap type="ByDayflowassessmentitem" id="ByDayflowassessmentitemResult"> | ||||
|         <result property="id" column="id"/> | ||||
|         <result property="pid" column="pid"/> | ||||
|         <result property="item" column="item"/> | ||||
|         <result property="value" column="value"/> | ||||
|         <result property="remark" column="remark"/> | ||||
|         <result property="createTime" column="create_time"/> | ||||
|     </resultMap> | ||||
|  | ||||
|     <sql id="selectByDayflowassessmentitemVo"> | ||||
|         select id, pid, item, value, remark, create_time from by_dayflowassessmentitem | ||||
|     </sql> | ||||
|  | ||||
|     <select id="selectByDayflowassessmentitemList" parameterType="ByDayflowassessmentitem" | ||||
|             resultMap="ByDayflowassessmentitemResult"> | ||||
|         <include refid="selectByDayflowassessmentitemVo"/> | ||||
|         <where> | ||||
|             <if test="pid != null ">and pid = #{pid}</if> | ||||
|             <if test="item != null ">and item = #{item}</if> | ||||
|             <if test="value != null ">and value = #{value}</if> | ||||
|         </where> | ||||
|     </select> | ||||
|  | ||||
|     <select id="selectByDayflowassessmentitemById" parameterType="Long" resultMap="ByDayflowassessmentitemResult"> | ||||
|         <include refid="selectByDayflowassessmentitemVo"/> | ||||
|         where id = #{id} | ||||
|     </select> | ||||
|  | ||||
|     <insert id="insertByDayflowassessmentitem" parameterType="ByDayflowassessmentitem" useGeneratedKeys="true" | ||||
|             keyProperty="id"> | ||||
|         insert into by_dayflowassessmentitem | ||||
|         <trim prefix="(" suffix=")" suffixOverrides=","> | ||||
|             <if test="pid != null ">pid,</if> | ||||
|             <if test="item != null ">item,</if> | ||||
|             <if test="value != null ">value,</if> | ||||
|             <if test="remark != null  and remark != ''">remark,</if> | ||||
|             <if test="createTime != null ">create_time,</if> | ||||
|         </trim> | ||||
|         <trim prefix="values (" suffix=")" suffixOverrides=","> | ||||
|             <if test="pid != null ">#{pid},</if> | ||||
|             <if test="item != null ">#{item},</if> | ||||
|             <if test="value != null ">#{value},</if> | ||||
|             <if test="remark != null  and remark != ''">#{remark},</if> | ||||
|             <if test="createTime != null ">#{createTime},</if> | ||||
|         </trim> | ||||
|     </insert> | ||||
|  | ||||
|     <update id="updateByDayflowassessmentitem" parameterType="ByDayflowassessmentitem"> | ||||
|         update by_dayflowassessmentitem | ||||
|         <trim prefix="SET" suffixOverrides=","> | ||||
|             <if test="pid != null ">pid = #{pid},</if> | ||||
|             <if test="item != null ">item = #{item},</if> | ||||
|             <if test="value != null ">value = #{value},</if> | ||||
|             <if test="remark != null  and remark != ''">remark = #{remark},</if> | ||||
|             <if test="createTime != null ">create_time = #{createTime},</if> | ||||
|         </trim> | ||||
|         where id = #{id} | ||||
|     </update> | ||||
|  | ||||
|     <delete id="deleteByDayflowassessmentitemById" parameterType="Long"> | ||||
|         delete from by_dayflowassessmentitem where id = #{id} | ||||
|     </delete> | ||||
|  | ||||
|     <delete id="deleteByDayflowassessmentitemByIds" parameterType="String"> | ||||
|         delete from by_dayflowassessmentitem where id in | ||||
|         <foreach item="id" collection="array" open="(" separator="," close=")"> | ||||
|             #{id} | ||||
|         </foreach> | ||||
|     </delete> | ||||
|  | ||||
| </mapper> | ||||
		Reference in New Issue
	
	Block a user