hy/mdc_hyjs_gk_new.git

文件名从 lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/WorkTaskVoMapper.xml 修改
			@@ -1,7 +1,7 @@
			<?xml version="1.0" encoding="UTF-8"?>
			<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="org.jeecg.modules.dncFlow.mapper.IWorkTaskVoMapper">
			<select id="taskBySelf" resultType="org.jeecg.modules.dncFlow.entity.WorkTaskDataVo">
			<mapper namespace="org.jeecg.modules.flowable.mapper.IWorkTaskVoMapper">
			<select id="taskBySelf" resultType="org.jeecg.modules.flowable.domain.vo.WorkTaskDataVo">
			SELECT
			atask.id_ AS id,
			atask.rev_ AS rev,
			@@ -10,7 +10,6 @@
			atask.proc_def_id_ AS procDefId,
			atask.name_ AS name,
			atask.task_def_key_ as taskDefKey,
			su.realname as assignee,
			atask.priority_ AS priority,
			atask.create_time_ AS createTime,
			atask.suspension_state_ AS suspensionState,
			@@ -23,15 +22,11 @@
			pro.name_ as flowName,
			pro.CATEGORY_ as category
			FROM
			act_ru_task AS atask,
			flow_my_business AS fmb,
			ACT_RE_PROCDEF AS pro,
			sys_user AS su
			act_ru_task AS atask
			LEFT JOIN flow_my_business fmb on atask.id_ = fmb.task_id
			LEFT JOIN ACT_RE_PROCDEF pro on atask.PROC_DEF_ID_ = pro.id_
			WHERE
			atask.assignee_ = #{flowMy.username}
			AND atask.id_ = fmb.task_id
			AND atask.PROC_DEF_ID_ = pro.id_
			AND atask.assignee_ = su.username
			<if test="flowMy.flowName!= null and flowMy.flowName!= ''">
			AND pro.name_ LIKE CONCAT('%',#{flowMy.flowName},'%')
			</if>
			@@ -49,8 +44,5 @@
			</if>
			ORDER BY
			create_time_ DESC
			</select>
			<select id="allList" parameterType="String" resultType="org.jeecg.modules.dncFlow.entity.WorkTaskDataVo">
			select * from act_ru_task
			</select>
			</mapper>