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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java

@@ -1631,7 +1631,7 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
 								preEmployeeProject.setContractType(contract.getContractType());
 								preEmployeeProject.setWorkingHours(contract.getWorkingHours());
 								preEmployeeProject.setPost(contract.getPost());
-								preEmployeeProject.setEnjoinDate(LocalDateTimeUtils.convertLDTToDate(contract.getEnjoinDate()));
+								preEmployeeProject.setEnjoinDate(DateUtil.stringToDate(contract.getCreateTimeStart(),DateUtil.ISO_EXPANDED_DATE_FORMAT));
 								preEmployeeProject.setTryPeriod(contract.getTryPeriod());
 								preEmployeeProjectMapper.updateById(preEmployeeProject);
 							}

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

@@ -156,30 +156,38 @@
 	<!--生成数据封装-->
 	<select id="getAllMonitorEmpList" resultMap="tCompleteMonitorMap">
 		select
-			a.UNIT_NAME,
-			a.UNIT_NO,
-			a.DEPT_NAME,
-			a.DEPT_NO,
-		    a.DEPT_ID,
-			a.BUSINESS_PRIMARY_TYPE,
-			a.BUSINESS_SECOND_TYPE,
-			a.BUSINESS_THIRD_TYPE,
-			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)))*100/count(a.EMP_IDCARD),2),'%') as COMPLETE_PER,
-			sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-05-01',1,0)) as AFTER_EMPLOYMENT,
-		    if(sum(if((DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and a.IS_COMPLETE = '0') or '2024-05-01' > DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d'),0,1)) > 0,1,0) AFTER_IS_COMPLETE,
-			sum(if(DATE_FORMAT(a.CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and a.IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM,
-			b.CREATE_NAME as ALERT_USER
+		b.CUSTOMER_NAME UNIT_NAME,
+		b.CUSTOMER_NO UNIT_NO,
+		b.DEPART_NAME DEPT_NAME,
+		b.DEPART_NO DEPT_NO,
+		b.id DEPT_ID,
+		b.BUSINESS_PRIMARY_TYPE,
+		b.BUSINESS_SECOND_TYPE,
+		b.BUSINESS_THIRD_TYPE,
+		ifnull(a.INUSE_PERSON_NUM,0) INUSE_PERSON_NUM,
+		ifnull(a.IS_COMPLETE,'0') IS_COMPLETE,
+		ifnull(a.INCOMPLETE_NUM,0) INCOMPLETE_NUM,
+		ifnull(a.COMPLETE_PER,'0.00%') COMPLETE_PER,
+		ifnull(a.AFTER_EMPLOYMENT,0) AFTER_EMPLOYMENT,
+		ifnull(a.AFTER_IS_COMPLETE,'0') AFTER_IS_COMPLETE,
+		ifnull(a.AFTER_INCOMPLETE_NUM,0) AFTER_INCOMPLETE_NUM,
+		b.CREATE_USER_NAME as ALERT_USER
 		from
-			t_employee_project a
-		    left join t_settle_domain b on a.DEPT_NO = b.DEPART_NO
-		where a.DELETE_FLAG = '0' and a.PROJECT_STATUS = 0
+		t_settle_domain b
+		left join (select DEPT_NO,
+		sum(if(PROJECT_STATUS = 0,1,0)) as INUSE_PERSON_NUM,
+		if(sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)) > 0,1,0) as IS_COMPLETE,
+		sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)) as INCOMPLETE_NUM,
+		concat(ROUND((sum(if(PROJECT_STATUS = 0,1,0)) - sum(if((PROJECT_STATUS = 0 and IS_COMPLETE = '0') or PROJECT_STATUS = 1,0,1)))*100/sum(if(PROJECT_STATUS = 0,1,0)),2),'%') as COMPLETE_PER,
+		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-05-01',1,0)) as AFTER_EMPLOYMENT,
+		if(sum(if((PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and IS_COMPLETE = '0') or '2024-05-01' > DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') or PROJECT_STATUS = 1,0,1)) > 0,1,0) AFTER_IS_COMPLETE,
+		sum(if(PROJECT_STATUS = 0 and DATE_FORMAT(CREATE_TIME,'%Y-%m-%d') >= '2024-05-01' and IS_COMPLETE = '1',1,0)) as AFTER_INCOMPLETE_NUM
+		from t_employee_project where DELETE_FLAG = '0' and PROJECT_STATUS = 0 group by DEPT_NO) a on a.DEPT_NO = b.DEPART_NO
+		where b.DELETE_FLAG = '0'
 		<if test="deptNo != null and deptNo.trim() != ''">
-			and a.DEPT_NO = #{deptNo}
+			and b.DEPART_NO = #{deptNo}
 		</if>
-		group by a.DEPT_NO
+		group by b.DEPART_NO
 	</select>