|
|
@@ -68,24 +68,22 @@
|
|
|
<select id="getListByUserID" resultType="com.hz.employmentsite.vo.taskAndLog.DoTaskVo">
|
|
|
select task.dotaskID,task.workTypeID,task.content,task.dotaskName,u.`Name` as
|
|
|
createName,task.finishTime,task.createTime,
|
|
|
- (select UserTaskStatus from pc_dotask_user du where DotaskID = task.DotaskID and siteUserID = #{siteUserID}) AS
|
|
|
- taskStatus,
|
|
|
+ doTaskUser.UserTaskStatus AS taskStatus,
|
|
|
dic_taskStatus.Name as taskStatusName, doTaskUser.CompleteTime,doTaskUser.completeDesc, city.`name` as
|
|
|
regionName,area.`name` as streetName,item.`Name` as workTypeName,task.regionCode,task.streetCode
|
|
|
, task.taskLevel,dic_taskLevel.name as taskLevelName
|
|
|
from pc_dotask task
|
|
|
left join pc_dotask_user doTaskUser on task.dotaskID = doTaskUser.dotaskID
|
|
|
left join sys_dictionary_item item on item.`Value` = task.WorkTypeID
|
|
|
- left join (select * from sys_dictionary_item where DictionaryCode ='TaskStatusType') dic_taskStatus on
|
|
|
- dic_taskStatus.`Value` =
|
|
|
- (select UserTaskStatus from pc_dotask_user du where DotaskID = task.DotaskID and siteUserID = #{siteUserID})
|
|
|
+ left join sys_dictionary_item dic_taskStatus ON dic_taskStatus.DictionaryCode = 'TaskStatusType' and
|
|
|
+ dic_taskStatus.`Value` = doTaskUser.UserTaskStatus
|
|
|
left join sys_user u on u.UserID = task.CreateUserID
|
|
|
left join area_code city on city.`code` = task.RegionCode
|
|
|
left join area_code area on area.`code` = task.StreetCode
|
|
|
left join sys_dictionary_item dic_taskLevel on task.taskLevel = dic_taskLevel.value and
|
|
|
dic_taskLevel.DictionaryCode = 'TaskLevel'
|
|
|
where item.DictionaryCode='TaskType'
|
|
|
- and doTaskUser.siteUserID = #{siteUserID}
|
|
|
+ and doTaskUser.siteUserID = #{siteUserID}
|
|
|
<if test="doTaskID != '' and doTaskID != null">
|
|
|
and task.dotaskID = #{doTaskID}
|
|
|
</if>
|
