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

评估一日流程

Browse Source
This commit is contained in:
zhanglipeng
2021-04-05 18:02:31 +08:00
parent 01c4b38e7d
commit 862a093e54
11 changed files with 597 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

83
ruoyi/src/main/java/com/ruoyi/project/benyi/domain/ByDayflowassessmentitem.java Normal file
View File

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

61
ruoyi/src/main/java/com/ruoyi/project/benyi/mapper/ByDayflowassessmentitemMapper.java Normal file
View File

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

61
ruoyi/src/main/java/com/ruoyi/project/benyi/service/IByDayflowassessmentitemService.java Normal file
View File

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

89
ruoyi/src/main/java/com/ruoyi/project/benyi/service/impl/ByDayflowassessmentitemServiceImpl.java Normal file
View File

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

29
ruoyi/src/main/java/com/ruoyi/project/system/controller/ByClassController.java
View File

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

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

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

77
ruoyi/src/main/resources/mybatis/benyi/ByDayflowassessmentitemMapper.xml Normal file
View File

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