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-08-23 22:57:25 +08:00
parent 3d6e5914be
commit c31d19f269
6 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,7 +206,7 @@ public class ResultRecordController extends AbstractController {
.put("wenHuaJiaZhiGuanNum", wenHuaJiaZhiGuanNum)
.put("lastResultNum", lastResultNum)
.put("commentNum", commentNum)
.put("superStaff",superStaff);
.put("superStaff", superStaff);
}
@RequestMapping("/commitApproval")
@ -218,6 +218,19 @@ public class ResultRecordController extends AbstractController {
ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId());
resultRecord.setStatus(Constant.STATUS_3);
resultRecordService.updateResultRecordById(resultRecord);
} else if (req.getStatus() == 4) { // 驳回
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordByRecordId(req.getRecordResultId());
ResultRecord resultRecord = resultRecordService.selectResultRecordById(req.getRecordResultId());
if (flowRecords.size() > 0 && req.getRollbackFlowId() > 0) {
for (FlowRecord flowRecord : flowRecords) {
if (flowRecord.getId().equals(req.getRollbackFlowId())) {
resultRecord.setFlowStaffIdRole(flowRecord.getFlowStaffIdRole());
} else {
resultRecord.setStatus(1);
}
resultRecordService.updateResultRecordById(resultRecord);
}
}
}
return R.ok("成功");
}

1
src/main/java/com/lz/modules/app/req/ResultRecordReq.java
View File

@ -34,4 +34,5 @@ public class ResultRecordReq {
private String departmentLevel ;
private String resultComment;
private Long resultCommitId;
private Long rollbackFlowId;
}

2
src/main/java/com/lz/modules/flow/dao/FlowRecordMapper.java
View File

@ -38,4 +38,6 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
FlowRecord selectNotApprovalStaffIdFlowRecords(@Param("recordId") Long recordId);
List<FlowRecord> selectFlowRecordByRecordId(@Param("recordId") Long recordId);
List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(@Param("recordId") Long recordId, @Param("rollbackFlowId") Long rollbackFlowId);
}

2
src/main/java/com/lz/modules/flow/service/FlowRecordService.java
View File

@ -40,4 +40,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
List<FlowRecord> selectFlowRecordByRecordId(Long recordId);
void initFlowRecord(ResultRecord resultRecord , Long roleId , Integer type , String name);
List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId, Long rollbackFlowId);
}

6
src/main/java/com/lz/modules/flow/service/impl/FlowRecordServiceImpl.java
View File

@ -15,6 +15,7 @@ import org.apache.tomcat.util.bcel.Const;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.awt.*;
import java.util.List;
/**
@ -105,5 +106,10 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
flowRecord.setDepartmentLevel(Constant.ME);
}
@Override
public List<FlowRecord> selectFlowRecordByResultRecordIdFlowId(Long recordResultId, Long rollbackFlowId) {
return flowRecordMapper.selectFlowRecordByResultRecordIdFlowId(recordResultId, rollbackFlowId);
}
}

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

@ -127,6 +127,9 @@
<select id="selectFlowRecordByRecordId" resultType="com.lz.modules.flow.entity.FlowRecord">
select * from lz_flow_record where is_delete = 0 and record_id = #{recordId}
</select>
<select id="selectFlowRecordByResultRecordIdFlowId" resultType="com.lz.modules.flow.entity.FlowRecord">
select * from lz_flow_record where is_delete = 0 and record_id = #{recordId} and id > #{rollbackFlowId}
</select>
</mapper>