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

Merge remote-tracking branch 'origin/master' into master

Browse Source 
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJdcx.java
This commit is contained in:
mumu
2020-08-23 18:51:24 +08:00
parent f552043554 d90ff2c7b5
commit 7496d01a95
13 changed files with 713 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java Normal file
View File

@ -0,0 +1,82 @@
package com.ruoyi.jxjs.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
/**
* 见习之星名单对象 tsbz_jxzxmd
*
* @author ruoyi
* @date 2020-08-23
*/
public class TsbzJxzxmd extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 编号
*/
private Long id;
/**
* 教师id
*/
@Excel(name = "教师id")
private Long jsid;
/**
* 年份
*/
@Excel(name = "年份")
private String nf;
/**
* 创建人
*/
@Excel(name = "创建人")
private Long createuserid;
public void setId(Long id) {
this.id = id;
}
public Long getId() {
return id;
}
public void setJsid(Long jsid) {
this.jsid = jsid;
}
public Long getJsid() {
return jsid;
}
public void setNf(String nf) {
this.nf = nf;
}
public String getNf() {
return nf;
}
public void setCreateuserid(Long createuserid) {
this.createuserid = createuserid;
}
public Long getCreateuserid() {
return createuserid;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("jsid", getJsid())
.append("nf", getNf())
.append("createuserid", getCreateuserid())
.append("createTime", getCreateTime())
.toString();
}
}

61
ruoyi-system/src/main/java/com/ruoyi/jxjs/mapper/TsbzJxzxmdMapper.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.jxjs.mapper;
import java.util.List;
import com.ruoyi.jxjs.domain.TsbzJxzxmd;
/**
* 见习之星名单Mapper接口
*
* @author ruoyi
* @date 2020-08-23
*/
public interface TsbzJxzxmdMapper {
/**
* 查询见习之星名单
*
* @param id 见习之星名单ID
* @return 见习之星名单
*/
public TsbzJxzxmd selectTsbzJxzxmdById(Long id);
/**
* 查询见习之星名单列表
*
* @param tsbzJxzxmd 见习之星名单
* @return 见习之星名单集合
*/
public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd);
/**
* 新增见习之星名单
*
* @param tsbzJxzxmd 见习之星名单
* @return 结果
*/
public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
/**
* 修改见习之星名单
*
* @param tsbzJxzxmd 见习之星名单
* @return 结果
*/
public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
/**
* 删除见习之星名单
*
* @param id 见习之星名单ID
* @return 结果
*/
public int deleteTsbzJxzxmdById(Long id);
/**
* 批量删除见习之星名单
*
* @param ids 需要删除的数据ID
* @return 结果
*/
public int deleteTsbzJxzxmdByIds(Long[] ids);
}

61
ruoyi-system/src/main/java/com/ruoyi/jxjs/service/ITsbzJxzxmdService.java Normal file
View File

@ -0,0 +1,61 @@
package com.ruoyi.jxjs.service;
import java.util.List;
import com.ruoyi.jxjs.domain.TsbzJxzxmd;
/**
* 见习之星名单Service接口
*
* @author ruoyi
* @date 2020-08-23
*/
public interface ITsbzJxzxmdService
{
/**
* 查询见习之星名单
*
* @param id 见习之星名单ID
* @return 见习之星名单
*/
public TsbzJxzxmd selectTsbzJxzxmdById(Long id);
/**
* 查询见习之星名单列表
*
* @param tsbzJxzxmd 见习之星名单
* @return 见习之星名单集合
*/
public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd);
/**
* 新增见习之星名单
*
* @param tsbzJxzxmd 见习之星名单
* @return 结果
*/
public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
/**
* 修改见习之星名单
*
* @param tsbzJxzxmd 见习之星名单
* @return 结果
*/
public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd);
/**
* 批量删除见习之星名单
*
* @param ids 需要删除的见习之星名单ID
* @return 结果
*/
public int deleteTsbzJxzxmdByIds(Long[] ids);
/**
* 删除见习之星名单信息
*
* @param id 见习之星名单ID
* @return 结果
*/
public int deleteTsbzJxzxmdById(Long id);
}

