Commit 029d989e authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

parents 66a32b0f 63d9b624
...@@ -162,8 +162,8 @@ ...@@ -162,8 +162,8 @@
a.DEPT_NO, a.DEPT_NO,
a.DEPT_ID, a.DEPT_ID,
a.BUSINESS_PRIMARY_TYPE, a.BUSINESS_PRIMARY_TYPE,
,a.BUSINESS_SECOND_TYPE, a.BUSINESS_SECOND_TYPE,
,a.BUSINESS_THIRD_TYPE, a.BUSINESS_THIRD_TYPE,
count(a.EMP_IDCARD) as INUSE_PERSON_NUM, count(a.EMP_IDCARD) as INUSE_PERSON_NUM,
if(sum(if(a.PROJECT_STATUS = 0 and a.IS_COMPLETE = '0',0,1)) > 0,1,0) as IS_COMPLETE, if(sum(if(a.PROJECT_STATUS = 0 and a.IS_COMPLETE = '0',0,1)) > 0,1,0) as IS_COMPLETE,
sum(if(a.IS_COMPLETE = '0',0,1)) as INCOMPLETE_NUM, sum(if(a.IS_COMPLETE = '0',0,1)) as INCOMPLETE_NUM,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment