This commit is contained in:
杜建超 2020-10-13 15:26:26 +08:00
parent d052dd10fb
commit 89efd3ef51
5 changed files with 35 additions and 3 deletions

View File

@ -50,4 +50,8 @@ public interface FlowRecordMapper extends BaseMapper<FlowRecord> {
List<FlowRecord> selectFlowRecordByResultRecordIdTypeStatus(@Param("recordResultId") Long recordResultId, @Param("type") Integer type, @Param("status") int status);
Long copyFlowRecord(FlowRecord flowRecord);
//查看自己要审批的记录 status为1代表流程走到了这里
List<FlowRecord> selectFlowRecordListByApprovalStaffId(@Param("approvalStaffId") Long approvalStaffId);
}

View File

@ -52,4 +52,6 @@ public interface FlowRecordService extends IService<FlowRecord> {
List<FlowRecord> selectFlowRecordByResultRecordIdTypeStatus(Long recordResultId, Integer type, int status);
Long copyFlowRecord(FlowRecord flowRecord);
List<FlowRecord> selectFlowRecordListByApprovalStaffId(Long approvalStaffId);
}

View File

@ -138,5 +138,8 @@ public class FlowRecordServiceImpl extends ServiceImpl<FlowRecordMapper, FlowRec
return flowRecordMapper.copyFlowRecord(flowRecord);
}
@Override
public List<FlowRecord> selectFlowRecordListByApprovalStaffId(Long approvalStaffId) {
return flowRecordMapper.selectFlowRecordListByApprovalStaffId(approvalStaffId);
}
}

View File

@ -1,11 +1,19 @@
package com.lz.modules.performance;
import com.lz.common.utils.R;
import com.lz.modules.flow.entity.FlowRecord;
import com.lz.modules.flow.service.FlowRecordService;
import com.lz.modules.sys.controller.AbstractController;
import com.lz.modules.sys.entity.app.ResultRecord;
import com.lz.modules.sys.service.app.ResultRecordService;
import com.lz.modules.third.service.ThirdMsgSendRecordService;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.function.Consumer;
/**
* @Author: djc
* @Desc:
@ -14,12 +22,23 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/performance")
public class TaskController extends AbstractController{
private ThirdMsgSendRecordService thirdMsgSendRecordService;
private FlowRecordService flowRecordService;
private ResultRecordService resultRecordService;
@RequestMapping("task/list")
public R list(){
Long userId = getUserId();
thirdMsgSendRecordService.list();
List<FlowRecord> flowRecords = flowRecordService.selectFlowRecordListByApprovalStaffId(userId);
if(CollectionUtils.isEmpty(flowRecords)){
return R.ok();
}
flowRecords.stream().forEach(flowRecord -> {
Long recordId = flowRecord.getRecordId();
ResultRecord resultRecord = resultRecordService.selectResultRecordById(recordId);
});
ThreadLocal<Long> threadLocal = new ThreadLocal<>();
threadLocal.set(1L);
threadLocal.get();
return R.ok();
}

View File

@ -200,6 +200,10 @@
select * from lz_flow_record where is_delete = 0 and record_id = #{recordResultId} and type = #{type} and status = #{status}
</select>
<select id="selectFlowRecordListByApprovalStaffId" resultType="com.lz.modules.flow.entity.FlowRecord">
select * from lz_flow_record where is_delete = 0 and approval_staff_id = #{approvalStaffId} and status = 1
</select>
</mapper>