Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
05759d46fb
|
|
@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark,
|
lai.dept_audit_remark, lai.direct_audit_by, lai.direct_audit_time, lai.direct_audit_remark,
|
||||||
lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id,
|
lai.create_by, lai.create_time, lai.update_by, lai.update_time, lai.remark, lai.company_id,
|
||||||
lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party,
|
lai.direct_id, lai.lease_type, lai.estimate_lease_time, lai.cost_bearing_party,
|
||||||
bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus,
|
bai.unit_id,bai.project_id,bu.unit_name, bp.pro_name, bai.agreement_code, tt.task_status as taskStatus
|
||||||
IFNULL(sum(lad.pre_num),0) as preCountNum,
|
-- IFNULL(sum(lad.pre_num),0) as preCountNum,
|
||||||
IFNULL(sum(lad.al_num),0) as alNum
|
-- IFNULL(sum(lad.al_num),0) as alNum
|
||||||
from
|
from
|
||||||
lease_apply_info lai
|
lease_apply_info lai
|
||||||
left join tm_task tt on lai.task_id = tt.task_id
|
left join tm_task tt on lai.task_id = tt.task_id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue