diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java index bf0cec81..8819ab52 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessNode.java @@ -100,4 +100,23 @@ public class ProcessNode { @ApiModelProperty(value = "关联用户id") @Dict(dictTable = "sys_user",dicText = "realname",dicCode = "id") private String linkUserIds; + + /** + * 是否禁止输入(0否,1是) + */ + @TableField(value = "can_choose") + @ApiModelProperty(value = "是否禁止输入(0否,1是)") + private Integer canChoose; + /** + * 用户来源(workGroup工作组,contactManage联络人管理,user普通) + */ + @TableField(value = "choose_source") + @ApiModelProperty(value = "用户来源(workGroup工作组,contactManage联络人管理,user普通)") + private String chooseSource; + /** + * 最少处理人个数 + */ + @TableField(value = "min_length") + @ApiModelProperty(value = "最少处理人个数") + private Integer minLength; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java index f19c87d7..f42315ba 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java @@ -101,7 +101,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map userInfoMap.put("engineer", CurrentUserUtil.getId()); // 第一个任务节点设置成自己 @@ -121,7 +121,7 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl processInfoVO, boolean pass) { ProcessFbEntryChange businessInfoDTO = processInfoVO.getBusinessInfoDTO(); processInfoVO.setBusinessId(businessInfoDTO.getId()); - updateById(businessInfoDTO); + editBusinessInfo(businessInfoDTO); processHandleService.approveTask(processInfoVO, pass); }