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

Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

Browse Source
This commit is contained in:
杜建超 2020-12-08 17:29:48 +08:00
commit 906171c8d5
4 changed files with 39 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -760,10 +760,20 @@ public class ResultRecordController extends AbstractController {
boolean isSetKeyResult = false;
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordIdStatus(dto.getId(), 2);
if(flowRecords.size() > 0){
if(flowRecords.get(0).getFlowProcess().intValue() == 0){
//指定目标中
isSetKeyResult = true;
if(dto.getSave() != null && dto.getSave().intValue() ==1){
if(flowRecords.get(0).getFlowProcess().intValue() < 1){//因为先提交流程在保存，所以这里写了小于2
//指定目标中
log.info("暂存制定目标中");
isSetKeyResult = true;
}
}else{
if(flowRecords.get(0).getFlowProcess().intValue() < 2){//因为先提交流程在保存，所以这里写了小于2
//指定目标中
log.info("制定目标中");
isSetKeyResult = true;
}
}
}
@ -946,8 +956,15 @@ public class ResultRecordController extends AbstractController {
}
if(commandValue.length() > 0){
log.info("需要写入评论，具体呢容为{}", commandValue);
resultCommentService.updateResultCommentCommentById(dto.getCommentId(), commandValue);
ResultComment resultComment = resultCommentService.selectResultCommentById(dto.getCommentId());
if(resultComment.getOptDesc().indexOf("制定了目标") >= 0){
resultComment.setOptDesc("修改了目标");
resultComment.setComment(commandValue);
}else{
resultComment.setOptDesc(resultComment.getOptDesc() + "修改了目标");
resultComment.setComment(resultComment.getComment() + commandValue);
}
resultCommentService.updateResultCommentById(resultComment);//.updateResultCommentCommentById(dto.getCommentId(), commandValue);
}
}
}else{

3
src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java
View File

@ -42,6 +42,9 @@ public class ResultRecordDetailDto {
@ApiModelProperty(value = "任务id", name = "startId")
private Long startId;
@ApiModelProperty(value = "暂存", name = "save")
private Integer save;
//使用的哪个等级。等级组id，lz_result_grade的group_id

8
src/main/java/com/lz/modules/sys/entity/app/ResultDetail.java
View File

@ -36,7 +36,7 @@ public class ResultDetail implements java.io.Serializable {
private Long backId;
//是否为备份，0非备份，1备份值
@ApiModelProperty(value = "是否为备份，0非备份，1备份值", name = "isBack")
private Integer isBack;
private Integer isEdit;
//1，业绩，2文化价值观
@ApiModelProperty(value = "1，业绩，2文化价值观", name = "type")
private Integer type;
@ -159,14 +159,14 @@ public class ResultDetail implements java.io.Serializable {
* @return
*/
public Integer getIsBack() {
return isBack;
return isEdit;
}
/**
* 是否为备份，0非备份，1备份值
* @param isBack
*/
public void setIsBack(Integer isBack) {
this.isBack = isBack;
this.isEdit = isBack;
}
/**
@ -387,7 +387,7 @@ public class ResultDetail implements java.io.Serializable {
",gmtCreate=" + gmtCreate +
",gmtModified=" + gmtModified +
",backId=" + backId +
",isBack=" + isBack +
",isBack=" + isEdit +
",type=" + type +
",target=" + target +
",keyResult=" + keyResult +

20
src/main/resources/mapper/app/ResultDetailMapper.xml
View File

@ -9,7 +9,7 @@
<result column="gmt_create" property="gmtCreate"/>
<result column="gmt_modified" property="gmtModified"/>
<result column="back_id" property="backId"/>
<result column="is_back" property="isBack"/>
<result column="is_edit" property="isEdit"/>
<result column="type" property="type"/>
<result column="target" property="target"/>
<result column="key_result" property="keyResult"/>
@ -29,7 +29,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, back_id AS backId, is_back AS isBack, type AS type, target AS target, key_result AS keyResult, key_result_3_5 AS keyResult35, key_result_3_7 AS keyResult37, 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, model_id AS modelId
id AS id, is_delete AS isDelete, gmt_create AS gmtCreate, gmt_modified AS gmtModified, back_id AS backId, is_edit AS isEdit, type AS type, target AS target, key_result AS keyResult, key_result_3_5 AS keyResult35, key_result_3_7 AS keyResult37, 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, model_id AS modelId
</sql>
@ -43,7 +43,7 @@
<insert id="insertResultDetail" parameterType="ResultDetail" useGeneratedKeys="true" keyProperty="id" >
insert into lz_result_detail(
<if test="backId != null">back_id, </if>
<if test="isBack != null">is_back, </if>
<if test="isEdit != null">is_edit, </if>
<if test="type != null">type, </if>
<if test="target != null">target, </if>
<if test="keyResult != null">key_result, </if>
@ -63,7 +63,7 @@
gmt_modified
)values(
<if test="backId != null">#{ backId}, </if>
<if test="isBack != null">#{ isBack}, </if>
<if test="isEdit != null">#{ isEdit}, </if>
<if test="type != null">#{ type}, </if>
<if test="target != null">#{ target}, </if>
<if test="keyResult != null">#{ keyResult}, </if>
@ -92,7 +92,7 @@
<if test="isDelete != null">is_delete = #{isDelete},</if>
<if test="gmtCreate != null">gmt_create = #{gmtCreate},</if>
<if test="backId != null">back_id = #{backId},</if>
<if test="isBack != null">is_back = #{isBack},</if>
<if test="isEdit != null">is_edit = #{isEdit},</if>
<if test="type != null">type = #{type},</if>
<if test="target != null">target = #{target},</if>
<if test="keyResult != null">key_result = #{keyResult},</if>
@ -120,7 +120,7 @@
is_delete = #{isDelete},
gmt_create = #{gmtCreate},
back_id = #{backId},
is_back = #{isBack},
is_edit = #{isEdit},
type = #{type},
target = #{target},
key_result = #{keyResult},
@ -147,7 +147,7 @@
<select id="selectByRecordId" resultType="com.lz.modules.sys.entity.app.ResultDetail">
select * from lz_result_detail where record_id=#{recordResultId} and is_delete = 0 and is_back=0 order by type asc ,priority desc
select * from lz_result_detail where record_id=#{recordResultId} and is_delete = 0 and is_edit=0 order by type asc ,priority desc
</select>
<select id="selectByRecordIdType" resultType="com.lz.modules.sys.entity.app.ResultDetail">
@ -196,7 +196,7 @@
</insert>
<select id="selectDtosByRecordId" resultType="com.lz.modules.flow.model.ResultDetailDto">
select * from lz_result_detail where record_id=#{recordResultId} and model_id = #{modelId} and is_delete = 0 and (is_back = 0 or is_back = 3) order by priority asc
select * from lz_result_detail where record_id=#{recordResultId} and model_id = #{modelId} and is_delete = 0 and (is_edit = 0 or is_edit = 3) order by priority asc
</select>
<update id="deleteResultDetailByRecordId" parameterType="java.lang.Long">
@ -204,11 +204,11 @@
</update>
<select id="selectNotNoticeResultDetailByBackId" resultType="com.lz.modules.sys.entity.app.ResultDetail">
select * from lz_result_detail where back_id = #{backId} and is_back = 2 order by priority asc
select * from lz_result_detail where back_id = #{backId} and is_edit = 2 order by priority asc
</select>
<select id="selectNotNoticeResultDetailByRecordId" resultType="com.lz.modules.sys.entity.app.ResultDetail">
select * from lz_result_detail where record_id = #{recordId} and (is_back = 2 or is_back = 3) order by priority asc
select * from lz_result_detail where record_id = #{recordId} and (is_edit = 2 or is_edit = 3) order by priority asc
</select>
</mapper>