hansha
/
kaohe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
wanglei 6 months ago
parent 0d85710859 3eaf4fbd95
commit ff75393369
10 changed files with 181 additions and 46 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java
Unescape View File

@ -115,6 +115,8 @@ public class KhTemplateController extends BaseController
temItem.setTemId(khTemplate.getId());
temItem.setItemName(item.getItemName());
temItem.setKhitemId(item.getId());
temItem.setType(item.getType());
temItem.setTypeId(item.getTypeId());
temItemService.insertKhTemItem(temItem);
}
}

1
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java
Unescape View File

@ -136,6 +136,7 @@ public class KhVoteController extends BaseController {
voteEmp.setVoteId(khVote.getId());
voteEmp.setVoteTitle(khVote.getVoteTitle());
voteEmp.setPercentage(khVote.getPercentage());
voteEmp.setKhitemTypeid(khVote.getKhitemTypeid());
voteEmpService.insertKhVoteEmp(voteEmp);
}
return AjaxResult.success();

2
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhItems.java
Unescape View File

@ -23,7 +23,7 @@ public class KhItems extends BaseEntity
private String itemName;
/** 考核类型id */
@Excel(name = "考核类型id")
// @Excel(name = "考核类型id")
private Long typeId;
/** 考核类型 */

24
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java
Unescape View File

