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-04 10:46:30 +08:00
parent 5520d5e218
commit d0c0116e6f
11 changed files with 420 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ruoyi-system/src/main/java/com/ruoyi/jxjs/domain/TsbzJxzxmd.java
View File

@ -44,6 +44,43 @@ public class TsbzJxzxmd extends BaseEntity {
private String faid;
private TsbzJxjsjbxx tsbzJxjsjbxx;
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getPrdwid() {
return prdwid;
}
public void setPrdwid(String prdwid) {
this.prdwid = prdwid;
}
public String getPrdwmc() {
return prdwmc;
}
public void setPrdwmc(String prdwmc) {
this.prdwmc = prdwmc;
}
public String getJdxid() {
return jdxid;
}
public void setJdxid(String jdxid) {
this.jdxid = jdxid;
}
private String name;
private String prdwid;
private String prdwmc;
private String jdxid;
public void setId(Long id) {
this.id = id;
}
@ -111,6 +148,10 @@ public class TsbzJxzxmd extends BaseEntity {
.append("bfb", getBfb())
.append("faid", getFaid())
.append("tsbzJxjsjbxx", getTsbzJxjsjbxx())
.append("name", getName())
.append("prdwid", getPrdwid())
.append("prdwmc", getPrdwmc())
.append("jdxid", getJdxid())
.toString();
}
}

135
ruoyi-system/src/main/java/com/ruoyi/jxzxkhgl/domain/TsbzJxzxkhfa.java
View File

