|
|
@@ -651,7 +651,7 @@ select a.id,a.name,d.id as departmentId,d.name as departmentName,role_name as ro
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="technicalDepStatistics" parameterType='String' resultType="com.goafanti.report.bo.technicalDepStatisticsListBo">
|
|
|
- select
|
|
|
+ select
|
|
|
d.nickname as OrgName,f.name as orderDep,c.sign_total_amount as signTotalAmount,
|
|
|
date_format( c.sign_time, '%Y-%m-%d' ) as signTime,c.contract_no as contractNo,
|
|
|
c.order_remarks as orderRemarks, g.contacts, g.contact_mobile as contactMobile,
|
|
|
@@ -664,16 +664,16 @@ select a.id,a.name,d.id as departmentId,d.name as departmentName,role_name as ro
|
|
|
when a.publish_status = 2 then '待公示' when a.publish_status = 3 then '抽查中' end) as publishStatus,
|
|
|
a.publish_time as publishTime, e.name as salesmanName
|
|
|
from
|
|
|
- contract_task a left join contract b on
|
|
|
+ t_order c left join contract b on
|
|
|
+ c.order_no=b.order_no left join contract_task a on
|
|
|
a.contract_id = b.id left join user d on
|
|
|
- b.uid = d.id left join t_order c on
|
|
|
- b.order_no = c.order_no left join admin e on
|
|
|
+ b.uid = d.id left join admin e on
|
|
|
c.salesman_id = e.id left join department f on
|
|
|
e.department_id = f.id left join organization_identity g on
|
|
|
d.id = g.uid left join admin h on
|
|
|
a.task_receiver = h.id left join department i on
|
|
|
h.department_id = i.id
|
|
|
- where 1=1
|
|
|
+ where c.delete_sign=0
|
|
|
<if test="depId != null">
|
|
|
and e.department_id= #{depId,jdbcType=VARCHAR}
|
|
|
</if>
|