提交代码

dev_xds
姜玉琦 2024-04-21 14:01:05 +08:00
parent 65c562bdd8
commit 57fb2aeca4
5 changed files with 38 additions and 8 deletions

View File

@ -115,10 +115,7 @@ public class FlowLabourInfoController extends BaseController
@RateLimiter(count = 10, limitType = LimitType.IP)
public AjaxResult findMyFlowLabours(@PathVariable("cardId") String cardId)
{
FlowLabourInfo flowLabourInfo = new FlowLabourInfo();
flowLabourInfo.setLaborCardId(cardId);
List<FlowLabourInfo> list = flowLabourInfoService.selectFlowLabourInfoList(flowLabourInfo);
return success(list);
return success(flowLabourInfoService.selectFlowLabourInfoByCardId(cardId));
}
/**

View File

@ -21,6 +21,14 @@ public interface FlowLabourInfoMapper
*/
public FlowLabourInfo selectFlowLabourInfoById(Long id);
/**
*
*
* @param cardId
* @return
*/
public List<FlowLabourInfo> selectFlowLabourInfoByCardId(String cardId);
/**
*
*

View File

@ -1,11 +1,11 @@
package com.yanzhu.jh.flow.service;
import java.util.List;
import java.util.Map;
import com.ruoyi.common.core.domain.AjaxResult;
import com.yanzhu.jh.flow.domain.FlowLabourInfo;
import java.util.List;
import java.util.Map;
/**
* Service
*
@ -22,6 +22,14 @@ public interface IFlowLabourInfoService
*/
public FlowLabourInfo selectFlowLabourInfoById(Long id);
/**
*
*
* @param cardId
* @return
*/
public List<FlowLabourInfo> selectFlowLabourInfoByCardId(String cardId);
/**
*
*

View File

@ -44,6 +44,18 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
return flowLabourInfoMapper.selectFlowLabourInfoById(id);
}
/**
*
*
* @param cardId
* @return
*/
@Override
public List<FlowLabourInfo> selectFlowLabourInfoByCardId(String cardId)
{
return flowLabourInfoMapper.selectFlowLabourInfoByCardId(cardId);
}
/**
*
*
@ -138,7 +150,7 @@ public class FlowLabourInfoServiceImpl implements IFlowLabourInfoService
//保存流程节点信息
FlowLabourAuditNode flowLabourAuditNode = new FlowLabourAuditNode();
flowLabourAuditNode.setFlowId(flowLabourInfo.getId());
flowLabourAuditNode.setFlowNode("10");
flowLabourAuditNode.setFlowNode("0");
flowLabourAuditNode.setCreateBy(flowLabourInfo.getLaborName());
flowLabourAuditNode.setCreateTime(new Date());
flowLabourAuditNodeMapper.insertFlowLabourAuditNode(flowLabourAuditNode);

View File

@ -145,6 +145,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectFlowLabourInfoVo"/>
where fl.id = #{id}
</select>
<select id="selectFlowLabourInfoByCardId" parameterType="String" resultMap="FlowLabourInfoResult">
<include refid="selectFlowLabourInfoVo"/>
where fl.labor_cardId = #{cardId}
</select>
<insert id="insertFlowLabourInfo" parameterType="FlowLabourInfo" useGeneratedKeys="true" keyProperty="id">
insert into flow_labour_info