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

批量新增接口、投票评测添加字段

Browse Source
main 002
hshansha 6 months ago
parent a8fc16aa83
commit a0395570bf
6 changed files with 198 additions and 47 deletions
Show Stats Download Patch File Download Diff File

15
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java
Unescape View File

@ -4,6 +4,7 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
@ -79,6 +80,20 @@ public class KhItemsController extends BaseController
{ {
return toAjax(khItemsService.insertKhItems(khItems)); return toAjax(khItemsService.insertKhItems(khItems));
} }
/**
* 批量新增考核项
*/
@PreAuthorize("@ss.hasPermi('kaohe:items:add')")
@Log(title = "考核项", businessType = BusinessType.INSERT)
@PostMapping("/adds")
@Transactional
public AjaxResult adds(@RequestBody List<KhItems> khItems)
{
for(KhItems item:khItems){
khItemsService.insertKhItems(item);
}
return AjaxResult.success();
}
/** /**
* 修改考核项 * 修改考核项

18
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemItemController.java
Unescape View File

@ -2,8 +2,11 @@ package com.ruoyi.kaohe.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.ruoyi.kaohe.domain.KhItems;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.PutMapping;
@ -80,6 +83,21 @@ public class KhTemItemController extends BaseController
return toAjax(khTemItemService.insertKhTemItem(khTemItem)); return toAjax(khTemItemService.insertKhTemItem(khTemItem));
} }
/**
* 新增模板考核项关联
*/
@PreAuthorize("@ss.hasPermi('kaohe:tem_item:add')")
@Log(title = "模板考核项关联", businessType = BusinessType.INSERT)
@PostMapping("/adds")
@Transactional
public AjaxResult adds(@RequestBody List<KhTemItem> khTemItems)
{
for(KhTemItem khTemItem:khTemItems){
khTemItemService.insertKhTemItem(khTemItem);
}
return AjaxResult.success();
}
/** /**
* 修改模板考核项关联 * 修改模板考核项关联
*/ */

28
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemplate.java
Unescape View File

@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel; import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity; import com.ruoyi.common.core.domain.BaseEntity;
import java.util.List;
/** /**
* 考核模板对象 kh_template * 考核模板对象 kh_template
* *
@ -22,15 +24,27 @@ public class KhTemplate extends BaseEntity
@Excel(name = "模板名称") @Excel(name = "模板名称")
private String temName; private String temName;
/** 考核项id */ /* *//** 考核项id *//*
@Excel(name = "考核项id") @Excel(name = "考核项id")
private Long khitemId; private Long khitemId;
*//** 考核项名称 *//*
@Excel(name = "考核项名称")
private String itemName;*/
/** 考核项名称 */ /** 考核项名称 */
@Excel(name = "考核项名称") @Excel(name = "考核项名称")
private String itemName; private List<KhItems> itemList;
public List<KhItems> getItems() {
return itemList;
}
public void setItems(List<KhItems> itemList) {
this.itemList = itemList;
}
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
@ -50,7 +64,7 @@ public class KhTemplate extends BaseEntity
return temName; return temName;
} }
public void setKhitemId(Long khitemId) /* public void setKhitemId(Long khitemId)
{ {
this.khitemId = khitemId; this.khitemId = khitemId;
} }
@ -68,15 +82,15 @@ public class KhTemplate extends BaseEntity
public String getItemName() public String getItemName()
{ {
return itemName; return itemName;
} }*/
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("temName", getTemName()) .append("temName", getTemName())
.append("khitemId", getKhitemId()) /* .append("khitemId", getKhitemId())
.append("itemName", getItemName()) .append("itemName", getItemName())*/
.toString(); .toString();
} }
} }

127
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java
Unescape View File

