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

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-09-29 11:36:11 +08:00
parent a08797fee4
commit 4c131847c5
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,6 +254,8 @@ public class ResultRecordController extends AbstractController {
String target = "审批通过"; String target = "审批通过";
if (resultComment.getStatus() == 5) { if (resultComment.getStatus() == 5) {
target = "驳回"; target = "驳回";
}else if (resultComment.getStatus() == 6){
target = "申述";
} }
comment.setTarget(target); comment.setTarget(target);
comment.setKeyResult(resultComment.getComment()); comment.setKeyResult(resultComment.getComment());

1
src/main/java/com/lz/modules/sys/service/app/ResultRecordService.java
View File

@ -90,6 +90,7 @@ public interface ResultRecordService extends IService<ResultRecord> {
ResultRecord selectResultRecordByStaffIdStatus(Long staffId, int status); ResultRecord selectResultRecordByStaffIdStatus(Long staffId, int status);
R reject( ResultRecord resultRecord,Integer status); R reject( ResultRecord resultRecord,Integer status);
StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel, List<StaffRoleDto> staffRoleDtos, Long roleId); StaffEntity getApprovalStaff(ResultRecord resultRecord, String departmentLevel, List<StaffRoleDto> staffRoleDtos, Long roleId);
DepartmentsStaffRelateEntity getLeaderDepartmentsStaffRelateEntity(Long staffId); DepartmentsStaffRelateEntity getLeaderDepartmentsStaffRelateEntity(Long staffId);

5
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -624,8 +624,9 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
.put("to", approvalStaff) .put("to", approvalStaff)
.put("type", WorkMsgTypeEnum.URGING); .put("type", WorkMsgTypeEnum.URGING);
}else if (req.getStatus() == 6){ }else if (req.getStatus() == 6){
// 向上级申述 status = 6;
resultRecordService.approval(req.getRecordResultId(), userId,req.getStatus(),false); // 回滚代码
resultRecordService.reject(resultRecord,req.getStatus());
} }
resultCommentService.addOrUpdateComment(req, userId, status,lastUsedFlowRecord); resultCommentService.addOrUpdateComment(req, userId, status,lastUsedFlowRecord);
if(r != null){//下面推送消息 if(r != null){//下面推送消息

5
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -158,8 +158,11 @@
<select id="selectFlowRecordByResultRecordIdType" resultType="com.lz.modules.flow.entity.FlowRecord"> <select id="selectFlowRecordByResultRecordIdType" resultType="com.lz.modules.flow.entity.FlowRecord">
select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and type = #{type} and status = 0 select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and type = #{type} and status = 0
</select> </select>
<select id="selectFlowRecordByResultRecordIdTypeStatus" resultType="com.lz.modules.flow.entity.FlowRecord"> <select id="selectFlowRecordByResultRecordIdTypeStatus" resultType="com.lz.modules.flow.entity.FlowRecord">
select * from lz_flow_record where is_delete = 0 and record_id = #{resultRecordId} and type = #{type} and status = #{status} select * from lz_flow_record where is_delete = 0 and record_id = #{recordResultId} and type = #{type} and status = #{status}
</select> </select>