abu/wzj-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 增加抄送人名称

Browse Source
This commit is contained in:
AprilWind 2024-12-20 09:54:06 +08:00
parent e8ade07f19
commit 752b026ebe
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
View File

@ -132,6 +132,11 @@ public class FlowTaskVo implements Serializable {
@Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "flowStatus", other = "wf_business_status") @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "flowStatus", other = "wf_business_status")
private String flowStatusName; private String flowStatusName;
/**
* 办理人类型
*/
private String type;
/** /**
* 办理人ids * 办理人ids
*/ */
@ -148,9 +153,10 @@ public class FlowTaskVo implements Serializable {
private String processedBy; private String processedBy;
/** /**
* 办理人类型 * 抄送人名称
*/ */
private String type; @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "processedBy")
private String processedByName;
/** /**
* 流程签署比例值 大于0为票签，会签 * 流程签署比例值 大于0为票签，会签
@ -158,12 +164,12 @@ public class FlowTaskVo implements Serializable {
private BigDecimal nodeRatio; private BigDecimal nodeRatio;
/** /**
* 创建者 * 申请人id
*/ */
private String createBy; private String createBy;
/** /**
* 申请人 * 申请人名称
*/ */
@Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy") @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
private String createByName; private String createByName;

3
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
View File

@ -65,6 +65,9 @@ public class FlwCategoryServiceImpl implements IFlwCategoryService {
@Cacheable(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId") @Cacheable(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId")
@Override @Override
public String selectCategoryNameById(String categoryId) { public String selectCategoryNameById(String categoryId) {
if (StringUtils.isBlank(categoryId)) {
return null;
}
FlowCategory category = baseMapper.selectOne(new LambdaQueryWrapper<FlowCategory>() FlowCategory category = baseMapper.selectOne(new LambdaQueryWrapper<FlowCategory>()
.select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, categoryId)); .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, categoryId));
return ObjectUtils.notNullGetter(category, FlowCategory::getCategoryName); return ObjectUtils.notNullGetter(category, FlowCategory::getCategoryName);