ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 流程详情列表增加筛选条件

Browse Source
This commit is contained in:
mzaxd
2024-08-15 10:10:00 +08:00
parent d5984abc69
commit 11e1f13850
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java
+7
View File
@@ -213,4 +213,11 @@ public class ProcessApprovalRecord {
@TableField(exist = false)
@ApiModelProperty(value = "快照Id")
private String snapshotId;
/**
* 任务受理人组织机构
*/
@TableField(exist = false)
@ApiModelProperty(value = "任务受理人组织机构")
private String taskAcceptorDept;
}
laws-modules/src/main/java/com/jero/modules/activiti/mapper/ProcessApprovalRecordMapper.java
+5
View File
@@ -1,7 +1,11 @@
package com.jero.modules.activiti.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.modules.activiti.entity.ProcessApprovalRecord;
import org.apache.ibatis.annotations.Param;
/**
*
@@ -9,4 +13,5 @@ import com.jero.modules.activiti.entity.ProcessApprovalRecord;
*@date 2023-10-16 15:49
*/
public interface ProcessApprovalRecordMapper extends BaseMapper<ProcessApprovalRecord> {
Page<ProcessApprovalRecord> pageList(Page<ProcessApprovalRecord> page, @Param(Constants.WRAPPER) QueryWrapper<ProcessApprovalRecord> wrapper);
}
laws-modules/src/main/java/com/jero/modules/activiti/mapper/xml/ProcessApprovalRecordMapper.xml
+8
View File
@@ -25,4 +25,12 @@
id, task_id, task_name, process_instance_id, msg_type, user_id, mesg, finish_flag,
project_id, commit_flag, commit_text, prc_name, create_time, update_time, end_time
</sql>
<select id="pageList" resultType="com.jero.modules.activiti.entity.ProcessApprovalRecord">
select par.*
from process_approval_record as par
left join sys_user as u on u.id = par.user_id
left join sys_user_depart as ud on ud.user_id = u.id
${ew.customSqlSegment}
</select>
</mapper>
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
+12 -6
View File
@@ -53,6 +53,9 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
@Resource
private ProcessSnapshotService processSnapshotService;
@Resource
private ProcessApprovalRecordMapper baseMapper;
public ProcessApprovalRecord getToDoByTaskId(String taskId){
LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessApprovalRecord::getTaskId,taskId);
@@ -71,13 +74,16 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
String curUserId = UserUtils.getUserId();
QueryWrapper<ProcessApprovalRecord> wrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(processApprovalRecord.getFinishFlagSearch())){
wrapper.in("finish_flag", Arrays.asList(processApprovalRecord.getFinishFlagSearch().split(",")));
wrapper.in("par.finish_flag", Arrays.asList(processApprovalRecord.getFinishFlagSearch().split(",")));
}
wrapper.eq(processApprovalRecord.getFinishFlag() != null, "finish_flag", processApprovalRecord.getFinishFlag());
wrapper.eq("over_due", YesOrNoEnum.NO.getValue());
wrapper.eq("process_instance_id", processApprovalRecord.getProcessInstanceId());
wrapper.last("ORDER BY IF(ISNULL(create_time), 1, 0) DESC ,create_time DESC, end_time DESC");
Page<ProcessApprovalRecord> pageList = this.page(page, wrapper);
wrapper.eq(processApprovalRecord.getFinishFlag() != null, "par.finish_flag", processApprovalRecord.getFinishFlag());
wrapper.eq("par.over_due", YesOrNoEnum.NO.getValue());
wrapper.eq("par.process_instance_id", processApprovalRecord.getProcessInstanceId());
wrapper.like(StrUtil.isNotBlank(processApprovalRecord.getTaskName()), "par.task_name", processApprovalRecord.getTaskName());
wrapper.like(StrUtil.isNotBlank(processApprovalRecord.getTaskAcceptor()), "CONCAT(u.realname, '(', u.username, ')')", processApprovalRecord.getTaskAcceptor());
wrapper.eq(StrUtil.isNotBlank(processApprovalRecord.getTaskAcceptorDept()), "ud.dep_id", processApprovalRecord.getTaskAcceptorDept());
wrapper.last("ORDER BY IF(ISNULL(par.create_time), 1, 0) DESC , par.create_time DESC, par.end_time DESC");
Page<ProcessApprovalRecord> pageList = baseMapper.pageList(page, wrapper);
List<ProcessApprovalRecord> records = pageList.getRecords();
if (CollUtil.isEmpty(records)) {
return pageList;