selectByRecordId(@Param("recordResultId") Long recordResultId);
}
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java b/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java
index ea3d84ea..d65b14a7 100644
--- a/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java
+++ b/src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java
@@ -11,7 +11,7 @@ import java.util.Date;
* 菜单权限表
* *业绩详情表
* @author quyixiao
-* @since 2020-08-10
+* @since 2020-08-13
*/
@Data
@@ -28,24 +28,35 @@ public class ResultDetail implements java.io.Serializable {
private Date gmtModified;
//1，业绩，2文化价值观
private Integer type;
- //
+ //目标
private String target;
- //
+ //关键结果
private String keyResult;
//考核权重
private BigDecimal checkWeight;
//考核结果
private String checkResult;
//直属上级评分
- private BigDecimal superScore;
- //
+ private String superScore;
+ //得分
private BigDecimal acquireScore;
//评分说明
private String scoreComment;
//记录id
private Long recordId;
//用户id
- private Long userId;
+ private Long staffId;
+ //优先级，从大到小
+ private Integer priority;
+
+ public ResultDetail() {
+
+ }
+
+ public ResultDetail(Integer type) {
+ this.type = type;
+ }
+
/**
*
* @return
@@ -122,14 +133,14 @@ public class ResultDetail implements java.io.Serializable {
}
/**
- *
+ * 目标
* @return
*/
public String getTarget() {
return target;
}
/**
- *
+ * 目标
* @param target
*/
public void setTarget(String target) {
@@ -137,14 +148,14 @@ public class ResultDetail implements java.io.Serializable {
}
/**
- *
+ * 关键结果
* @return
*/
public String getKeyResult() {
return keyResult;
}
/**
- *
+ * 关键结果
* @param keyResult
*/
public void setKeyResult(String keyResult) {
@@ -185,26 +196,26 @@ public class ResultDetail implements java.io.Serializable {
* 直属上级评分
* @return
*/
- public BigDecimal getSuperScore() {
+ public String getSuperScore() {
return superScore;
}
/**
* 直属上级评分
* @param superScore
*/
- public void setSuperScore(BigDecimal superScore) {
+ public void setSuperScore(String superScore) {
this.superScore = superScore;
}
/**
- *
+ * 得分
* @return
*/
public BigDecimal getAcquireScore() {
return acquireScore;
}
/**
- *
+ * 得分
* @param acquireScore
*/
public void setAcquireScore(BigDecimal acquireScore) {
@@ -245,15 +256,30 @@ public class ResultDetail implements java.io.Serializable {
* 用户id
* @return
*/
- public Long getUserId() {
- return userId;
+ public Long getStaffId() {
+ return staffId;
}
/**
* 用户id
- * @param userId
+ * @param staffId
*/
- public void setUserId(Long userId) {
- this.userId = userId;
+ public void setStaffId(Long staffId) {
+ this.staffId = staffId;
+ }
+
+ /**
+ * 优先级，从大到小
+ * @return
+ */
+ public Integer getPriority() {
+ return priority;
+ }
+ /**
+ * 优先级，从大到小
+ * @param priority
+ */
+ public void setPriority(Integer priority) {
+ this.priority = priority;
}
@Override
@@ -272,7 +298,8 @@ public class ResultDetail implements java.io.Serializable {
",acquireScore=" + acquireScore +
",scoreComment=" + scoreComment +
",recordId=" + recordId +
- ",userId=" + userId +
+ ",staffId=" + staffId +
+ ",priority=" + priority +
"}";
}
}
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java
index e55e2a49..34ee164d 100644
--- a/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java
+++ b/src/main/java/com/lz/modules/sys/service/app/ResultDetailService.java
@@ -3,6 +3,8 @@ package com.lz.modules.sys.service.app;
import com.baomidou.mybatisplus.extension.service.IService;
import com.lz.modules.sys.entity.app.ResultDetail;
+import java.util.List;
+
/**
*
* 业绩详情表 服务类
@@ -30,4 +32,5 @@ public interface ResultDetailService extends IService {
int deleteResultDetailById(Long id);
+ List selectByRecordId(Long recordResultId);
}
\ No newline at end of file
diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
index bbac77e7..63210792 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
@@ -7,6 +7,8 @@ import com.lz.modules.sys.service.app.ResultDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.List;
+
/**
*
* 业绩详情表 服务类
@@ -59,5 +61,10 @@ public class ResultDetailServiceImpl extends ServiceImpl selectByRecordId(Long recordResultId) {
+ return resultDetailMapper.selectByRecordId(recordResultId);
+ }
+
}
diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml
index e1f175c7..e17e3365 100644
--- a/src/main/resources/mapper/app/ResultDetailMapper.xml
+++ b/src/main/resources/mapper/app/ResultDetailMapper.xml
@@ -17,59 +17,62 @@
-
+
+
- id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, type AS type, target AS target, key_result AS keyResult, check_weight AS checkWeight, check_result AS checkResult, super_score AS superScore, acquire_score AS acquireScore, score_comment AS scoreComment, record_id AS recordId, user_id AS userId
+ id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, type AS type, target AS target, key_result AS keyResult, check_weight AS checkWeight, check_result AS checkResult, super_score AS superScore, acquire_score AS acquireScore, score_comment AS scoreComment, record_id AS recordId, staff_id AS staffId, priority AS priority
insert into lz_result_detail(
- type,
- target,
- key_result,
- check_weight,
- check_result,
- super_score,
- acquire_score,
- score_comment,
- record_id,
- user_id,
- is_delete,
- gmt_create,
- gmt_modified
+ type,
+ target,
+ key_result,
+ check_weight,
+ check_result,
+ super_score,
+ acquire_score,
+ score_comment,
+ record_id,
+ staff_id,
+ priority,
+ is_delete,
+ gmt_create,
+ gmt_modified
)values(
- #{ type},
- #{ target},
- #{ keyResult},
- #{ checkWeight},
- #{ checkResult},
- #{ superScore},
- #{ acquireScore},
- #{ scoreComment},
- #{ recordId},
- #{ userId},
- 0,
- now(),
- now()
+ #{ type},
+ #{ target},
+ #{ keyResult},
+ #{ checkWeight},
+ #{ checkResult},
+ #{ superScore},
+ #{ acquireScore},
+ #{ scoreComment},
+ #{ recordId},
+ #{ staffId},
+ #{ priority},
+ 0,
+ now(),
+ now()
)
update
- lz_result_detail
+ lz_result_detail
is_delete = #{isDelete},
gmt_create = #{gmtCreate},
@@ -82,7 +85,8 @@
acquire_score = #{acquireScore},
score_comment = #{scoreComment},
record_id = #{recordId},
- user_id = #{userId}
+ staff_id = #{staffId},
+ priority = #{priority}
,gmt_modified = now()
where id = #{id}
@@ -91,8 +95,8 @@
update
- lz_result_detail
- set
+ lz_result_detail
+ set
is_delete = #{isDelete},
gmt_create = #{gmtCreate},
type = #{type},
@@ -104,15 +108,24 @@
acquire_score = #{acquireScore},
score_comment = #{scoreComment},
record_id = #{recordId},
- user_id = #{userId}
+ staff_id = #{staffId},
+ priority = #{priority}
,gmt_modified = now()
where id = #{id}
- update lz_result_detail set is_delete = 1 where id=#{id} limit 1
+ update lz_result_detail set is_delete = 1 where id=#{id} limit 1
+
+
+
+
+
+
diff --git a/src/main/resources/mapper/generator/DepartmentsDao.xml b/src/main/resources/mapper/generator/DepartmentsDao.xml
index 41a53af0..8f2ea29d 100644
--- a/src/main/resources/mapper/generator/DepartmentsDao.xml
+++ b/src/main/resources/mapper/generator/DepartmentsDao.xml
@@ -81,6 +81,15 @@
+
diff --git a/src/test/java/com/lz/mysql/MysqlMain.java b/src/test/java/com/lz/mysql/MysqlMain.java
index 7c438b59..a45a5aa3 100644
--- a/src/test/java/com/lz/mysql/MysqlMain.java
+++ b/src/test/java/com/lz/mysql/MysqlMain.java
@@ -60,8 +60,7 @@ public class MysqlMain {
file.mkdirs();
}
List list = new ArrayList();
- list.add(new TablesBean("lz_departments_staff_relate"));
- list.add(new TablesBean("lz_departments"));
+ list.add(new TablesBean("lz_result_detail"));
List list2 = new ArrayList();
Map map = MysqlUtil2ShowCreateTable.getComments();