95
ruoyi-system/src/main/java/com/ruoyi/jxjs/service/impl/TsbzJxzxmdServiceImpl.java Normal file
View File

@ -0,0 +1,95 @@
package com.ruoyi.jxjs.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.jxjs.mapper.TsbzJxzxmdMapper;
import com.ruoyi.jxjs.domain.TsbzJxzxmd;
import com.ruoyi.jxjs.service.ITsbzJxzxmdService;
/**
* 见习之星名单Service业务层处理
*
* @author ruoyi
* @date 2020-08-23
*/
@Service
public class TsbzJxzxmdServiceImpl implements ITsbzJxzxmdService
{
@Autowired
private TsbzJxzxmdMapper tsbzJxzxmdMapper;
/**
* 查询见习之星名单
*
* @param id 见习之星名单ID
* @return 见习之星名单
*/
@Override
public TsbzJxzxmd selectTsbzJxzxmdById(Long id)
{
return tsbzJxzxmdMapper.selectTsbzJxzxmdById(id);
}
/**
* 查询见习之星名单列表
*
* @param tsbzJxzxmd 见习之星名单
* @return 见习之星名单
*/
@Override
public List<TsbzJxzxmd> selectTsbzJxzxmdList(TsbzJxzxmd tsbzJxzxmd)
{
return tsbzJxzxmdMapper.selectTsbzJxzxmdList(tsbzJxzxmd);
}
/**
* 新增见习之星名单
*
* @param tsbzJxzxmd 见习之星名单
* @return 结果
*/
@Override
public int insertTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd)
{
tsbzJxzxmd.setCreateTime(DateUtils.getNowDate());
return tsbzJxzxmdMapper.insertTsbzJxzxmd(tsbzJxzxmd);
}
/**
* 修改见习之星名单
*
* @param tsbzJxzxmd 见习之星名单
* @return 结果
*/
@Override
public int updateTsbzJxzxmd(TsbzJxzxmd tsbzJxzxmd)
{
return tsbzJxzxmdMapper.updateTsbzJxzxmd(tsbzJxzxmd);
}
/**
* 批量删除见习之星名单
*
* @param ids 需要删除的见习之星名单ID
* @return 结果
*/
@Override
public int deleteTsbzJxzxmdByIds(Long[] ids)
{
return tsbzJxzxmdMapper.deleteTsbzJxzxmdByIds(ids);
}
/**
* 删除见习之星名单信息
*
* @param id 见习之星名单ID
* @return 结果
*/
@Override
public int deleteTsbzJxzxmdById(Long id)
{
return tsbzJxzxmdMapper.deleteTsbzJxzxmdById(id);
}
}

7
ruoyi-system/src/main/resources/mapper/jxjs/TsbzJdcxMapper.xml
View File

