|
|
@@ -364,7 +364,7 @@
|
|
|
|
|
|
<select id ="findTechProjectManageListByPage" parameterType="java.lang.String"
|
|
|
resultType="com.goafanti.techproject.bo.TechProjectManageListBo">
|
|
|
- select x.* from (select p.id, p.uid, i.licence_province as province,
|
|
|
+ select x.* from (select p.id, p.uid, i.licence_province as province, p.contract_id as contractId,
|
|
|
i.unit_name as unitName,
|
|
|
CONCAT(i.first_contacts,' ', i.first_mobile) as firstContacts,
|
|
|
CONCAT(i.second_contacts,' ', i.second_mobile) as secondContacts,
|
|
|
@@ -379,7 +379,7 @@
|
|
|
LEFT JOIN admin ad on p.founder = ad.id
|
|
|
LEFT JOIN tech_website w on p.department = w.id
|
|
|
<if test="principal != null">
|
|
|
- left join tech_project_log l on p.id=l.pid
|
|
|
+ left join contract_log l on p.contract_id=l.cid
|
|
|
</if>
|
|
|
where p.deleted_sign = 0
|
|
|
<if test="principal != null">
|
|
|
@@ -389,7 +389,10 @@
|
|
|
group by p.id
|
|
|
</if>
|
|
|
) x where x.wd = 0 or x.wd is null
|
|
|
- <if test="province != null">
|
|
|
+ <if test="contractId != null">
|
|
|
+ and x.contractId = #{contractId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="province != null">
|
|
|
and x.province = #{province,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
<if test="uid != null">
|
|
|
@@ -406,7 +409,7 @@
|
|
|
|
|
|
<select id="findTechProjectManageCount" resultType="java.lang.Integer" parameterType="String">
|
|
|
select count(1) from ( select x.* from (select p.id, p.uid, i.licence_province as province,
|
|
|
- i.unit_name as unitName,
|
|
|
+ i.unit_name as unitName, p.contract_id as contractId,
|
|
|
CONCAT(i.first_contacts,' ', i.first_mobile) as firstContacts,
|
|
|
CONCAT(i.second_contacts,' ', i.second_mobile) as secondContacts,
|
|
|
CONCAT(i.third_contacts,' ', i.third_mobile) as thirdContacts,
|
|
|
@@ -419,7 +422,7 @@
|
|
|
LEFT JOIN admin a on p.consultant = a.id
|
|
|
LEFT JOIN tech_website w on p.department = w.id
|
|
|
<if test="principal != null">
|
|
|
- left join tech_project_log l on p.id=l.pid
|
|
|
+ left join contract_log l on p.contract_id=l.cid
|
|
|
</if>
|
|
|
where p.deleted_sign = 0
|
|
|
<if test="principal != null">
|
|
|
@@ -429,6 +432,9 @@
|
|
|
group by p.id
|
|
|
</if>
|
|
|
) x where x.wd = 0 or x.wd is null
|
|
|
+ <if test="contractId != null">
|
|
|
+ and x.contractId = #{contractId,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
<if test="province != null">
|
|
|
and x.province = #{province,jdbcType=VARCHAR}
|
|
|
</if>
|