@ -1,6 +1,7 @@
package com.ruoyi.jxzxkhgl.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@ -9,150 +10,158 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 见习之星考核方案对象 tsbz_jxzxkhfa
*
*
* @author ruoyi
* @date 2020-08-29
*/
public class TsbzJxzxkhfa extends BaseEntity
{
public class TsbzJxzxkhfa extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 编号 */
/**
* 编号
*/
private Long id;
/** 考核方案名称 */
/**
* 考核方案名称
*/
@Excel(name = "考核方案名称")
private String name;
/** 考核方案状态
0:未启动
1:启动
9:已结束 */
/**
* 考核方案状态
* 0:未启动
* 1:启动
* 9:已结束
*/
@Excel(name = "考核方案状态")
private String status;
/** 考核开始时间 */
/**
* 考核开始时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "考核开始时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date starttime;
/** 考核结束时间 */
/**
* 考核结束时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "考核结束时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date endtime;
/** 考核文件名称 */
/**
* 考核文件名称
*/
@Excel(name = "考核文件名称")
private String filename;
/** 文件路径 */
/**
* 文件路径
*/
@Excel(name = "文件路径")
private String filepath;
/** 考核年份 */
/**
* 考核年份
*/
@JsonFormat(pattern = "yyyy")
@Excel(name = "考核年份", width = 30, dateFormat = "yyyy")
private Date khnf;
/** 创建人 */
/**
* 创建人
*/
@Excel(name = "创建人")
private Long createuserid;
public void setId(Long id)
{
public void setId(Long id) {
this.id = id;
}
public Long getId()
{
public Long getId() {
return id;
}
public void setName(String name)
{
public void setName(String name) {
this.name = name;
}
public String getName()
{
public String getName() {
return name;
}
public void setStatus(String status)
{
public void setStatus(String status) {
this.status = status;
}
public String getStatus()
{
public String getStatus() {
return status;
}
public void setStarttime(Date starttime)
{
public void setStarttime(Date starttime) {
this.starttime = starttime;
}
public Date getStarttime()
{
public Date getStarttime() {
return starttime;
}
public void setEndtime(Date endtime)
{
public void setEndtime(Date endtime) {
this.endtime = endtime;
}
public Date getEndtime()
{
public Date getEndtime() {
return endtime;
}
public void setFilename(String filename)
{
public void setFilename(String filename) {
this.filename = filename;
}
public String getFilename()
{
public String getFilename() {
return filename;
}
public void setFilepath(String filepath)
{
public void setFilepath(String filepath) {
this.filepath = filepath;
}
public String getFilepath()
{
public String getFilepath() {
return filepath;
}
public void setKhnf(Date khnf)
{
public void setKhnf(Date khnf) {
this.khnf = khnf;
}
public Date getKhnf()
{
public Date getKhnf() {
return khnf;
}
public void setCreateuserid(Long createuserid)
{
public void setCreateuserid(Long createuserid) {
this.createuserid = createuserid;
}
public Long getCreateuserid()
{
public Long getCreateuserid() {
return createuserid;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("status", getStatus())
.append("starttime", getStarttime())
.append("endtime", getEndtime())
.append("filename", getFilename())
.append("filepath", getFilepath())
.append("khnf", getKhnf())
.append("createuserid", getCreateuserid())
.append("createTime", getCreateTime())
.toString();
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("name", getName())
.append("status", getStatus())
.append("starttime", getStarttime())
.append("endtime", getEndtime())
.append("filename", getFilename())
.append("filepath", getFilepath())
.append("khnf", getKhnf())
.append("createuserid", getCreateuserid())
.append("createTime", getCreateTime())
.append("remark", getRemark())
.toString();
}
}

4
ruoyi-system/src/main/resources/mapper/jxjs/TsbzJxzxmdMapper.xml
View File

@ -102,6 +102,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
(select count(*)from tsbz_jxzxkhgcsj where faid=#{faid} and createuserid=a.jsid)/(select count(*) from tsbz_jxzxkhzbx where faid=#{faid}) bfb from tsbz_jxzxmd a
left join tsbz_jxjsjbxx b on a.jsid=b.id
where a.nf=#{nf}
<if test="name != null and name != ''">and b.name like concat('%', #{name}, '%')</if>
<if test="prdwid != null and prdwid != ''">and b.prdwid = #{prdwid}</if>
<if test="prdwmc != null and prdwmc != ''">and b.prdwmc = #{prdwmc}</if>
<if test="jdxid != null and jdxid != ''">and b.jdxid = #{jdxid}</if>
</select>
</mapper>

63
ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhfaMapper.xml
View File

@ -1,45 +1,47 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.jxzxkhgl.mapper.TsbzJxzxkhfaMapper">
<resultMap type="TsbzJxzxkhfa" id="TsbzJxzxkhfaResult">
<result property="id" column="id" />
<result property="name" column="name" />
<result property="status" column="status" />
<result property="starttime" column="starttime" />
<result property="endtime" column="endtime" />
<result property="filename" column="filename" />
<result property="filepath" column="filepath" />
<result property="khnf" column="khnf" />
<result property="createuserid" column="createuserid" />
<result property="createTime" column="create_time" />
<result property="id" column="id"/>
<result property="name" column="name"/>
<result property="status" column="status"/>
<result property="starttime" column="starttime"/>
<result property="endtime" column="endtime"/>
<result property="filename" column="filename"/>
<result property="filepath" column="filepath"/>
<result property="khnf" column="khnf"/>
<result property="createuserid" column="createuserid"/>
<result property="createTime" column="create_time"/>
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectTsbzJxzxkhfaVo">
select id, name, status, starttime, endtime, filename, filepath, khnf, createuserid, create_time from tsbz_jxzxkhfa
select id, name, status, starttime, endtime, filename, filepath, khnf, createuserid, create_time, remark from tsbz_jxzxkhfa
</sql>
<select id="selectTsbzJxzxkhfaList" parameterType="TsbzJxzxkhfa" resultMap="TsbzJxzxkhfaResult">
<include refid="selectTsbzJxzxkhfaVo"/>
<where>
<if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="starttime != null "> and starttime = #{starttime}</if>
<if test="endtime != null "> and endtime = #{endtime}</if>
<if test="filename != null and filename != ''"> and filename like concat('%', #{filename}, '%')</if>
<if test="filepath != null and filepath != ''"> and filepath = #{filepath}</if>
<if test="khnf != null "> and khnf = #{khnf}</if>
<if test="createuserid != null "> and createuserid = #{createuserid}</if>
<where>
<if test="name != null and name != ''">and name like concat('%', #{name}, '%')</if>
<if test="status != null and status != ''">and status = #{status}</if>
<if test="starttime != null ">and starttime = #{starttime}</if>
<if test="endtime != null ">and endtime = #{endtime}</if>
<if test="filename != null and filename != ''">and filename like concat('%', #{filename}, '%')</if>
<if test="filepath != null and filepath != ''">and filepath = #{filepath}</if>
<if test="khnf != null ">and khnf = #{khnf}</if>
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
</where>
order by khnf desc
</select>
<select id="selectTsbzJxzxkhfaById" parameterType="Long" resultMap="TsbzJxzxkhfaResult">
<include refid="selectTsbzJxzxkhfaVo"/>
where id = #{id}
</select>
<insert id="insertTsbzJxzxkhfa" parameterType="TsbzJxzxkhfa" useGeneratedKeys="true" keyProperty="id">
insert into tsbz_jxzxkhfa
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -52,7 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khnf != null">khnf,</if>
<if test="createuserid != null">createuserid,</if>
<if test="createTime != null">create_time,</if>
</trim>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="name != null">#{name},</if>
<if test="status != null">#{status},</if>
@ -63,7 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khnf != null">#{khnf},</if>
<if test="createuserid != null">#{createuserid},</if>
<if test="createTime != null">#{createTime},</if>
</trim>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateTsbzJxzxkhfa" parameterType="TsbzJxzxkhfa">
@ -78,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khnf != null">khnf = #{khnf},</if>
<if test="createuserid != null">createuserid = #{createuserid},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
@ -87,10 +92,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTsbzJxzxkhfaByIds" parameterType="String">
delete from tsbz_jxzxkhfa where id in
delete from tsbz_jxzxkhfa where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>

77
ruoyi-system/src/main/resources/mapper/jxzxkhgl/TsbzJxzxkhzbxMapper.xml
View File

@ -1,25 +1,25 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.jxzxkhgl.mapper.TsbzJxzxkhzbxMapper">
<resultMap type="TsbzJxzxkhzbx" id="TsbzJxzxkhzbxResult">
<result property="id" column="id" />
<result property="faid" column="faid" />
<result property="khmk" column="khmk" />
<result property="khnr" column="khnr" />
<result property="tjsl" column="tjsl" />
<result property="gjzd" column="gjzd" />
<result property="tbly" column="tbly" />
<result property="jkbj" column="jkbj" />
<result property="starttime" column="starttime" />
<result property="endtime" column="endtime" />
<result property="zxrw" column="zxrw" />
<result property="createuserid" column="createuserid" />
<result property="createTime" column="create_time" />
<result property="yly" column="yly" />
<result property="yle" column="yle" />
<result property="id" column="id"/>
<result property="faid" column="faid"/>
<result property="khmk" column="khmk"/>
<result property="khnr" column="khnr"/>
<result property="tjsl" column="tjsl"/>
<result property="gjzd" column="gjzd"/>
<result property="tbly" column="tbly"/>
<result property="jkbj" column="jkbj"/>
<result property="starttime" column="starttime"/>
<result property="endtime" column="endtime"/>
<result property="zxrw" column="zxrw"/>
<result property="createuserid" column="createuserid"/>
<result property="createTime" column="create_time"/>
<result property="yly" column="yly"/>
<result property="yle" column="yle"/>
</resultMap>
<sql id="selectTsbzJxzxkhzbxVo">
@ -28,28 +28,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectTsbzJxzxkhzbxList" parameterType="TsbzJxzxkhzbx" resultMap="TsbzJxzxkhzbxResult">
<include refid="selectTsbzJxzxkhzbxVo"/>
<where>
<if test="faid != null "> and faid = #{faid}</if>
<if test="khmk != null and khmk != ''"> and khmk = #{khmk}</if>
<if test="khnr != null and khnr != ''"> and khnr = #{khnr}</if>
<if test="tjsl != null "> and tjsl = #{tjsl}</if>
<if test="gjzd != null and gjzd != ''"> and gjzd = #{gjzd}</if>
<if test="tbly != null and tbly != ''"> and tbly = #{tbly}</if>
<if test="jkbj != null and jkbj != ''"> and jkbj = #{jkbj}</if>
<if test="starttime != null "> and starttime = #{starttime}</if>
<if test="endtime != null "> and endtime = #{endtime}</if>
<if test="zxrw != null and zxrw != ''"> and zxrw = #{zxrw}</if>
<if test="createuserid != null "> and createuserid = #{createuserid}</if>
<if test="yly != null and yly != ''"> and yly = #{yly}</if>
<if test="yle != null and yle != ''"> and yle = #{yle}</if>
<where>
<if test="faid != null ">and faid = #{faid}</if>
<if test="khmk != null and khmk != ''">and khmk = #{khmk}</if>
<if test="khnr != null and khnr != ''">and khnr like concat('%', #{khnr}, '%')</if>
<if test="tjsl != null ">and tjsl = #{tjsl}</if>
<if test="gjzd != null and gjzd != ''">and gjzd = #{gjzd}</if>
<if test="tbly != null and tbly != ''">and tbly = #{tbly}</if>
<if test="jkbj != null and jkbj != ''">and jkbj = #{jkbj}</if>
<if test="starttime != null ">and starttime = #{starttime}</if>
<if test="endtime != null ">and endtime = #{endtime}</if>
<if test="zxrw != null and zxrw != ''">and zxrw = #{zxrw}</if>
<if test="createuserid != null ">and createuserid = #{createuserid}</if>
<if test="yly != null and yly != ''">and yly = #{yly}</if>
<if test="yle != null and yle != ''">and yle = #{yle}</if>
</where>
order by id
</select>
<select id="selectTsbzJxzxkhzbxById" parameterType="Long" resultMap="TsbzJxzxkhzbxResult">
<include refid="selectTsbzJxzxkhzbxVo"/>
where id = #{id}
</select>
<insert id="insertTsbzJxzxkhzbx" parameterType="TsbzJxzxkhzbx" useGeneratedKeys="true" keyProperty="id">
insert into tsbz_jxzxkhzbx
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -67,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">create_time,</if>
<if test="yly != null">yly,</if>
<if test="yle != null">yle,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="faid != null">#{faid},</if>
<if test="khmk != null">#{khmk},</if>
@ -83,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="createTime != null">#{createTime},</if>
<if test="yly != null">#{yly},</if>
<if test="yle != null">#{yle},</if>
</trim>
</trim>
</insert>
<update id="updateTsbzJxzxkhzbx" parameterType="TsbzJxzxkhzbx">
@ -112,10 +113,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteTsbzJxzxkhzbxByIds" parameterType="String">
delete from tsbz_jxzxkhzbx where id in
delete from tsbz_jxzxkhzbx where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
</mapper>