fix 80356 process_node表新增transferFlag是否可以转办,查询时联查可以转办的数据
This commit is contained in:
@@ -145,4 +145,10 @@ public class ProcessNode {
|
||||
@TableField(value = "is_skip")
|
||||
@ApiModelProperty(value = "是否可跳过节点(0否,1是)")
|
||||
private String isSkip;
|
||||
/**
|
||||
* 是否可以转办(0否,1是)
|
||||
*/
|
||||
@TableField(value = "transfer_flag")
|
||||
@ApiModelProperty(value = "是否可以转办(0否,1是)")
|
||||
private String transferFlag;
|
||||
}
|
||||
+2
@@ -95,6 +95,8 @@
|
||||
(IF(prc_status IN (2, 3) OR finish_flag = 2, FALSE, TRUE)) state
|
||||
FROM process_all pa
|
||||
LEFT JOIN process_approval_record par ON pa.process_instance_id = par.process_instance_id
|
||||
LEFT JOIN process_node pn ON pa.process_definition_id = pn.process_definition_id
|
||||
AND SUBSTR(par.node_id,1,LENGTH(par.node_id)-1) = SUBSTR(pn.xml_node_id,1,LENGTH(pn.xml_node_id)-1)
|
||||
LEFT JOIN sys_user u ON user_id = u.id
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
+2
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.jero.common.constant.enums.YesOrNoEnum;
|
||||
import com.jero.common.system.vo.LoginUser;
|
||||
import com.jero.modules.activiti.enums.FinishFlagEnum;
|
||||
import com.jero.modules.activiti.enums.ProcessStatusEnum;
|
||||
@@ -92,6 +93,7 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService {
|
||||
queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getTaskName()), "task_name", lawsProcessDb.getTaskName());
|
||||
queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getPrcName()), "pa.prc_name", lawsProcessDb.getPrcName());
|
||||
queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue());
|
||||
queryWrapper.eq("pn.transfer_flag", YesOrNoEnum.YES.getValue());
|
||||
queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue());
|
||||
queryWrapper.orderByDesc("par.create_time");
|
||||
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
|
||||
Reference in New Issue
Block a user