@ -34,6 +34,30 @@ public class KhTemItem extends BaseEntity
@Excel(name = "模板id")
private Long temId;
/** 考核类型id */
// @Excel(name = "考核类型id")
private Long typeId;
/** 考核类型 */
@Excel(name = "考核类型")
private String type;
public Long getTypeId() {
return typeId;
}
public void setTypeId(Long typeId) {
this.typeId = typeId;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public void setId(Long id)
{
this.id = id;

52
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java
Unescape View File

@ -43,6 +43,22 @@ public class KhVoteEmp extends BaseEntity
@Excel(name = "选项内容")
private String content;
/** 优秀 */
@Excel(name = "优秀")
private Long optionA;
/** 合格 */
@Excel(name = "合格")
private Long optionB;
/** 基本合格 */
@Excel(name = "基本合格")
private Long optionC;
/** 不合格 */
@Excel(name = "不合格")
private Long optionD;
/** 投票人数 */
@Excel(name = "投票人数")
private Long voteNum;
@ -183,6 +199,38 @@ public class KhVoteEmp extends BaseEntity
return endScore;
}
public Long getOptionA() {
return optionA;
}
public void setOptionA(Long optionA) {
this.optionA = optionA;
}
public Long getOptionB() {
return optionB;
}
public void setOptionB(Long optionB) {
this.optionB = optionB;
}
public Long getOptionC() {
return optionC;
}
public void setOptionC(Long optionC) {
this.optionC = optionC;
}
public Long getOptionD() {
return optionD;
}
public void setOptionD(Long optionD) {
this.optionD = optionD;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -194,6 +242,10 @@ public class KhVoteEmp extends BaseEntity
.append("bkhdxName", getBkhdxName())
.append("content", getContent())
.append("voteNum", getVoteNum())
.append("optionA", getOptionA())
.append("optionB", getOptionB())
.append("optionC", getOptionC())
.append("optionD", getOptionD())
.append("voteScore", getVoteScore())
.append("avgScore", getAvgScore())
.append("percentage", getPercentage())

33
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteItems.java
Unescape View File

@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* 投票项对象 kh_vote_items
*
* @author hs
* @date 2025-06-24
* @date 2025-07-03
*/
public class KhVoteItems extends BaseEntity
{
@ -22,6 +22,10 @@ public class KhVoteItems extends BaseEntity
@Excel(name = "投票选项名称")
private String vitemName;
/** 分数 */
@Excel(name = "分数")
private Long score;
public void setId(Long id)
{
this.id = id;
@ -42,16 +46,27 @@ public class KhVoteItems extends BaseEntity
return vitemName;
}
public void setScore(Long score)
{
this.score = score;
}
public Long getScore()
{
return score;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("vitemName", getVitemName())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
.append("id", getId())
.append("vitemName", getVitemName())
.append("score", getScore())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

12
ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml
Unescape View File

@ -10,10 +10,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="khitemId" column="khitem_id" />
<result property="itemName" column="item_name" />
<result property="temId" column="tem_id" />
<result property="typeId" column="type_id" />
<result property="type" column="type" />
</resultMap>
<sql id="selectKhTemItemVo">
select id, tem_name, khitem_id, item_name, tem_id from kh_tem_item
select id, tem_name, khitem_id, item_name, tem_id, type_id, type from kh_tem_item
</sql>
<select id="selectKhTemItemList" parameterType="KhTemItem" resultMap="KhTemItemResult">
@ -23,6 +25,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khitemId != null "> and khitem_id = #{khitemId}</if>
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>
<if test="temId != null "> and tem_id = #{temId}</if>
<if test="typeId != null "> and type_id = #{typeId}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
</where>
</select>
@ -38,12 +42,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khitemId != null">khitem_id,</if>
<if test="itemName != null and itemName != ''">item_name,</if>
<if test="temId != null">tem_id,</if>
<if test="typeId != null">type_id,</if>
<if test="type != null">type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="temName != null and temName != ''">#{temName},</if>
<if test="khitemId != null">#{khitemId},</if>
<if test="itemName != null and itemName != ''">#{itemName},</if>
<if test="temId != null">#{temId},</if>
<if test="typeId != null">#{typeId},</if>
<if test="type != null">#{type},</if>
</trim>
</insert>
@ -54,6 +62,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="khitemId != null">khitem_id = #{khitemId},</if>
<if test="itemName != null and itemName != ''">item_name = #{itemName},</if>
<if test="temId != null">tem_id = #{temId},</if>
<if test="typeId != null">type_id = #{typeId},</if>
<if test="type != null">type = #{type},</if>
</trim>
where id = #{id}
</update>

38
ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemplateMapper.xml
Unescape View File

@ -1,36 +1,40 @@
<?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.kaohe.mapper.KhTemplateMapper">
<resultMap type="KhTemplate" id="KhTemplateResult">
<result property="id" column="id" />
<result property="temName" column="tem_name" />
<collection property="items" ofType="KhItems " javaType="ArrayList" select="getItems" column="id"/>
<result property="id" column="id"/>
<result property="temName" column="tem_name"/>
<collection property="items" ofType="KhItems " javaType="ArrayList" select="getItems" column="id"/>
</resultMap>
<resultMap id="KhItemsResult" type="KhItems">
<result property="id" column="itemId" />
<result property="itemName" column="khitemName" />
<result property="id" column="itemId"/>
<result property="itemName" column="khitemName"/>
<result property="type" column="type"/>
<result property="typeId" column="type_id"/>
</resultMap>
<sql id="selectKhTemplateVo">
select id, tem_name, khitem_id, item_name from kh_template
select id, tem_name, khitem_id, item_name
from kh_template
</sql>
<select id="selectKhTemplateList" parameterType="KhTemplate" resultMap="KhTemplateResult">
/*select t.*,ti.khitem_id itemId ,ti.item_name khitemName from kh_template t left join kh_tem_item ti on t.id=ti.tem_id*/
/*select t.*,ti.khitem_id itemId ,ti.item_name khitemName from kh_template t left join kh_tem_item ti on
t.id=ti.tem_id*/
<include refid="selectKhTemplateVo"/>
<where>
<if test="temName != null and temName != ''"> and tem_name like concat('%', #{temName}, '%')</if>
<if test="temName != null and temName != ''">and tem_name like concat('%', #{temName}, '%')</if>
</where>
</select>
<select id="getItems" resultMap="KhItemsResult">
select ti.khitem_id itemId ,ti.item_name khitemName from kh_tem_item ti
<select id="getItems" resultMap="KhItemsResult">
select ti.khitem_id itemId ,ti.item_name khitemName ,type,type_id from kh_tem_item ti
<where>
<if test="id != null "> ti.tem_id = #{id}</if>
<if test="id != null ">ti.tem_id = #{id}</if>
</where>
</select>
@ -45,12 +49,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="temName != null and temName != ''">tem_name,</if>
<if test="khitemId != null">khitem_id,</if>
<if test="itemName != null and itemName != ''">item_name,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="temName != null and temName != ''">#{temName},</if>
<if test="khitemId != null">#{khitemId},</if>
<if test="itemName != null and itemName != ''">#{itemName},</if>
</trim>
</trim>
</insert>
<update id="updateKhTemplate" parameterType="KhTemplate">
@ -64,7 +68,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteKhTemplateById" parameterType="Long">
delete from kh_template where id = #{id}
delete
from kh_template
where id = #{id}
</delete>
<delete id="deleteKhTemplateByIds" parameterType="String">

22
ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml
Unescape View File

@ -13,6 +13,10 @@
<result property="bkhdxName" column="bkhdx_name" />
<result property="content" column="content" />
<result property="voteNum" column="vote_num" />
<result property="optionA" column="option_a" />
<result property="optionB" column="option_b" />
<result property="optionC" column="option_c" />
<result property="optionD" column="option_d" />
<result property="voteScore" column="vote_score" />
<result property="avgScore" column="avg_score" />
<result property="percentage" column="percentage" />
@ -25,7 +29,7 @@
</resultMap>
<sql id="selectKhVoteEmpVo">
select id, khitem_typeId, vote_id, vote_title, bkhdx_id, bkhdx_name, content, vote_num, vote_score, avg_score, percentage, end_score, create_by, create_time, update_by, update_time, remark from kh_vote_emp
select id, khitem_typeId, vote_id, vote_title, bkhdx_id, bkhdx_name, content, vote_num,option_a, option_b, option_c, option_d, vote_score, avg_score, percentage, end_score, create_by, create_time, update_by, update_time, remark from kh_vote_emp
</sql>
<select id="selectKhVoteEmpList" parameterType="KhVoteEmp" resultMap="KhVoteEmpResult">
@ -38,6 +42,10 @@
<if test="bkhdxName != null and bkhdxName != ''"> and bkhdx_name like concat('%', #{bkhdxName}, '%')</if>
<if test="content != null and content != ''"> and content = #{content}</if>
<if test="voteNum != null "> and vote_num = #{voteNum}</if>
<if test="optionA != null "> and option_a = #{optionA}</if>
<if test="optionB != null "> and option_b = #{optionB}</if>
<if test="optionC != null "> and option_c = #{optionC}</if>
<if test="optionD != null "> and option_d = #{optionD}</if>
<if test="voteScore != null "> and vote_score = #{voteScore}</if>
<if test="avgScore != null "> and avg_score = #{avgScore}</if>
<if test="percentage != null "> and percentage = #{percentage}</if>
@ -60,6 +68,10 @@
<if test="bkhdxName != null">bkhdx_name,</if>
<if test="content != null">content,</if>
<if test="voteNum != null">vote_num,</if>
<if test="optionA != null">option_a,</if>
<if test="optionB != null">option_b,</if>
<if test="optionC != null">option_c,</if>
<if test="optionD != null">option_d,</if>
<if test="voteScore != null">vote_score,</if>
<if test="avgScore != null">avg_score,</if>
<if test="percentage != null">percentage,</if>
@ -78,6 +90,10 @@
<if test="bkhdxName != null">#{bkhdxName},</if>
<if test="content != null">#{content},</if>
<if test="voteNum != null">#{voteNum},</if>
<if test="optionA != null">#{optionA},</if>
<if test="optionB != null">#{optionB},</if>
<if test="optionC != null">#{optionC},</if>
<if test="optionD != null">#{optionD},</if>
<if test="voteScore != null">#{voteScore},</if>
<if test="avgScore != null">#{avgScore},</if>
<if test="percentage != null">#{percentage},</if>
@ -100,6 +116,10 @@
<if test="bkhdxName != null">bkhdx_name = #{bkhdxName},</if>
<if test="content != null">content = #{content},</if>
<if test="voteNum != null">vote_num = #{voteNum},</if>
<if test="optionA != null">option_a = #{optionA},</if>
<if test="optionB != null">option_b = #{optionB},</if>
<if test="optionC != null">option_c = #{optionC},</if>
<if test="optionD != null">option_d = #{optionD},</if>
<if test="voteScore != null">vote_score = #{voteScore},</if>
<if test="avgScore != null">avg_score = #{avgScore},</if>
<if test="percentage != null">percentage = #{percentage},</if>

15
ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteItemsMapper.xml
Unescape View File

@ -1,12 +1,13 @@
<?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.kaohe.mapper.KhVoteItemsMapper">
<resultMap type="KhVoteItems" id="KhVoteItemsResult">
<result property="id" column="id" />
<result property="vitemName" column="vitem_name" />
<result property="score" column="score" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@ -15,13 +16,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectKhVoteItemsVo">
select id, vitem_name, create_by, create_time, update_by, update_time, remark from kh_vote_items
select id, vitem_name, score, create_by, create_time, update_by, update_time, remark from kh_vote_items
</sql>
<select id="selectKhVoteItemsList" parameterType="KhVoteItems" resultMap="KhVoteItemsResult">
<include refid="selectKhVoteItemsVo"/>
<where>
<if test="vitemName != null and vitemName != ''"> and vitem_name like concat('%', #{vitemName}, '%')</if>
<if test="score != null "> and score = #{score}</if>
</where>
</select>
@ -34,26 +36,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into kh_vote_items
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="vitemName != null">vitem_name,</if>
<if test="score != null">score,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="vitemName != null">#{vitemName},</if>
<if test="score != null">#{score},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</trim>
</insert>
<update id="updateKhVoteItems" parameterType="KhVoteItems">
update kh_vote_items
<trim prefix="SET" suffixOverrides=",">
<if test="vitemName != null">vitem_name = #{vitemName},</if>
<if test="score != null">score = #{score},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>

Write Preview
Loading…
Cancel
Save