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

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

@@ -1526,14 +1526,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	public EmployeeBusinessDetailVo getEmployeeBusinessInfoById(String empId, String settleDomain) {
 		EmployeeBusinessDetailVo businessDetailVo = new EmployeeBusinessDetailVo();
 		TEmployeeProject employeeInfo = baseMapper.selectById(empId);
-		TEmployeeInfo employee = null;
 		EmployeeBusinessVo businessVo = new EmployeeBusinessVo();
 		// 有档案数据封装数据 无数据直接返回
 		if (null == employeeInfo){
 			return businessDetailVo;
 		}else {
 			TBusinessEmployeeExtendInfo tBusinessEmployeeExtendInfo =  this.businessEmployeeExtendInfoService.getByEmpIdCard(employeeInfo.getEmpIdcard());
-			employee = tEmployeeInfoMapper.selectById(employeeInfo.getEmpId());
+			TEmployeeInfo employee = tEmployeeInfoMapper.selectById(employeeInfo.getEmpId());
 			initEmpBusinessInfo(employeeInfo, employee, businessVo, tBusinessEmployeeExtendInfo);
 		}
 
@@ -1570,12 +1569,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 				businessVo.setEducationName(empEducation.getEducationName());
 			}
 		}
-		// 处理人员离职信息 和社保公积金派减信息
-		if (employee != null) {
-			businessVo.setLeaveDate(employee.getLeaveTime());
-			businessVo.setLeaveReason(employee.getLeaveReason());
-			businessVo.setLeaveRemark(employee.getLeaveRemark());
-		}
 		// 获取社保和公积金派减信息
 		SocialAndFundReduceVo vo = new SocialAndFundReduceVo();
 		vo.setEmpId(empId);

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

@@ -886,13 +886,13 @@
 		a.DEPT_ID SETTLE_DOMAIN,
 		b.DEPART_NAME,
 		b.DEPART_ID,
-		b.BUSINESS_POST,
+		if(b.BUSINESS_POST is not null, b.BUSINESS_POST, a.POST) as BUSINESS_POST,
 		b.BUSINESS_TELECOM_NUMBER,
 		b.EMPLOYEE_TAGS,
 		if(b.BUSINESS_WORKING_STATUS is not null, b.BUSINESS_WORKING_STATUS, a.PROJECT_STATUS) as BUSINESS_WORKING_STATUS,
 		a.PROJECT_STATUS WORK_FLAG,
 		a.STATUS WORKING_STATUS_SUB,
-		if(b.BUSINESS_LEAVE_DATE is not null, b.BUSINESS_LEAVE_DATE, a.LEAVE_TIME) as BUSINESS_LEAVE_DATE,
+		b.BUSINESS_LEAVE_DATE,
 		b.DOCUMENT_TYPE,
 		c.DEPART_NAME as SETTLE_DOMAIN_NAME
 		FROM t_employee_project a

yifu-business/yifu-business-biz/src/main/resources/mapper/TVacationInfoMapper.xml

@@ -78,11 +78,11 @@
 		<if test="query.vacationStatus != null and query.vacationStatus.trim() != ''">
 			<!-- 待休 -->
 			<if test="query.vacationStatus == '0'.toString()">
-                and now() <![CDATA[<]]> a.VACATION_START_TIME
+				and now() <![CDATA[<]]> a.VACATION_START_TIME and a.VACATION_STATUS = '4'
 			</if>
 			<!-- 休假中 -->
 			<if test="query.vacationStatus == '1'.toString()">
-                and now() <![CDATA[>=]]> a.VACATION_START_TIME and now() <![CDATA[<=]]> a.VACATION_END_TIME
+				and now() <![CDATA[>=]]> a.VACATION_START_TIME and now() <![CDATA[<=]]> a.VACATION_END_TIME and a.VACATION_STATUS = '4'
 			</if>
 			<!-- 到期待销假 -->
 			<if test="query.vacationStatus == '2'.toString()">