|
|
@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="investHead" column="invest_head" />
|
|
|
<result property="projectStage" column="project_stage" />
|
|
|
<result property="projectState" column="project_state" />
|
|
|
+ <result property="projectStatus" column="project_status" />
|
|
|
|
|
|
<result property="taskName" column="taskName"/>
|
|
|
<result property="taskId" column="taskId"/>
|
|
|
@@ -84,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="projectInvestigate.investigatePlace != null and projectInvestigate.investigatePlace != ''"> and a.investigate_place like concat('%', #{projectInvestigate.investigatePlace}, '%')</if>
|
|
|
</sql>
|
|
|
<select id="selectAllInvestigateList" resultMap="ProjectInvestigateVoResult">
|
|
|
- select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,
|
|
|
+ select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,tp.project_status,
|
|
|
a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
|
|
|
a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
|
|
|
a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
|
|
|
@@ -117,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
order by a.create_time desc
|
|
|
</select>
|
|
|
<select id="getMyTaskList" resultMap="ProjectInvestigateVoResult">
|
|
|
- select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,
|
|
|
+ select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,tp.project_status,
|
|
|
a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
|
|
|
a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
|
|
|
a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
|
|
|
@@ -161,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
order by a.create_time desc
|
|
|
</select>
|
|
|
<select id="getMyDoneTaskList" resultMap="ProjectInvestigateVoResult">
|
|
|
- select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,
|
|
|
+ select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,tp.project_state,tp.invest_head,tp.project_status,
|
|
|
a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
|
|
|
a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
|
|
|
a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
|
|
|
@@ -193,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
order by a.create_time desc
|
|
|
</select>
|
|
|
<select id="getMyList" resultMap="ProjectInvestigateVoResult">
|
|
|
- select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage, tp.project_state,tp.invest_head,
|
|
|
+ select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage, tp.project_state,tp.invest_head,tp.project_status,
|
|
|
a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
|
|
|
a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
|
|
|
a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
|
|
|
@@ -238,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
select a.id,a.proc_inst_id, a.project_pool_id, a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
|
|
|
a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
|
|
|
a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
|
|
|
- tp.project_name,t.TASK_DEF_KEY_ as 'taskDefKey'
|
|
|
+ tp.project_name,tp.project_status, t.TASK_DEF_KEY_ as 'taskDefKey'
|
|
|
from t_project_investigate a
|
|
|
left join t_project_pool tp on tp.id=a.project_pool_id
|
|
|
left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
|