完善市场法规清单流程

This commit is contained in:
梁琦涛
2024-07-14 10:23:44 +08:00
parent 91ba05130a
commit 210fd29b85
3 changed files with 7 additions and 16 deletions
@@ -31,12 +31,6 @@ public class ProcessMarketStandardRelease implements Serializable {
@ApiModelProperty(value = "主键") @ApiModelProperty(value = "主键")
private String id; private String id;
/**
* 标准ID
*/
@ApiModelProperty(value = "标准ID")
private String standardId;
/** /**
* 流程实例id * 流程实例id
*/ */
@@ -85,6 +79,11 @@ public class ProcessMarketStandardRelease implements Serializable {
@Dict(dicCode = "market_state") @Dict(dicCode = "market_state")
private String country; private String country;
/**抄送人员*/
@ApiModelProperty(value = "抄送人员")
@Dict(dictTable = "sys_user", dicText = "realname", dicCode = "id")
private String copyUser;
/** /**
* 标准详情列表 * 标准详情列表
*/ */
@@ -124,9 +124,9 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
// 人员信息 // 人员信息
userInfoMap.forEach((key, value) -> { userInfoMap.forEach((key, value) -> {
if(Objects.equals("moreUserList",key + "List")){ if(Objects.equals("moreUserList",key)){
map.put(key, value); map.put(key, value);
map.put(key + "List", Arrays.asList(value.toString().split(","))); map.put(key, Arrays.asList(value.toString().split(",")));
return; return;
} }
map.put(key, value); map.put(key, value);
@@ -1,17 +1,9 @@
package com.jero.modules.activiti.process.ni.listener; package com.jero.modules.activiti.process.ni.listener;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.jero.common.util.SpringContextUtils;
import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService; import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
import com.jero.modules.activiti.process.standardinterpret.service.StandardInterpretFlowService;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.DelegateTask;
import org.activiti.engine.delegate.ExecutionListener; import org.activiti.engine.delegate.ExecutionListener;
import org.activiti.engine.delegate.TaskListener;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;