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

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TCompleteMonitorMapper.xml

@@ -167,14 +167,15 @@
 			count(a.EMP_IDCARD) as INUSE_PERSON_NUM,
 			if(sum(if(a.IS_COMPLETE = '0',0,1)) > 0,1,0) as IS_COMPLETE,
 			sum(if(a.IS_COMPLETE = '0',0,1)) as INCOMPLETE_NUM,
-			concat(ROUND((count(a.EMP_IDCARD) - sum(if(a.IS_COMPLETE = '0',0,1)))/count(a.EMP_IDCARD)),'%') as COMPLETE_PER,
+			concat(ROUND((count(a.EMP_IDCARD) - sum(if(a.IS_COMPLETE = '0',0,1)))*100/count(a.EMP_IDCARD),2),'%') as COMPLETE_PER,
 			sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01',1,0)) as AFTER_EMPLOYMENT,
-			if(sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '0',0,1)) > 0,1,0) AFTER_IS_COMPLETE,
+			if(sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '0',1,0)) = 0,1,0) AFTER_IS_COMPLETE,
 			sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-06-01' and a.IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM,
-			a.CREATE_NAME as ALERT_USER
+			b.CREATE_NAME as ALERT_USER
 		from
 			t_employee_project a
-		where DELETE_FLAG = '0' and PROJECT_STATUS = 0
+		    left join t_settle_domain b on a.DEPT_NO = b.DEPART_NO
+		where a.DELETE_FLAG = '0' and a.PROJECT_STATUS = 0
 		<if test="deptNo != null and deptNo.trim() != ''">
 			and a.DEPT_NO = #{deptNo}
 		</if>