From fb5e47c6034b60bf2383e260d5d46298c619b4d3 Mon Sep 17 00:00:00 2001 From: hshansha Date: Mon, 27 Oct 2025 09:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0createTime=E3=80=81creatBy?= =?UTF-8?q?=E3=80=81maxu=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KhEmployeeController.java | 1 + .../kaohe/controller/KhGatherController.java | 1 + .../kaohe/controller/KhItemsController.java | 1 + .../kaohe/controller/KhPingceController.java | 1 + .../controller/KhTemplateController.java | 3 + .../com/ruoyi/kaohe/domain/KhTemItem.java | 93 +++++++++++-------- .../java/com/ruoyi/kaohe/domain/KhVote.java | 13 +++ .../service/impl/KhEmployeeServiceImpl.java | 1 + .../service/impl/KhKhrwResultServiceImpl.java | 5 + .../mapper/kaohe/KhTemItemMapper.xml | 7 +- .../resources/mapper/kaohe/KhVoteMapper.xml | 7 +- 11 files changed, 94 insertions(+), 39 deletions(-) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhEmployeeController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhEmployeeController.java index f8c30c2..20a8ef2 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhEmployeeController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhEmployeeController.java @@ -100,6 +100,7 @@ public class KhEmployeeController extends BaseController @PostMapping public AjaxResult add(@RequestBody KhEmployee khEmployee) { + khEmployee.setCreateBy(getUsername()); return khEmployeeService.insertKhEmployee(khEmployee); } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhGatherController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhGatherController.java index 526f60d..0734c35 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhGatherController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhGatherController.java @@ -115,6 +115,7 @@ public class KhGatherController extends BaseController { gather.setHzName(hz_name); gather.setTableHeader(header.toString()); gather.setTableData(endTableData.toString()); + gather.setCreateBy(getUsername()); khGatherService.insertKhGather(gather); return AjaxResult.success(); } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java index 17240e2..ac58012 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhItemsController.java @@ -78,6 +78,7 @@ public class KhItemsController extends BaseController @PostMapping public AjaxResult add(@RequestBody KhItems khItems) { + khItems.setCreateBy(getUsername()); return toAjax(khItemsService.insertKhItems(khItems)); } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java index 6a29314..ad2bfe8 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java @@ -85,6 +85,7 @@ public class KhPingceController extends BaseController { @Transactional @PostMapping public AjaxResult add(@RequestBody KhPingce khPingce) { + khPingce.setCreateBy(getUsername()); khPingceService.insertKhPingce(khPingce); //增加关联表 List pcEmps = khPingce.getPcBkhdxs(); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java index deab0e5..0459a5f 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhTemplateController.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.kaohe.domain.KhItems; import com.ruoyi.kaohe.domain.KhTemItem; import com.ruoyi.kaohe.domain.KhVote; @@ -105,6 +106,8 @@ public class KhTemplateController extends BaseController @Transactional public AjaxResult add(@RequestBody KhTemplate khTemplate) { + khTemplate.setCreateTime(DateUtils.getNowDate()); + khTemplate.setCreateBy(getUsername()); khTemplateService.insertKhTemplate(khTemplate); //增加关联表 List items = khTemplate.getItems(); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java index 49fe383..ebdb840 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhTemItem.java @@ -7,40 +7,66 @@ import com.ruoyi.common.core.domain.BaseEntity; /** * 模板考核项关联对象 kh_tem_item - * + * * @author hs * @date 2025-06-17 */ -public class KhTemItem extends BaseEntity -{ +public class KhTemItem extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键ID */ + /** + * 主键ID + */ private Long id; - /** 模板名称 */ + /** + * 模板名称 + */ @Excel(name = "模板名称") private String temName; - /** 考核项id */ + /** + * 考核项id + */ @Excel(name = "考核项id") private Long khitemId; - /** 考核项名称 */ + /** + * 考核项名称 + */ @Excel(name = "考核项名称") private String itemName; - /** 模板id */ + /** + * 模板id + */ @Excel(name = "模板id") private Long temId; - /** 考核类型id */ + /** + * 考核类型id + */ // @Excel(name = "考核类型id") private Long typeId; - /** 考核类型 */ + /** + * 考核类型 + */ @Excel(name = "考核类型") private String type; + /** + * 评优最大值 + */ + @Excel(name = "评优最大值") + private Integer umax; + + public Integer getUmax() { + return umax; + } + + public void setUmax(Integer umax) { + this.umax = umax; + } public Long getTypeId() { return typeId; @@ -58,64 +84,57 @@ public class KhTemItem extends BaseEntity this.type = type; } - public void setId(Long id) - { + public void setId(Long id) { this.id = id; } - public Long getId() - { + public Long getId() { return id; } - public void setTemName(String temName) - { + public void setTemName(String temName) { this.temName = temName; } - public String getTemName() - { + public String getTemName() { return temName; } - public void setKhitemId(Long khitemId) - { + public void setKhitemId(Long khitemId) { this.khitemId = khitemId; } - public Long getKhitemId() - { + public Long getKhitemId() { return khitemId; } - public void setItemName(String itemName) - { + public void setItemName(String itemName) { this.itemName = itemName; } - public String getItemName() - { + public String getItemName() { return itemName; } - public void setTemId(Long temId) - { + public void setTemId(Long temId) { this.temId = temId; } - public Long getTemId() - { + public Long getTemId() { return temId; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("temName", getTemName()) - .append("khitemId", getKhitemId()) - .append("itemName", getItemName()) - .append("temId", getTemId()) - .toString(); + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("temName", getTemName()) + .append("khitemId", getKhitemId()) + .append("itemName", getItemName()) + .append("temId", getTemId()) + .append("typeId", getTypeId()) + .append("type", getType()) + .append("umax", getUmax()) + .toString(); } } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java index be33ef2..31842d2 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVote.java @@ -69,6 +69,10 @@ public class KhVote extends BaseEntity @Excel(name = "最大分数") private BigDecimal maxNum; + /** 评优最大值 */ + @Excel(name = "评优最大值") + private Integer umax; + /** 评分占比(0-1之间) */ @Excel(name = "评分占比(0-1之间)") private BigDecimal percentage; @@ -92,6 +96,14 @@ public class KhVote extends BaseEntity */ private List voteEmps; + public Integer getUmax() { + return umax; + } + + public void setUmax(Integer umax) { + this.umax = umax; + } + public String getSamePercent() { return samePercent; } @@ -269,6 +281,7 @@ public class KhVote extends BaseEntity .append("sTime", getsTime()) .append("eTime", geteTime()) .append("maxNum", getMaxNum()) + .append("umax", getUmax()) .append("percentage", getPercentage()) .append("state", getState()) .append("createBy", getCreateBy()) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java index b42cdfe..ddcf3d4 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhEmployeeServiceImpl.java @@ -159,6 +159,7 @@ public class KhEmployeeServiceImpl implements IKhEmployeeService { param.setWordId(employee.getWordId()); List e = khEmployeeMapper.selectKhEmployeeList(param); if (StringUtils.isNull(e) || e.size() == 0) { + employee.setCreateBy(getUsername()); khEmployeeMapper.insertKhEmployee(employee); successNum++; successMsg.append("
" + successNum + "、工号 " + employee.getWordId() + " 导入成功"); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java index 8b54aaa..fc5e2c0 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java @@ -17,6 +17,8 @@ import org.springframework.stereotype.Service; import com.ruoyi.kaohe.mapper.KhKhrwResultMapper; import com.ruoyi.kaohe.service.IKhKhrwResultService; +import static com.ruoyi.common.utils.SecurityUtils.getUsername; + /** * 考核结果Service业务层处理 * @@ -251,10 +253,13 @@ public class KhKhrwResultServiceImpl implements IKhKhrwResultService pcResult.setTableHeader(children.toJSONString()); pcResult.setTableData(endData.toJSONString()); if(isUpdate){ + pcResult.setUpdateBy(getUsername()); + pcResult.setUpdateTime(DateUtils.getNowDate()); pcResult.setId(pc.getPcResultId()); this.updateKhKhrwResult(pcResult); return AjaxResult.success("更新成功"); }else{ + pcResult.setCreateBy(getUsername()); this.insertKhKhrwResult(pcResult); return AjaxResult.success("生成成功"); } diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml index ba07f34..3943939 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhTemItemMapper.xml @@ -12,10 +12,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, tem_name, khitem_id, item_name, tem_id, type_id, type from kh_tem_item + select id, tem_name, khitem_id, item_name, tem_id, type_id, type ,umax from kh_tem_item @@ -44,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tem_id, type_id, type, + umax, #{temName}, @@ -52,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{temId}, #{typeId}, #{type}, + #{umax}, @@ -64,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tem_id = #{temId}, type_id = #{typeId}, type = #{type}, + umax = #{umax}, where id = #{id} diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml index 351422f..1162c46 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml @@ -17,6 +17,7 @@ + @@ -28,7 +29,7 @@ - select id, pingce_id, pingce_name, khitem_id, khitem_name, khitem_typeId, vote_items, vote_title, v_description, s_time, e_time, max_num, percentage, `state`,same_percent, create_by, create_time, update_by, update_time, remark from kh_vote + select id, pingce_id, pingce_name, khitem_id, khitem_name, khitem_typeId, vote_items, vote_title, v_description, s_time, e_time, max_num, umax, percentage, `state`,same_percent, create_by, create_time, update_by, update_time, remark from kh_vote