From e5f376eebe34ffc11d1efa4ff707fae9ffb4bdee Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 07 三月 2024 09:38:50 +0800
Subject: [PATCH] 考核模板优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java | 4 +
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java | 24 ++++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java | 32 +---------------
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java | 9 ++++
4 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
index 7255761..bc3dc30 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckTemplate.java
@@ -8,6 +8,8 @@
import lombok.Data;
import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+
/**
* 鑰冩牳妯℃澘
*
@@ -30,7 +32,7 @@
@ApiModelProperty("璋冩暣绯绘暟")
@TableField("adjust_coefficient")
- private Integer adjustCoefficient;
+ private BigDecimal adjustCoefficient;
/**
* 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java
index 14772b5..d3b4890 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/CheckTemplateForm.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.form;
+import com.ycl.platform.domain.vo.RuleItemVO;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
@@ -48,7 +49,7 @@
@NotEmpty(message = "鑰冩牳瑙勫垯涓嶈兘涓虹┖")
@ApiModelProperty("鑰冩牳瑙勫垯")
- private List<RuleItem> ruleList;
+ private List<RuleItemVO> ruleFormList;
public static CheckTemplate getEntityByForm(@NonNull CheckTemplateForm form, CheckTemplate entity) {
if(entity == null) {
@@ -56,35 +57,6 @@
}
BeanUtils.copyProperties(form, entity);
return entity;
- }
-
- public class RuleItem {
-
- /**
- * 瑙勫垯
- */
- private Integer ruleId;
-
- /**
- * 鏉冮噸
- */
- private BigDecimal weight;
-
- public Integer getRuleId() {
- return ruleId;
- }
-
- public void setRuleId(Integer ruleId) {
- this.ruleId = ruleId;
- }
-
- public BigDecimal getWeight() {
- return weight;
- }
-
- public void setWeight(BigDecimal weight) {
- this.weight = weight;
- }
}
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
index 2dfebd2..1e2f7a2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/CheckTemplateVO.java
@@ -2,8 +2,12 @@
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.CheckTemplate;
+
+import java.math.BigDecimal;
import java.util.List;
import java.time.LocalDateTime;
+
+import com.ycl.platform.domain.form.CheckTemplateForm;
import org.springframework.lang.NonNull;
import org.springframework.beans.BeanUtils;
import io.swagger.annotations.ApiModel;
@@ -25,7 +29,7 @@
private String templateName;
/** 璋冩暣绯绘暟 */
- private Integer adjustCoefficient;
+ private BigDecimal adjustCoefficient;
/** 璋冩暣绯绘暟鐨勬柟寮忥細涔橀櫎 */
private String adjustWay;
@@ -33,6 +37,9 @@
/** 鐘舵�� */
private String status;
+ /** 瑙勫垯鍒楄〃 */
+ private List<RuleItemVO> ruleFormList;
+
public static CheckTemplateVO getVoByEntity(@NonNull CheckTemplate entity, CheckTemplateVO vo) {
if(vo == null) {
vo = new CheckTemplateVO();
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java
new file mode 100644
index 0000000..c0241ed
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/RuleItemVO.java
@@ -0,0 +1,24 @@
+package com.ycl.platform.domain.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/3/7 9:24
+ */
+@Data
+public class RuleItemVO {
+
+ /**
+ * 瑙勫垯
+ */
+ private Integer ruleId;
+
+ /**
+ * 鏉冮噸
+ */
+ private BigDecimal weight;
+
+}
--
Gitblit v1.8.0