@ -28,10 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="msjgmnktjxdf" column="msjgmnktjxdf" />
<result property="yjdf" column="yjdf" />
<result property="zhdf2" column="zhdf2" />
<result property="lqzt" column="lqzt" />
</resultMap>
<sql id="selectTsbzJdcxVo">
select id, faid, jsid, dqzt, createuserid, create_time, jdxshr, jdxshzt, sbly, qjshr, qjshzt, qjshyj, jdpx, alfxdf, jasjdf, gbzdf, zhdf, cjdrcreate_time, msqr, msqrcreate_time, msjgmnktjxdf, yjdf, zhdf2 from tsbz_jdcx
select id, faid, jsid, dqzt, createuserid, create_time, jdxshr, jdxshzt, sbly, qjshr, qjshzt, qjshyj, jdpx, alfxdf, jasjdf, gbzdf, zhdf, cjdrcreate_time, msqr, msqrcreate_time, msjgmnktjxdf, yjdf, zhdf2, lqzt from tsbz_jdcx
</sql>
<select id="selectTsbzJdcxList" parameterType="TsbzJdcx" resultMap="TsbzJdcxResult">
@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null "> and msjgmnktjxdf = #{msjgmnktjxdf}</if>
<if test="yjdf != null "> and yjdf = #{yjdf}</if>
<if test="zhdf2 != null "> and zhdf2 = #{zhdf2}</if>
<if test="lqzt != null and lqzt != ''"> and lqzt = #{lqzt}</if>
</where>
</select>
@ -91,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null">msjgmnktjxdf,</if>
<if test="yjdf != null">yjdf,</if>
<if test="zhdf2 != null">zhdf2,</if>
<if test="lqzt != null">lqzt,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="faid != null">#{faid},</if>
@ -115,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null">#{msjgmnktjxdf},</if>
<if test="yjdf != null">#{yjdf},</if>
<if test="zhdf2 != null">#{zhdf2},</if>
<if test="lqzt != null">#{lqzt},</if>
</trim>
</insert>
@ -143,6 +147,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="msjgmnktjxdf != null">msjgmnktjxdf = #{msjgmnktjxdf},</if>
<if test="yjdf != null">yjdf = #{yjdf},</if>
<if test="zhdf2 != null">zhdf2 = #{zhdf2},</if>
<if test="lqzt != null">lqzt = #{lqzt},</if>
</trim>
where id = #{id}
</update>

71
ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml Normal file
View File

@ -0,0 +1,71 @@
<?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.jxjs.mapper.TsbzJxzxmdMapper">
<resultMap type="TsbzJxzxmd" id="TsbzJxzxmdResult">
<result property="id" column="id" />
<result property="jsid" column="jsid" />
<result property="nf" column="nf" />
<result property="createuserid" column="createuserid" />
<result property="createTime" column="create_time" />
</resultMap>
<sql id="selectTsbzJxzxmdVo">
select id, jsid, nf, createuserid, create_time from tsbz_jxzxmd
</sql>
<select id="selectTsbzJxzxmdList" parameterType="TsbzJxzxmd" resultMap="TsbzJxzxmdResult">
<include refid="selectTsbzJxzxmdVo"/>
<where>
<if test="jsid != null "> and jsid = #{jsid}</if>
<if test="nf != null and nf != ''"> and nf = #{nf}</if>
<if test="createuserid != null "> and createuserid = #{createuserid}</if>
</where>
</select>
<select id="selectTsbzJxzxmdById" parameterType="Long" resultMap="TsbzJxzxmdResult">
<include refid="selectTsbzJxzxmdVo"/>
where id = #{id}
</select>
<insert id="insertTsbzJxzxmd" parameterType="TsbzJxzxmd" useGeneratedKeys="true" keyProperty="id">
insert into tsbz_jxzxmd
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="jsid != null">jsid,</if>
<if test="nf != null">nf,</if>
<if test="createuserid != null">createuserid,</if>
<if test="createTime != null">create_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="jsid != null">#{jsid},</if>
<if test="nf != null">#{nf},</if>
<if test="createuserid != null">#{createuserid},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
</insert>
<update id="updateTsbzJxzxmd" parameterType="TsbzJxzxmd">
update tsbz_jxzxmd
<trim prefix="SET" suffixOverrides=",">
<if test="jsid != null">jsid = #{jsid},</if>
<if test="nf != null">nf = #{nf},</if>
<if test="createuserid != null">createuserid = #{createuserid},</if>
<if test="createTime != null">create_time = #{createTime},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteTsbzJxzxmdById" parameterType="Long">
delete from tsbz_jxzxmd where id = #{id}
</delete>
<delete id="deleteTsbzJxzxmdByIds" parameterType="String">
delete from tsbz_jxzxmd where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>