Commit 6f82da45 by 王志超

feat: 变更行动工单列表

parent 0f85eac1
...@@ -51,13 +51,6 @@ public interface ChangeFlowExecService { ...@@ -51,13 +51,6 @@ public interface ChangeFlowExecService {
List<Long> queryByExecUser(String changeExecUser); List<Long> queryByExecUser(String changeExecUser);
/** /**
* 根据子流程工单ID查询行动项记录
* @param subFlowId
* @return
*/
ChangeExecRecord getBySubFlowId(String subFlowId);
/**
* 根据变更行动工单记录ID查询行动项列表 * 根据变更行动工单记录ID查询行动项列表
* @param subFlowRecordId 变更行动工单记录ID * @param subFlowRecordId 变更行动工单记录ID
* @return 行动项列表 * @return 行动项列表
......
...@@ -41,7 +41,7 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService { ...@@ -41,7 +41,7 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
.changeRiskDesc(c.getChangeRiskDesc()).changeExecProject(c.getChangeExecProject()) .changeRiskDesc(c.getChangeRiskDesc()).changeExecProject(c.getChangeExecProject())
.changeChecking(c.getChangeChecking()).changeExecFinishTime(c.getChangeExecFinishTime()) .changeChecking(c.getChangeChecking()).changeExecFinishTime(c.getChangeExecFinishTime())
.changeExecFinishDesc(c.getChangeExecFinishDesc()) .changeExecFinishDesc(c.getChangeExecFinishDesc())
.subFlowId(c.getSubFlowId()).subFlowNode(c.getSubFlowNode()).build()) .subFlowId(c.getSubFlowId()).build())
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
return new ArrayList<>(); return new ArrayList<>();
...@@ -78,11 +78,6 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService { ...@@ -78,11 +78,6 @@ public class ChangeFlowExecServiceImpl implements ChangeFlowExecService {
} }
@Override @Override
public ChangeExecRecord getBySubFlowId(String subFlowId) {
return changeExecRecordMapper.selectBySubFlowId(subFlowId);
}
@Override
public List<ChangeExecRecord> getBySubFlowRecordId(Long subFlowRecordId) { public List<ChangeExecRecord> getBySubFlowRecordId(Long subFlowRecordId) {
if (subFlowRecordId == null) { if (subFlowRecordId == null) {
return new ArrayList<>(); return new ArrayList<>();
......
...@@ -84,16 +84,11 @@ public class ChangeExecRecord { ...@@ -84,16 +84,11 @@ public class ChangeExecRecord {
private String changeExecFinishDesc; private String changeExecFinishDesc;
/** /**
* 子流程工单ID * 变更执行工单topo ID
*/ */
private String subFlowId; private String subFlowId;
/** /**
* 子流程当前节点
*/
private String subFlowNode;
/**
* 变更行动工单记录ID(关联到变更行动工单中间表,新数据使用) * 变更行动工单记录ID(关联到变更行动工单中间表,新数据使用)
*/ */
private Long subFlowRecordId; private Long subFlowRecordId;
......
...@@ -43,9 +43,6 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper< ...@@ -43,9 +43,6 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper<
@Select("SELECT * FROM TB_YX_QC_CHANGE_EXEC_RECORD ORDER BY id DESC LIMIT #{limit},#{offset}") @Select("SELECT * FROM TB_YX_QC_CHANGE_EXEC_RECORD ORDER BY id DESC LIMIT #{limit},#{offset}")
List<ChangeExecRecord> queryList(@Param("limit") int limit, @Param("offset") Integer offset); List<ChangeExecRecord> queryList(@Param("limit") int limit, @Param("offset") Integer offset);
@Select("SELECT * FROM TB_YX_QC_CHANGE_EXEC_RECORD WHERE sub_flow_id = #{subFlowId} LIMIT 1")
ChangeExecRecord selectBySubFlowId(@Param("subFlowId") String subFlowId);
/** /**
* 根据变更行动工单记录ID查询行动项列表 * 根据变更行动工单记录ID查询行动项列表
* @param subFlowRecordId 变更行动工单记录ID * @param subFlowRecordId 变更行动工单记录ID
...@@ -55,11 +52,11 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper< ...@@ -55,11 +52,11 @@ public interface ChangeExecRecordMapper extends tk.mybatis.mapper.common.Mapper<
List<ChangeExecRecord> selectBySubFlowRecordId(@Param("subFlowRecordId") Long subFlowRecordId); List<ChangeExecRecord> selectBySubFlowRecordId(@Param("subFlowRecordId") Long subFlowRecordId);
/** /**
* 根据变更行动人查询变更行动工单记录ID列表 * 根据变更行动人查询变更行动工单记录ID列表(只查询 email,使用 LIKE)
* @param changeExecUser 变更行动人(邮箱或姓名 * @param changeExecUser 变更行动人(邮箱)
* @return 变更行动工单记录ID列表 * @return 变更行动工单记录ID列表
*/ */
@Select("SELECT DISTINCT(sub_flow_record_id) FROM TB_YX_QC_CHANGE_EXEC_RECORD WHERE sub_flow_record_id IS NOT NULL AND (change_exec_user_email LIKE #{changeExecUser} OR change_exec_user LIKE #{changeExecUser})") @Select("SELECT DISTINCT(sub_flow_record_id) FROM TB_YX_QC_CHANGE_EXEC_RECORD WHERE sub_flow_record_id IS NOT NULL AND change_exec_user_email LIKE #{changeExecUser}")
List<Long> querySubFlowRecordIdsByExecUser(@Param("changeExecUser") String changeExecUser); List<Long> querySubFlowRecordIdsByExecUser(@Param("changeExecUser") String changeExecUser);
/** /**
......
...@@ -84,9 +84,4 @@ public class ChangeFlowExecVO { ...@@ -84,9 +84,4 @@ public class ChangeFlowExecVO {
* 子流程工单ID * 子流程工单ID
*/ */
private String subFlowId; private String subFlowId;
/**
* 子流程当前节点
*/
private String subFlowNode;
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment