geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步框架更新

Browse Source
This commit is contained in:
yaoyn
2025-02-15 17:05:09 +08:00
parent 29b5c68564
commit 9b7d27a2b4
141 changed files with 585 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowApproveRecordMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.workflow.entity.WorkflowApproveRecord;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author tzx
* @since 2023-02-10
*/
@Mapper
public interface WorkflowApproveRecordMapper extends MPJBaseMapper<WorkflowApproveRecord> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowCirculatedMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.workflow.entity.WorkflowCirculated;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 流程传阅信息表 Mapper 接口
* </p>
*
* @author tzx
* @since 2023-02-09
*/
@Mapper
public interface WorkflowCirculatedMapper extends MPJBaseMapper<WorkflowCirculated> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowDelegateMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.workflow.entity.WorkflowDelegate;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 流程委托 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-11-05
*/
@Mapper
public interface WorkflowDelegateMapper extends BaseMapper<WorkflowDelegate> {
}

14
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowDraftMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.xjrsoft.workflow.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.workflow.entity.WorkflowDraft;
import org.apache.ibatis.annotations.Mapper;
/**
* @Author: tzx
* @Date: 2022/11/4 10:01
*/
@Mapper
public interface WorkflowDraftMapper extends MPJBaseMapper<WorkflowDraft> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowExtraMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.workflow.entity.WorkflowExtra;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* Mapper 接口
* </p>
*
* @author tzx
* @since 2022-10-11
*/
@Mapper
public interface WorkflowExtraMapper extends BaseMapper<WorkflowExtra> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowFormRelationMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.workflow.entity.WorkflowFormRelation;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 工作流 流程 与 表单关联表 Mapper 接口
* </p>
*
* @author tzx
* @since 2023-03-27
*/
@Mapper
public interface WorkflowFormRelationMapper extends BaseMapper<WorkflowFormRelation> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowRecordMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.workflow.entity.WorkflowRecord;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 工作流 流转记录信息 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-11-10
*/
@Mapper
public interface WorkflowRecordMapper extends BaseMapper<WorkflowRecord> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowSchemaAuthMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.workflow.entity.WorkflowSchemaAuth;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 流程模板权限 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-07-04
*/
@Mapper
public interface WorkflowSchemaAuthMapper extends BaseMapper<WorkflowSchemaAuth> {
}

17
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowSchemaDraftMapper.java Normal file
View File

@ -0,0 +1,17 @@
package com.xjrsoft.workflow.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.xjrsoft.workflow.entity.WorkflowSchemaDraft;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 流程草稿表 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-11-03
*/
@Mapper
public interface WorkflowSchemaDraftMapper extends BaseMapper<WorkflowSchemaDraft> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowSchemaHistoryMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.workflow.entity.WorkflowSchemaHistory;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 流程模板历史记录表 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-11-16
*/
@Mapper
public interface WorkflowSchemaHistoryMapper extends MPJBaseMapper<WorkflowSchemaHistory> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowSchemaMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.workflow.entity.WorkflowSchema;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 流程模板表 Mapper 接口
* </p>
*
* @author tzx
* @since 2022-07-04
*/
@Mapper
public interface WorkflowSchemaMapper extends MPJBaseMapper<WorkflowSchema> {
}

18
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/mapper/WorkflowSpecialMenuMapper.java Normal file
View File

@ -0,0 +1,18 @@
package com.xjrsoft.workflow.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import com.xjrsoft.workflow.entity.WorkflowSpecialMenu;
import org.apache.ibatis.annotations.Mapper;
/**
* <p>
* 专项菜单表 Mapper 接口
* </p>
*
* @author tzx
* @since 2023-03-20
*/
@Mapper
public interface WorkflowSpecialMenuMapper extends MPJBaseMapper<WorkflowSpecialMenu> {
}

2
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/service/IFormExecuteService.java
View File

