wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lz_evaluation_start_staff增加department_id

Browse Source
This commit is contained in:
wulin 2020-10-30 09:26:48 +08:00
parent 9942f7a840
commit 75e1c2ea2b
6 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/lz/modules/flow/entity/EvaluationStartStaff.java
View File

@ -10,7 +10,7 @@ import java.util.Date;
* <p>
* </p>*发起考核考，核组人员对应关系表
* @author quyixiao
* @since 2020-10-23
* @since 2020-10-30
*/
@Data
@ -38,8 +38,8 @@ public class EvaluationStartStaff implements java.io.Serializable {
//人员id
@ApiModelProperty(value = "人员id", name = "staffId")
private Long staffId;
//0考核人员，1管理人员
@ApiModelProperty(value = "0考核人员，1管理人员", name = "type")
//0考核人员 1：考核人员
@ApiModelProperty(value = "0考核人员 1：考核人员", name = "type")
private Integer type;
//0: 未通知评分 1： 已通知评分
@ApiModelProperty(value = "0: 未通知评分 1： 已通知评分", name = "score")
@ -47,6 +47,9 @@ public class EvaluationStartStaff implements java.io.Serializable {
//考核组名称
@ApiModelProperty(value = "考核组名称", name = "evaluationName")
private String evaluationName;
//员工所在的部门id
@ApiModelProperty(value = "员工所在的部门id", name = "departmentId")
private String departmentId;
/**
*
* @return
@ -153,14 +156,14 @@ public class EvaluationStartStaff implements java.io.Serializable {
}
/**
* 0考核人员，1管理人员
* 0考核人员 1：考核人员
* @return
*/
public Integer getType() {
return type;
}
/**
* 0考核人员，1管理人员
* 0考核人员 1：考核人员
* @param type
*/
public void setType(Integer type) {
@ -197,6 +200,21 @@ public class EvaluationStartStaff implements java.io.Serializable {
this.evaluationName = evaluationName;
}
/**
* 员工所在的部门id
* @return
*/
public String getDepartmentId() {
return departmentId;
}
/**
* 员工所在的部门id
* @param departmentId
*/
public void setDepartmentId(String departmentId) {
this.departmentId = departmentId;
}
@Override
public String toString() {
return "EvaluationStartStaff{" +
@ -210,6 +228,7 @@ public class EvaluationStartStaff implements java.io.Serializable {
",type=" + type +
",score=" + score +
",evaluationName=" + evaluationName +
",departmentId=" + departmentId +
"}";
}
}

2
src/main/java/com/lz/modules/flow/model/EvaluationStartStaffDto.java
View File

@ -27,6 +27,8 @@ public class EvaluationStartStaffDto {
//0考核人员，1管理人员
@ApiModelProperty(value = "0考核人员，1管理人员", name = "type")
private Integer type;
@ApiModelProperty(value = "员工所在的部门id", name = "departmentId")
private String departmentId;
/**
*
* @return

2
src/main/java/com/lz/modules/flow/req/EvaluationStartStaffReq.java
View File

@ -50,6 +50,8 @@ public class EvaluationStartStaffReq implements java.io.Serializable {
//0考核人员，1管理人员
@ApiModelProperty(value = "0考核人员，1管理人员", name = "type")
private Integer type;
@ApiModelProperty(value = "员工所在的部门id", name = "departmentId")
private String departmentId;
/**
*
* @return

1
src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
View File

@ -340,6 +340,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
evaluationStartStaff.setEvaluationName(evaluationGroup.getName());
evaluationStartStaff.setStaffId(staffInfo.getId());
evaluationStartStaff.setStartId(flowStart.getId());
evaluationStartStaff.setDepartmentId(staffInfo.getDepartmentId());
evaluationStartStaff.setType(CheckStaffType.STAFF.getCode());
evaluationStartStaffs.add(evaluationStartStaff);

13
src/main/resources/mapper/flow/EvaluationStartStaffMapper.xml
View File

@ -14,12 +14,13 @@
<result column="type" property="type"/>
<result column="score" property="score"/>
<result column="evaluation_name" property="evaluationName"/>
<result column="department_id" property="departmentId"/>
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, evaluation_id AS evaluationId, start_id AS startId, staff_id AS staffId, type AS type, score AS score, evaluation_name AS evaluationName
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, evaluation_id AS evaluationId, start_id AS startId, staff_id AS staffId, type AS type, score AS score, evaluation_name AS evaluationName, department_id AS departmentId
</sql>
@ -38,6 +39,7 @@
<if test="type != null">type, </if>
<if test="score != null">score, </if>
<if test="evaluationName != null">evaluation_name, </if>
<if test="departmentId != null">department_id, </if>
is_delete,
gmt_create,
gmt_modified
@ -48,6 +50,7 @@
<if test="type != null">#{ type}, </if>
<if test="score != null">#{ score}, </if>
<if test="evaluationName != null">#{ evaluationName}, </if>
<if test="departmentId != null">#{ departmentId}, </if>
0,
now(),
now()
@ -66,7 +69,8 @@
<if test="staffId != null">staff_id = #{staffId},</if>
<if test="type != null">type = #{type},</if>
<if test="score != null">score = #{score},</if>
<if test="evaluationName != null">evaluation_name = #{evaluationName}</if>
<if test="evaluationName != null">evaluation_name = #{evaluationName},</if>
<if test="departmentId != null">department_id = #{departmentId}</if>
</trim>
,gmt_modified = now()
where id = #{id}
@ -84,7 +88,8 @@
staff_id = #{staffId},
type = #{type},
score = #{score},
evaluation_name = #{evaluationName}
evaluation_name = #{evaluationName},
department_id = #{departmentId}
,gmt_modified = now()
where id = #{id}
</update>
@ -102,6 +107,7 @@
staff_id,
type,
evaluation_name,
department_id,
is_delete
)values
<foreach collection="list" item="item" separator=",">(
@ -110,6 +116,7 @@
#{ item.staffId},
#{ item.type},
#{ item.evaluationName},
#{ item.departmentId},
0
)
</foreach>

2
src/test/java/com/lz/mysql/MysqlMain.java
View File

@ -110,7 +110,7 @@ public class MysqlMain {
//list.add(new TablesBean("lz_flow_chart_detail_record"));
//list.add(new TablesBean("lz_flow_approval_role"));
list.add(new TablesBean("lz_flow_chart"));
list.add(new TablesBean("lz_evaluation_start_staff"));
List<TablesBean> list2 = new ArrayList<TablesBean>();
Map<String, String> map = MysqlUtil2ShowCreateTable.getComments();