diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index 90c5f587..cc019121 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -760,10 +760,20 @@ public class ResultRecordController extends AbstractController { boolean isSetKeyResult = false; List 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{ diff --git a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java index 58648fbf..fa661127 100644 --- a/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java +++ b/src/main/java/com/lz/modules/flow/model/ResultRecordDetailDto.java @@ -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 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 3b477599..38a4bcaf 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 @@ -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 + diff --git a/src/main/resources/mapper/app/ResultDetailMapper.xml b/src/main/resources/mapper/app/ResultDetailMapper.xml index d5ac1dc0..fa8bf059 100644 --- a/src/main/resources/mapper/app/ResultDetailMapper.xml +++ b/src/main/resources/mapper/app/ResultDetailMapper.xml @@ -9,7 +9,7 @@ - + @@ -29,7 +29,7 @@ - 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 @@ -43,7 +43,7 @@ insert into lz_result_detail( back_id, - is_back, + is_edit, type, target, key_result, @@ -63,7 +63,7 @@ gmt_modified )values( #{ backId}, - #{ isBack}, + #{ isEdit}, #{ type}, #{ target}, #{ keyResult}, @@ -92,7 +92,7 @@ is_delete = #{isDelete}, gmt_create = #{gmtCreate}, back_id = #{backId}, - is_back = #{isBack}, + is_edit = #{isEdit}, type = #{type}, target = #{target}, key_result = #{keyResult}, @@ -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 * 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 @@ -204,11 +204,11 @@