wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-07-08 11:27:37 +08:00
parent fe69f08765 76584319d4
commit fb1ff312ec
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/modules/activiti/controller/HistoryController.java
View File

@ -122,10 +122,14 @@ public class HistoryController {
@ApiImplicitParam(name = "startBeginTime", value = "流程启动开始时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "startEndTime", value = "流程启动结束时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "finishedBeginTime", value = "流程完成开始时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date")
@ApiImplicitParam(name = "finishedEndTime", value = "流程完成结束时间", paramType = "query", dataType = "Date"),
@ApiImplicitParam(name = "processDefinitionKey", value = "流程定义KEY", paramType = "query", dataType = "String")
})
// @RequiresPermissions("sys:his:all")
public Result<ProcessActivityDTO> getMyHandledInstancePage(@ApiIgnore @RequestParam Map<String, Object> params) {
if (params.containsKey("processDefinitionKey") && StringUtils.isNotEmpty(params.get("processDefinitionKey").toString())) {
params.replace("processDefinitionKey", params.get("processDefinitionKey").toString() + "%");
}
PageData<ProcessActivityDTO> page = activitiService.getMyProcessInstancePage(params);
setExtraProcessProperties(Optional.ofNullable(page.getList()).orElse(new ArrayList<>()));
return new Result().ok(page);

5
renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java
View File

@ -15,9 +15,6 @@ import io.renren.modules.activiti.service.ActivitiService;
import io.renren.modules.security.user.SecurityUser;
import io.renren.modules.sys.dto.SysUserDTO;
import io.renren.modules.sys.service.SysUserService;
import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.history.HistoricTaskInstanceQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -61,7 +58,7 @@ public class ActivitiServiceImpl extends BaseServiceImpl<ProcessActivityDao, Pro
params.put("userId", user.getId());
list.addAll(baseDao.getMyProcessInstancePage(params));
}
List<ProcessActivityDTO> result=ConvertUtils.sourceToTarget(list, ProcessActivityDTO.class);
List<ProcessActivityDTO> result = ConvertUtils.sourceToTarget(list, ProcessActivityDTO.class);
Page<ProcessActivityDTO> page = new Page(curPage, limit);
int j = Math.min(curPage * limit, result.size());
if (result.isEmpty()) {

3
renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
View File

@ -53,6 +53,9 @@
<if test="finishedEndTime != null">
<![CDATA[and ahp.END_TIME_ <= #{finishedEndTime}]]>
</if>
<if test="processDefinitionKey != null">
aht.PROC_DEF_ID_ LIKE #{processDefinitionKey}
</if>
ORDER BY
ahp.START_TIME_ DESC
</select>