提交 150d1039 编写于 作者: sq3536's avatar sq3536

Merge remote-tracking branch 'origin/dev' into dev

......@@ -45,7 +45,7 @@ import ${pub.getPKGCodeName()}.core.${item.getPSSystemModule().getCodeName()?low
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.alibaba.fastjson.JSONObject;
import org.springframework.util.StringUtils;
/**
* 实体[${item.getLogicName()}] 服务对象接口实现
......@@ -70,6 +70,12 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
</#if>
private int batchSize = 500;
<#comment>引入工作流FeignClient</#comment>
<#if de.hasPSDEWF()==true>
@Autowired
${pub.getPKGCodeName()}.util.client.IBZWFFeignClient ibzwfFeignClient;
</#if>
<#comment>输出实体行为</#comment>
<#if item.getAllPSDEActions()??>
<#list item.getAllPSDEActions() as deaction>
......@@ -394,6 +400,19 @@ public class ${item.getCodeName()}ServiceImpl extends ServiceImpl<${de.getCodeNa
public Page<<#if dedataset.isEnableGroup()>HashMap<#else>${item.getCodeName()}</#if>> search${dedataset.getCodeName()}(${item.getCodeName()}SearchContext context) {
<#if item.isEnableSQLStorage() && item.getAllPSDEDBTables()??>
<#--<#list item.getAllPSDEDBTables() as detable>-->
<#assign entityName=srfpluralize(item.getCodeName()?lower_case)>
<#if de.hasPSDEWF()==true>
//查询工作流待办数据
if(!StringUtils.isEmpty(context.getUserTaskId()) && !StringUtils.isEmpty(context.getProcessDefinitionKey())){
List<String> businessKeys= ibzwfFeignClient.getbusinesskeysByUserId("${sys.getCodeName()?lower_case}", ${pub.getPKGCodeName()}.util.security.AuthenticationUser.getAuthenticationUser().getUserid(),"${entityName}",context.getProcessDefinitionKey(),context.getUserTaskId());
if(businessKeys.size()>0){
context.getSelectCond().in("${keyfield.name?lower_case}",businessKeys);
}
else{
context.getSelectCond().apply("1<>1");
}
}
</#if>
com.baomidou.mybatisplus.extension.plugins.pagination.Page<<#if dedataset.isEnableGroup()>HashMap<#else>${item.getCodeName()}</#if>> pages=baseMapper.search${dedataset.getCodeName()}(context.getPages(),context,context.getSelectCond());
return new PageImpl<<#if dedataset.isEnableGroup()>HashMap<#else>${item.getCodeName()}</#if>>(pages.getRecords(), context.getPageable(), pages.getTotal());
<#--</#list>-->
......
......@@ -58,6 +58,14 @@ public class SearchContextBase implements ISearchContext{
* 排序对象
*/
public Sort pageSort;
/**
* 工作流步骤标识
*/
public String userTaskId;
/**
* 工作流流程标识
*/
public String processDefinitionKey;
/**
* 获取分页参数
* @return
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册