@ -9,9 +9,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
/** /**
* 投票评测对象 kh_vote * 投票评测对象 kh_vote
* *
* @author hs * @author hs
* @date 2025-06-17 * @date 2025-06-18
*/ */
public class KhVote extends BaseEntity public class KhVote extends BaseEntity
{ {
@ -20,6 +20,22 @@ public class KhVote extends BaseEntity
/** 主键 */ /** 主键 */
private Long id; private Long id;
/** 评测id */
@Excel(name = "评测id")
private Long pingceId;
/** 评测名称 */
@Excel(name = "评测名称")
private String pingceName;
/** 考核项id */
@Excel(name = "考核项id")
private Long khitemId;
/** 考核项名称 */
@Excel(name = "考核项名称")
private String khitemName;
/** 投票主题 */ /** 投票主题 */
@Excel(name = "投票主题") @Excel(name = "投票主题")
private String voteTitle; private String voteTitle;
@ -42,80 +58,139 @@ public class KhVote extends BaseEntity
@Excel(name = "最大投票数") @Excel(name = "最大投票数")
private Long maxNum; private Long maxNum;
public void setId(Long id) /** 状态(0 未开始 1 进行中 2 完成) */
@Excel(name = "状态(0 未开始 1 进行中 2 完成)")
private String state;
public void setId(Long id)
{ {
this.id = id; this.id = id;
} }
public Long getId() public Long getId()
{ {
return id; return id;
} }
public void setVoteTitle(String voteTitle) public void setPingceId(Long pingceId)
{
this.pingceId = pingceId;
}
public Long getPingceId()
{
return pingceId;
}
public void setPingceName(String pingceName)
{
this.pingceName = pingceName;
}
public String getPingceName()
{
return pingceName;
}
public void setKhitemId(Long khitemId)
{
this.khitemId = khitemId;
}
public Long getKhitemId()
{
return khitemId;
}
public void setKhitemName(String khitemName)
{
this.khitemName = khitemName;
}
public String getKhitemName()
{
return khitemName;
}
public void setVoteTitle(String voteTitle)
{ {
this.voteTitle = voteTitle; this.voteTitle = voteTitle;
} }
public String getVoteTitle() public String getVoteTitle()
{ {
return voteTitle; return voteTitle;
} }
public void setvDescription(String vDescription) public void setvDescription(String vDescription)
{ {
this.vDescription = vDescription; this.vDescription = vDescription;
} }
public String getvDescription() public String getvDescription()
{ {
return vDescription; return vDescription;
} }
public void setsTime(Date sTime) public void setsTime(Date sTime)
{ {
this.sTime = sTime; this.sTime = sTime;
} }
public Date getsTime() public Date getsTime()
{ {
return sTime; return sTime;
} }
public void seteTime(Date eTime) public void seteTime(Date eTime)
{ {
this.eTime = eTime; this.eTime = eTime;
} }
public Date geteTime() public Date geteTime()
{ {
return eTime; return eTime;
} }
public void setMaxNum(Long maxNum) public void setMaxNum(Long maxNum)
{ {
this.maxNum = maxNum; this.maxNum = maxNum;
} }
public Long getMaxNum() public Long getMaxNum()
{ {
return maxNum; return maxNum;
} }
public void setState(String state)
{
this.state = state;
}
public String getState()
{
return state;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId()) .append("id", getId())
.append("voteTitle", getVoteTitle()) .append("pingceId", getPingceId())
.append("vDescription", getvDescription()) .append("pingceName", getPingceName())
.append("sTime", getsTime()) .append("khitemId", getKhitemId())
.append("eTime", geteTime()) .append("khitemName", getKhitemName())
.append("maxNum", getMaxNum()) .append("voteTitle", getVoteTitle())
.append("createBy", getCreateBy()) .append("vDescription", getvDescription())
.append("createTime", getCreateTime()) .append("sTime", getsTime())
.append("updateBy", getUpdateBy()) .append("eTime", geteTime())
.append("updateTime", getUpdateTime()) .append("maxNum", getMaxNum())
.append("remark", getRemark()) .append("state", getState())
.toString(); .append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
} }
} }

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

@ -7,8 +7,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap type="KhTemplate" id="KhTemplateResult"> <resultMap type="KhTemplate" id="KhTemplateResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="temName" column="tem_name" /> <result property="temName" column="tem_name" />
<result property="khitemId" column="khitem_id" /> <!-- <result property="khitemId" column="khitem_id" />
<result property="itemName" column="item_name" /> <result property="itemName" column="item_name" />-->
<collection property="itemList" ofType="KhItems">
<result property="id" column="id" />
<result property="itemName" column="item_name" />
</collection >
</resultMap> </resultMap>
<sql id="selectKhTemplateVo"> <sql id="selectKhTemplateVo">
@ -16,11 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="selectKhTemplateList" parameterType="KhTemplate" resultMap="KhTemplateResult"> <select id="selectKhTemplateList" parameterType="KhTemplate" resultMap="KhTemplateResult">
<include refid="selectKhTemplateVo"/> select t.*,ti.* from kh_template t join kh_tem_item ti on t.id=ti.tem_id
<where> <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>
<if test="khitemId != null "> and khitem_id = #{khitemId}</if> <!-- <if test="khitemId != null "> and khitem_id = #{khitemId}</if>
<if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if> <if test="itemName != null and itemName != ''"> and item_name like concat('%', #{itemName}, '%')</if>-->
</where> </where>
</select> </select>

43
ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml
Unescape View File

@ -1,16 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.kaohe.mapper.KhVoteMapper"> <mapper namespace="com.ruoyi.kaohe.mapper.KhVoteMapper">
<resultMap type="KhVote" id="KhVoteResult"> <resultMap type="KhVote" id="KhVoteResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="pingceId" column="pingce_id" />
<result property="pingceName" column="pingce_name" />
<result property="khitemId" column="khitem_id" />
<result property="khitemName" column="khitem_name" />
<result property="voteTitle" column="vote_title" /> <result property="voteTitle" column="vote_title" />
<result property="vDescription" column="v_description" /> <result property="vDescription" column="v_description" />
<result property="sTime" column="s_time" /> <result property="sTime" column="s_time" />
<result property="eTime" column="e_time" /> <result property="eTime" column="e_time" />
<result property="maxNum" column="max_num" /> <result property="maxNum" column="max_num" />
<result property="state" column="state" />
<result property="createBy" column="create_by" /> <result property="createBy" column="create_by" />
<result property="createTime" column="create_time" /> <result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" /> <result property="updateBy" column="update_by" />
@ -19,20 +24,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectKhVoteVo"> <sql id="selectKhVoteVo">
select id, vote_title, v_description, s_time, e_time, max_num, create_by, create_time, update_by, update_time, remark from kh_vote select id, pingce_id, pingce_name, khitem_id, khitem_name, vote_title, v_description, s_time, e_time, max_num, state, create_by, create_time, update_by, update_time, remark from kh_vote
</sql> </sql>
<select id="selectKhVoteList" parameterType="KhVote" resultMap="KhVoteResult"> <select id="selectKhVoteList" parameterType="KhVote" resultMap="KhVoteResult">
<include refid="selectKhVoteVo"/> <include refid="selectKhVoteVo"/>
<where> <where>
<if test="pingceId != null "> and pingce_id = #{pingceId}</if>
<if test="pingceName != null and pingceName != ''"> and pingce_name like concat('%', #{pingceName}, '%')</if>
<if test="khitemId != null "> and khitem_id = #{khitemId}</if>
<if test="khitemName != null and khitemName != ''"> and khitem_name like concat('%', #{khitemName}, '%')</if>
<if test="voteTitle != null and voteTitle != ''"> and vote_title = #{voteTitle}</if> <if test="voteTitle != null and voteTitle != ''"> and vote_title = #{voteTitle}</if>
<if test="vDescription != null and vDescription != ''"> and v_description = #{vDescription}</if> <if test="vDescription != null and vDescription != ''"> and v_description = #{vDescription}</if>
<if test="sTime != null "> and s_time = #{sTime}</if> <if test="sTime != null "> and s_time = #{sTime}</if>
<if test="eTime != null "> and e_time = #{eTime}</if> <if test="eTime != null "> and e_time = #{eTime}</if>
<if test="maxNum != null "> and max_num = #{maxNum}</if> <if test="maxNum != null "> and max_num = #{maxNum}</if>
<if test="state != null and state != ''"> and state = #{state}</if>
</where> </where>
</select> </select>
<select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult"> <select id="selectKhVoteById" parameterType="Long" resultMap="KhVoteResult">
<include refid="selectKhVoteVo"/> <include refid="selectKhVoteVo"/>
where id = #{id} where id = #{id}
@ -41,39 +51,54 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="insertKhVote" parameterType="KhVote" useGeneratedKeys="true" keyProperty="id"> <insert id="insertKhVote" parameterType="KhVote" useGeneratedKeys="true" keyProperty="id">
insert into kh_vote insert into kh_vote
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="pingceId != null">pingce_id,</if>
<if test="pingceName != null">pingce_name,</if>
<if test="khitemId != null">khitem_id,</if>
<if test="khitemName != null">khitem_name,</if>
<if test="voteTitle != null and voteTitle != ''">vote_title,</if> <if test="voteTitle != null and voteTitle != ''">vote_title,</if>
<if test="vDescription != null">v_description,</if> <if test="vDescription != null">v_description,</if>
<if test="sTime != null">s_time,</if> <if test="sTime != null">s_time,</if>
<if test="eTime != null">e_time,</if> <if test="eTime != null">e_time,</if>
<if test="maxNum != null">max_num,</if> <if test="maxNum != null">max_num,</if>
<if test="state != null">state,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if> <if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if> <if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if> <if test="remark != null">remark,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="pingceId != null">#{pingceId},</if>
<if test="pingceName != null">#{pingceName},</if>
<if test="khitemId != null">#{khitemId},</if>
<if test="khitemName != null">#{khitemName},</if>
<if test="voteTitle != null and voteTitle != ''">#{voteTitle},</if> <if test="voteTitle != null and voteTitle != ''">#{voteTitle},</if>
<if test="vDescription != null">#{vDescription},</if> <if test="vDescription != null">#{vDescription},</if>
<if test="sTime != null">#{sTime},</if> <if test="sTime != null">#{sTime},</if>
<if test="eTime != null">#{eTime},</if> <if test="eTime != null">#{eTime},</if>
<if test="maxNum != null">#{maxNum},</if> <if test="maxNum != null">#{maxNum},</if>
<if test="state != null">#{state},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if> <if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if> <if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if> <if test="remark != null">#{remark},</if>
</trim> </trim>
</insert> </insert>
<update id="updateKhVote" parameterType="KhVote"> <update id="updateKhVote" parameterType="KhVote">
update kh_vote update kh_vote
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="pingceId != null">pingce_id = #{pingceId},</if>
<if test="pingceName != null">pingce_name = #{pingceName},</if>
<if test="khitemId != null">khitem_id = #{khitemId},</if>
<if test="khitemName != null">khitem_name = #{khitemName},</if>
<if test="voteTitle != null and voteTitle != ''">vote_title = #{voteTitle},</if> <if test="voteTitle != null and voteTitle != ''">vote_title = #{voteTitle},</if>
<if test="vDescription != null">v_description = #{vDescription},</if> <if test="vDescription != null">v_description = #{vDescription},</if>
<if test="sTime != null">s_time = #{sTime},</if> <if test="sTime != null">s_time = #{sTime},</if>
<if test="eTime != null">e_time = #{eTime},</if> <if test="eTime != null">e_time = #{eTime},</if>
<if test="maxNum != null">max_num = #{maxNum},</if> <if test="maxNum != null">max_num = #{maxNum},</if>
<if test="state != null">state = #{state},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if> <if test="updateBy != null">update_by = #{updateBy},</if>
@ -88,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<delete id="deleteKhVoteByIds" parameterType="String"> <delete id="deleteKhVoteByIds" parameterType="String">
delete from kh_vote where id in delete from kh_vote where id in
<foreach item="id" collection="array" open="(" separator="," close=")"> <foreach item="id" collection="array" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

Write Preview
Loading…
Cancel
Save