@ -168,7 +168,7 @@ public interface IFormExecuteService {
* @param formId
* @return
*/
List<DeskFormReleaseVo> getReleaseInfo(Long formId);
//List<DeskFormReleaseVo> getReleaseInfo(Long formId);
List<QueryConfig> complexQuery(ComplexQueryDto dto);

86
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/service/impl/FormExecuteServiceImpl.java
View File

@ -44,13 +44,13 @@ import com.xjrsoft.common.mybatis.utils.DatasourceUtil;
import com.xjrsoft.common.mybatis.utils.LocalDateTimeUtil;
import com.xjrsoft.common.mybatis.utils.XjrSqlConnRunner;
import com.xjrsoft.desktop.dto.*;
import com.xjrsoft.form.client.IFormReleaseClient;
import com.xjrsoft.form.client.IFormTemplateClient;
import com.xjrsoft.form.dto.*;
import com.xjrsoft.form.entity.FormDesignConfig;
import com.xjrsoft.form.entity.FormRelease;
import com.xjrsoft.form.entity.FormReleaseConfig;
import com.xjrsoft.form.entity.FormTemplate;
import com.xjrsoft.form.mapper.FormReleaseMapper;
import com.xjrsoft.form.mapper.FormTemplateMapper;
import com.xjrsoft.form.vo.DeskColumnsVo;
import com.xjrsoft.form.vo.DeskFormReleaseVo;
import com.xjrsoft.form.vo.DeskTableInfoVo;
@ -95,9 +95,9 @@ import java.util.stream.Collectors;
@AllArgsConstructor
public class FormExecuteServiceImpl implements IFormExecuteService {
private final FormReleaseMapper formReleaseMapper;
private final IFormReleaseClient formReleaseClient;
private final FormTemplateMapper formTemplateMapper;
private final IFormTemplateClient formTemplateClient;
private final ICodeRuleClient codeRuleClient;
@ -123,7 +123,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
@SneakyThrows
public List<Entity> list(FormExecuteListDto dto) {
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
String configJson = formRelease.getConfigJson();
@ -131,7 +131,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
FormReleaseConfig formReleaseConfig = JSONUtil.toBean(configJson, FormReleaseConfig.class);
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(formRelease.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formRelease.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -207,7 +207,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
public PageOutput<Entity> page(FormExecutePageDto dto) {
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
String configJson = formRelease.getConfigJson();
@ -216,7 +216,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
FormReleaseConfig formReleaseConfig = JSONUtil.toBean(configJson, FormReleaseConfig.class);
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(formRelease.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formRelease.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -320,7 +320,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
public Object info(FormExecuteInfoDto dto) {
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
String configJson = formRelease.getConfigJson();
@ -328,7 +328,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
FormReleaseConfig formReleaseConfig = JSONUtil.toBean(configJson, FormReleaseConfig.class);
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(formRelease.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formRelease.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -408,7 +408,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
public Boolean add(FormExecuteAddOrUpdateDto dto) {
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
Map<String, Object> formData = dto.getFormData();
@ -418,7 +418,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
FormReleaseConfig formReleaseConfig = JSONUtil.toBean(configJson, FormReleaseConfig.class);
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(formRelease.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formRelease.getFormId());
return insertFormData(formData, template);
@ -441,7 +441,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
}
public Boolean saveMainBatch(Long formTemplateId, List<Map<String, Object>> dataList) {
FormTemplate template = formTemplateMapper.selectById(formTemplateId);
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formTemplateId);
String formJson = template.getFormJson();
//自定义表单配置
FormDesignConfig formDesignConfig = JSONUtil.toBean(formJson, FormDesignConfig.class);
@ -483,7 +483,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
public Boolean update(FormExecuteAddOrUpdateDto dto) {
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
String configJson = formRelease.getConfigJson();
@ -493,7 +493,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
FormReleaseConfig formReleaseConfig = JSONUtil.toBean(configJson, FormReleaseConfig.class);
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(formRelease.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formRelease.getFormId());
return updateFormData(formData, template);
}
@ -519,7 +519,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
public Boolean delete(FormExecuteDeleteDto dto) {
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
String configJson = formRelease.getConfigJson();
@ -528,7 +528,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
FormReleaseConfig formReleaseConfig = JSONUtil.toBean(configJson, FormReleaseConfig.class);
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(formRelease.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formRelease.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -786,7 +786,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
public Triple<Session, Long, Long> workflowAdd(FormExecuteWorkflowAddDto dto) {
Map<String, Object> formData = dto.getFormData();
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(dto.formId);
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.formId);
return insertFormByWorkflow(formData, template,dto.getIsOldSystem());
}
@ -795,7 +795,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
public Triple<Session, Long, Long> workflowUpdate(FormExecuteWorkflowUpdateDto dto) {
Map<String, Object> formData = dto.getFormData();
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(dto.formId);
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.formId);
return updateFormDataByWorkflow(formData, template,dto.getIsOldSystem());
}
@ -804,7 +804,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
public Triple<Session, Boolean, Long> workflowAddOrUpdate(FormExecuteWorkflowUpdateDto dto) {
Map<String, Object> formData = dto.getFormData();
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(dto.formId);
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.formId);
return insertOrUpdateFormDataByWorkflow(formData, template,dto.getIsOldSystem());
}
@ -812,7 +812,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
public Object workFlowInfo(FormExecuteWorkflowInfoDto dto) {
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(dto.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -2316,7 +2316,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
public boolean complexAdd(AddDeskComplexDto dto) {
Map<String, Object> formData = dto.getFormData();
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(dto.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.getFormId());
//新增直接复用自定义表单那边的
return insertFormData(formData,template);
}
@ -2326,7 +2326,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
public boolean complexUpdate(UpdateDeskComplexDto dto) {
Map<String, Object> formData = dto.getFormData();
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(dto.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -2434,7 +2434,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
public boolean complexDelete(DeleteDeskComplexDto dto) {
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(dto.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -2553,7 +2553,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@SneakyThrows
public Object complexInfo(DeskComplexInfoDto dto) {
//表单数据
FormTemplate template = formTemplateMapper.selectById(dto.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.getFormId());
String formJson = template.getFormJson();
//表单配置
@ -2643,24 +2643,24 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
}
}
@Override
public List<DeskFormReleaseVo> getReleaseInfo(Long formId) {
List<DeskFormReleaseVo> formReleaseVoList = formReleaseMapper.selectJoinList(DeskFormReleaseVo.class, new MPJLambdaWrapper<FormRelease>()
.disableSubLogicDel()
.eq(ObjectUtil.isNotEmpty(formId),FormRelease::getFormId,formId)
.select(FormRelease::getId)
.select(FormRelease.class, x -> VoToColumnUtil.fieldsToColumns(DeskFormReleaseVo.class).contains(x.getProperty()))
.leftJoin(Menu.class, Menu::getId, FormRelease::getMenuId, ext -> ext.selectAs(Menu::getTitle, DeskFormReleaseVo::getMenuName))
.orderByDesc(FormRelease::getCreateDate)
);
return formReleaseVoList;
}
// @Override
// public List<DeskFormReleaseVo> getReleaseInfo(Long formId) {
// List<DeskFormReleaseVo> formReleaseVoList = formReleaseMapper.selectJoinList(DeskFormReleaseVo.class, new MPJLambdaWrapper<FormRelease>()
// .disableSubLogicDel()
// .eq(ObjectUtil.isNotEmpty(formId),FormRelease::getFormId,formId)
// .select(FormRelease::getId)
// .select(FormRelease.class, x -> VoToColumnUtil.fieldsToColumns(DeskFormReleaseVo.class).contains(x.getProperty()))
// .leftJoin(Menu.class, Menu::getId, FormRelease::getMenuId, ext -> ext.selectAs(Menu::getTitle, DeskFormReleaseVo::getMenuName))
// .orderByDesc(FormRelease::getCreateDate)
// );
// return formReleaseVoList;
// }
@Override
public List<QueryConfig> complexQuery(ComplexQueryDto dto) {
List<QueryConfig> queryConfigs = new ArrayList<>();
if (ObjectUtil.isNotEmpty(dto.getReleaseId())){ // 自定义表单发布的配置信息
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
if(formRelease == null){
throw new MyException("表单发布数据不存在");
}
@ -2670,7 +2670,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
ListConfig listConfig = formReleaseConfig.getListConfig();
queryConfigs = listConfig.getQueryConfigs();
}else { // 系统表单所对应的配置信息
FormTemplate formTemplate = formTemplateMapper.selectById(dto.getFormId());
FormTemplate formTemplate = formTemplateClient.getFormTemplateByIdFeign(dto.getFormId());
if(formTemplate == null){
throw new MyException("表单不存在");
}
@ -2684,7 +2684,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
public PageOutput<Entity> pageTrans(FormExecutePageDto dto) {
FormRelease formRelease = formReleaseMapper.selectById(dto.getReleaseId());
FormRelease formRelease = formReleaseClient.selectByIdFeign(dto.getReleaseId());
String configJson = formRelease.getConfigJson();
@ -2693,7 +2693,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
FormReleaseConfig formReleaseConfig = JSONUtil.toBean(configJson, FormReleaseConfig.class);
//自定义表单数据
FormTemplate template = formTemplateMapper.selectById(formRelease.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formRelease.getFormId());
String formJson = template.getFormJson();
//自定义表单配置
@ -2748,7 +2748,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
return this.pageTrans(formExecutePageDto);
}else {
//系统表单数据
FormTemplate template = formTemplateMapper.selectById(dto.getFormId());
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(dto.getFormId());
String configJson = template.getConfigJson();
if(StrUtil.isBlank(configJson)){
throw new MyException("configJson字段为空");
@ -2804,7 +2804,7 @@ public class FormExecuteServiceImpl implements IFormExecuteService {
@Override
public DeskTableInfoVo getTableInfo(Long formId) {
FormTemplate template = formTemplateMapper.selectById(formId);
FormTemplate template = formTemplateClient.getFormTemplateByIdFeign(formId);
String formJson = template.getFormJson();
//自定义表单配置
FormDesignConfig formDesignConfig = JSONUtil.toBean(formJson, FormDesignConfig.class);

66
xjrsoft-service/xjrsoft-service-workflow/src/main/java/com/xjrsoft/workflow/service/impl/WorkflowExecuteServiceImpl.java
View File

@ -43,18 +43,12 @@ import com.xjrsoft.organization.client.IUserRoleRelationClient;
import com.xjrsoft.organization.entity.User;
import com.xjrsoft.organization.entity.UserRoleRelation;
import com.xjrsoft.system.client.IFileClient;
import com.xjrsoft.system.client.IMenuClient;
import com.xjrsoft.system.client.IStampClient;
import com.xjrsoft.system.client.ISystemConfigClient;
import com.xjrsoft.system.client.*;
import com.xjrsoft.system.dto.UpdateFileFeighDto;
import com.xjrsoft.system.entity.Menu;
import com.xjrsoft.system.entity.Message;
import com.xjrsoft.system.entity.Stamp;
import com.xjrsoft.system.entity.XjrSystemConfig;
import com.xjrsoft.system.mapper.CodeSchemaMapper;
import com.xjrsoft.system.mapper.DictionarydetailMapper;
import com.xjrsoft.system.mapper.MessageMapper;
import com.xjrsoft.tenant.config.TenantConfig;
import com.xjrsoft.tenant.util.SecureUtil;
import com.xjrsoft.workflow.constant.WorkflowConstant;
@ -157,7 +151,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
private final IdentityService identityService;
private final MessageMapper messageMapper;
private final IMessageClient messageClient;
private final IMenuClient menuClient;
@ -168,10 +162,6 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
*/
private static final String DB_FIELD_XML_PREFIX = "xml";
private final CodeSchemaMapper codeSchemaMapper;
private final DictionarydetailMapper dictionarydetailMapper;
private final IUserClient userClient;
@Override
@ -4679,27 +4669,27 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
.superProcessInstanceId(dto.getProcessId()).list();
//当前流程是否有父级流程,就是外部流程或者子流程。外部流程或者子流程不能撤回到开始节点，不新增开始节点
// if (subProcess.size() < 1) {
// //获取到当前流程发起人 如果操作人 是发起人 默认新增开始节点
// Object startUserId = runtimeService.getVariable(dto.getProcessId(), WorkflowConstant.PROCESS_START_USER_ID_KEY);
// if (StpUtil.getLoginIdAsLong() == Convert.toLong(startUserId)) {
//
// List<HistoricActivityInstance> startList = historyService.createHistoricActivityInstanceQuery()
// .processInstanceId(dto.getProcessId())
// .activityType(WorkflowConstant.BPMN_START_EVENT_TYPE_NAME)
// .finished()
// .orderByHistoricActivityInstanceEndTime()
// .desc()
// .list();
//
// HistoricActivityInstance historicActivityInstance = startList.get(0);
//
// RejectNodeVo vo = new RejectNodeVo();
// vo.setActivityId(historicActivityInstance.getActivityId());
// vo.setActivityName(historicActivityInstance.getActivityName());
// voList.add(vo);
// }
// }
/*if (subProcess.size() < 1) {
//获取到当前流程发起人 如果操作人 是发起人 默认新增开始节点
Object startUserId = runtimeService.getVariable(dto.getProcessId(), WorkflowConstant.PROCESS_START_USER_ID_KEY);
if (StpUtil.getLoginIdAsLong() == Convert.toLong(startUserId)) {
List<HistoricActivityInstance> startList = historyService.createHistoricActivityInstanceQuery()
.processInstanceId(dto.getProcessId())
.activityType(WorkflowConstant.BPMN_START_EVENT_TYPE_NAME)
.finished()
.orderByHistoricActivityInstanceEndTime()
.desc()
.list();
HistoricActivityInstance historicActivityInstance = startList.get(0);
RejectNodeVo vo = new RejectNodeVo();
vo.setActivityId(historicActivityInstance.getActivityId());
vo.setActivityName(historicActivityInstance.getActivityName());
voList.add(vo);
}
}*/
if (list == null || list.size() == 0) {
return voList;
@ -5220,7 +5210,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
//记录一下需要发送消息(不需要指定审批人的)的任务id
if (variableInstanceOptional.isPresent()) {
//多实例的时候，只有第一次才通知。
List<Message> messageList = messageMapper.selectList(Wrappers.lambdaQuery(Message.class).eq(Message::getObjectId, task.getId()).eq(Message::getProcessId, task.getProcessInstanceId()));
Message message = new Message();
message.setObjectId(task.getId());
message.setProcessId(task.getProcessInstanceId());
List<Message> messageList = messageClient.selectListFeign(message);
if (messageList.size() == 0){
List<String> approveIds = ListUtil.toList(Convert.toStr(variableInstanceOptional.get().getValue()).split(StringPool.COMMA));
@ -5334,7 +5327,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
//如果审批人变量不为空 并且不需要指定审批人 就发送消息
if (variableInstance != null) {
//多实例的时候，只有第一次才通知。
List<Message> messageList = messageMapper.selectList(Wrappers.lambdaQuery(Message.class).eq(Message::getObjectId, task.getId()).eq(Message::getProcessId, task.getProcessInstanceId()));
Message message = new Message();
message.setObjectId(task.getId());
message.setProcessId(task.getProcessInstanceId());
List<Message> messageList = messageClient.selectListFeign(message);
if (messageList.size() == 0){
List<String> approveIds = ListUtil.toList(Convert.toStr(variableInstance.getValue()).split(StringPool.COMMA));