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

见习之星考核

Browse Source
This commit is contained in:
paidaxing444
2020-09-01 09:50:54 +08:00
parent 6c5ba0d4eb
commit 598d72e8bc
9 changed files with 111 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJzxzkhsh.java → ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJxzxkhsh.java
View File

@ -11,7 +11,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2020-08-29
*/
public class TsbzJzxzkhsh extends BaseEntity {
public class TsbzJxzxkhsh extends BaseEntity {
private static final long serialVersionUID = 1L;
/**

18
ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJzxzkhshMapper.java → ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/mapper/TsbzJxzxkhshMapper.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.jxzxkhgl.mapper;
import java.util.List;
import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhsh;
/**
* 考核审核过程Mapper接口
@ -10,38 +10,38 @@ import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
* @author ruoyi
* @date 2020-08-29
*/
public interface TsbzJzxzkhshMapper {
public interface TsbzJxzxkhshMapper {
/**
* 查询考核审核过程
*
* @param id 考核审核过程ID
* @return 考核审核过程
*/
public TsbzJzxzkhsh selectTsbzJzxzkhshById(Long id);
public TsbzJxzxkhsh selectTsbzJzxzkhshById(Long id);
/**
* 查询考核审核过程列表
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 考核审核过程集合
*/
public List<TsbzJzxzkhsh> selectTsbzJzxzkhshList(TsbzJzxzkhsh tsbzJzxzkhsh);
public List<TsbzJxzxkhsh> selectTsbzJzxzkhshList(TsbzJxzxkhsh tsbzJxzxkhsh);
/**
* 新增考核审核过程
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 结果
*/
public int insertTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
public int insertTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
/**
* 修改考核审核过程
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 结果
*/
public int updateTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
public int updateTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
/**
* 删除考核审核过程

18
ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJzxzkhshService.java → ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/ITsbzJxzxkhshService.java
View File

@ -2,7 +2,7 @@ package com.ruoyi.jxzxkhgl.service;
import java.util.List;
import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhsh;
/**
* 考核审核过程Service接口
@ -10,38 +10,38 @@ import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
* @author ruoyi
* @date 2020-08-29
*/
public interface ITsbzJzxzkhshService {
public interface ITsbzJxzxkhshService {
/**
* 查询考核审核过程
*
* @param id 考核审核过程ID
* @return 考核审核过程
*/
public TsbzJzxzkhsh selectTsbzJzxzkhshById(Long id);
public TsbzJxzxkhsh selectTsbzJzxzkhshById(Long id);
/**
* 查询考核审核过程列表
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 考核审核过程集合
*/
public List<TsbzJzxzkhsh> selectTsbzJzxzkhshList(TsbzJzxzkhsh tsbzJzxzkhsh);
public List<TsbzJxzxkhsh> selectTsbzJzxzkhshList(TsbzJxzxkhsh tsbzJxzxkhsh);
/**
* 新增考核审核过程
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 结果
*/
public int insertTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
public int insertTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
/**
* 修改考核审核过程
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 结果
*/
public int updateTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh);
public int updateTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh);
/**
* 批量删除考核审核过程

38
ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJzxzkhshServiceImpl.java → ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/service/impl/TsbzJxzxkhshServiceImpl.java
View File

@ -5,9 +5,9 @@ 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.jxzxkhgl.mapper.TsbzJzxzkhshMapper;
import com.ruoyi.jxzxkhgl.domain.TsbzJzxzkhsh;
import com.ruoyi.jxzxkhgl.service.ITsbzJzxzkhshService;
import com.ruoyi.jxzxkhgl.mapper.TsbzJxzxkhshMapper;
import com.ruoyi.jxzxkhgl.domain.TsbzJxzxkhsh;
import com.ruoyi.jxzxkhgl.service.ITsbzJxzxkhshService;
/**
* 考核审核过程Service业务层处理
@ -16,9 +16,9 @@ import com.ruoyi.jxzxkhgl.service.ITsbzJzxzkhshService;
* @date 2020-08-29
*/
@Service
public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
public class TsbzJxzxkhshServiceImpl implements ITsbzJxzxkhshService {
@Autowired
private TsbzJzxzkhshMapper tsbzJzxzkhshMapper;
private TsbzJxzxkhshMapper tsbzJxzxkhshMapper;
/**
* 查询考核审核过程
@ -27,42 +27,42 @@ public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
* @return 考核审核过程
*/
@Override
public TsbzJzxzkhsh selectTsbzJzxzkhshById(Long id) {
return tsbzJzxzkhshMapper.selectTsbzJzxzkhshById(id);
public TsbzJxzxkhsh selectTsbzJzxzkhshById(Long id) {
return tsbzJxzxkhshMapper.selectTsbzJzxzkhshById(id);
}
/**
* 查询考核审核过程列表
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 考核审核过程
*/
@Override
public List<TsbzJzxzkhsh> selectTsbzJzxzkhshList(TsbzJzxzkhsh tsbzJzxzkhsh) {
return tsbzJzxzkhshMapper.selectTsbzJzxzkhshList(tsbzJzxzkhsh);
public List<TsbzJxzxkhsh> selectTsbzJzxzkhshList(TsbzJxzxkhsh tsbzJxzxkhsh) {
return tsbzJxzxkhshMapper.selectTsbzJzxzkhshList(tsbzJxzxkhsh);
}
/**
* 新增考核审核过程
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 结果
*/
@Override
public int insertTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh) {
tsbzJzxzkhsh.setCreateTime(DateUtils.getNowDate());
return tsbzJzxzkhshMapper.insertTsbzJzxzkhsh(tsbzJzxzkhsh);
public int insertTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh) {
tsbzJxzxkhsh.setCreateTime(DateUtils.getNowDate());
return tsbzJxzxkhshMapper.insertTsbzJzxzkhsh(tsbzJxzxkhsh);
}
/**
* 修改考核审核过程
*
* @param tsbzJzxzkhsh 考核审核过程
* @param tsbzJxzxkhsh 考核审核过程
* @return 结果
*/
@Override
public int updateTsbzJzxzkhsh(TsbzJzxzkhsh tsbzJzxzkhsh) {
return tsbzJzxzkhshMapper.updateTsbzJzxzkhsh(tsbzJzxzkhsh);
public int updateTsbzJzxzkhsh(TsbzJxzxkhsh tsbzJxzxkhsh) {
return tsbzJxzxkhshMapper.updateTsbzJzxzkhsh(tsbzJxzxkhsh);
}
/**
@ -73,7 +73,7 @@ public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
*/
@Override
public int deleteTsbzJzxzkhshByIds(Long[] ids) {
return tsbzJzxzkhshMapper.deleteTsbzJzxzkhshByIds(ids);
return tsbzJxzxkhshMapper.deleteTsbzJzxzkhshByIds(ids);
}
/**
@ -84,6 +84,6 @@ public class TsbzJzxzkhshServiceImpl implements ITsbzJzxzkhshService {
*/
@Override
public int deleteTsbzJzxzkhshById(Long id) {
return tsbzJzxzkhshMapper.deleteTsbzJzxzkhshById(id);
return tsbzJxzxkhshMapper.deleteTsbzJzxzkhshById(id);
}
}

57
ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJzxzkhshMapper.xml → ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhshMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.jxzxkhgl.mapper.TsbzJzxzkhshMapper">
<mapper namespace="com.ruoyi.jxzxkhgl.mapper.TsbzJxzxkhshMapper">
<resultMap type="TsbzJzxzkhsh" id="TsbzJzxzkhshResult">
<resultMap type="TsbzJxzxkhsh" id="TsbzJxzxkhshResult">
<result property="id" column="id"/>
<result property="faid" column="faid"/>
<result property="jsid" column="jsid"/>
@ -19,33 +19,36 @@
<result property="createTime" column="create_time"/>
</resultMap>
<sql id="selectTsbzJzxzkhshVo">
select id, faid, jsid, status, xjshr, xjshyj, xjshjy, qjshr, qjshyj, qjshjy, createuseird, create_time from tsbz_jzxzkhsh
<sql id="selectTsbzJxzxkhshVo">
select d.* from tsbz_jxzxmd a
left join tsbz_jxjsjbxx b on b.id=a.jsid
left join sys_dept c on b.prdwid=c.schoolid
left join tsbz_jxzxkhsh d on a.jsid=d.jsid
</sql>
<select id="selectTsbzJzxzkhshList" parameterType="TsbzJzxzkhsh" resultMap="TsbzJzxzkhshResult">
<include refid="selectTsbzJzxzkhshVo"/>
<select id="selectTsbzJxzxkhshList" parameterType="TsbzJxzxkhsh" resultMap="TsbzJxzxkhshResult">
<include refid="selectTsbzJxzxkhshVo"/>
<where>
<if test="faid != null ">and faid = #{faid}</if>
<if test="jsid != null ">and jsid = #{jsid}</if>
<if test="status != null and status != ''">and status = #{status}</if>
<if test="xjshr != null ">and xjshr = #{xjshr}</if>
<if test="xjshyj != null and xjshyj != ''">and xjshyj = #{xjshyj}</if>
<if test="xjshjy != null and xjshjy != ''">and xjshjy = #{xjshjy}</if>
<if test="qjshr != null ">and qjshr = #{qjshr}</if>
<if test="qjshyj != null and qjshyj != ''">and qjshyj = #{qjshyj}</if>
<if test="qjshjy != null and qjshjy != ''">and qjshjy = #{qjshjy}</if>
<if test="createuseird != null ">and createuseird = #{createuseird}</if>
<if test="faid != null ">and d.faid = #{faid}</if>
<if test="jsid != null ">and d.jsid = #{jsid}</if>
<if test="status != null and status != ''">and d.status = #{status}</if>
<if test="xjshr != null ">and d.xjshr = #{xjshr}</if>
<if test="xjshyj != null and xjshyj != ''">and d.xjshyj = #{xjshyj}</if>
<if test="xjshjy != null and xjshjy != ''">and d.xjshjy = #{xjshjy}</if>
<if test="qjshr != null ">and d.qjshr = #{qjshr}</if>
<if test="qjshyj != null and qjshyj != ''">and d.qjshyj = #{qjshyj}</if>
<if test="qjshjy != null and qjshjy != ''">and d.qjshjy = #{qjshjy}</if>
<if test="createuseird != null ">and d.createuseird = #{createuseird}</if>
</where>
</select>
<select id="selectTsbzJzxzkhshById" parameterType="Long" resultMap="TsbzJzxzkhshResult">
<include refid="selectTsbzJzxzkhshVo"/>
where id = #{id}
<select id="selectTsbzJxzxkhshById" parameterType="Long" resultMap="TsbzJxzxkhshResult">
<include refid="selectTsbzJxzxkhshVo"/>
where d.id = #{id}
</select>
<insert id="insertTsbzJzxzkhsh" parameterType="TsbzJzxzkhsh" useGeneratedKeys="true" keyProperty="id">
insert into tsbz_jzxzkhsh
<insert id="insertTsbzJxzxkhsh" parameterType="TsbzJxzxkhsh" useGeneratedKeys="true" keyProperty="id">
insert into tsbz_jxzxkhsh
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="faid != null">faid,</if>
<if test="jsid != null">jsid,</if>
@ -74,8 +77,8 @@
</trim>
</insert>
<update id="updateTsbzJzxzkhsh" parameterType="TsbzJzxzkhsh">
update tsbz_jzxzkhsh
<update id="updateTsbzJxzxkhsh" parameterType="TsbzJxzxkhsh">
update tsbz_jxzxkhsh
<trim prefix="SET" suffixOverrides=",">
<if test="faid != null">faid = #{faid},</if>
<if test="jsid != null">jsid = #{jsid},</if>
@ -92,12 +95,12 @@
where id = #{id}
</update>
<delete id="deleteTsbzJzxzkhshById" parameterType="Long">
delete from tsbz_jzxzkhsh where id = #{id}
<delete id="deleteTsbzJxzxkhshById" parameterType="Long">
delete from tsbz_jxzxkhsh where id = #{id}
</delete>
<delete id="deleteTsbzJzxzkhshByIds" parameterType="String">
delete from tsbz_jzxzkhsh where id in
<delete id="deleteTsbzJxzxkhshByIds" parameterType="String">
delete from tsbz_jxzxkhsh where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>