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/TBusinessEmployeeExtendInfoServiceImpl.java

@@ -220,9 +220,13 @@ implements TBusinessEmployeeExtendInfoService {
 			List<TBusinessEmployeeExtendInfo> employeeExtendInfoList = TBusinessEmployeeExtendInfo.covertDtoListToList(list);
 			// 导入数据校验
 			errorMessageList.addAll(beforeErrorMessageList);
+			if (!beforeErrorMessageList.isEmpty()) {
+				return R.failed(errorMessageList);
+			}
 			// 数据导入
+			boolean isSave;
 			for (int i = 0; i < employeeExtendInfoList.size(); i++) {
-				boolean isSave = true;
+				isSave = true;
 				int line = i + 2;
 				TBusinessEmployeeExtendInfo v = employeeExtendInfoList.get(i);
 				TBusinessEmployeeExtendInfo entity = this.baseMapper.getDataByEmpIdcard(v.getEmpIdcard());

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

@@ -1542,18 +1542,13 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
 				.ne(TEmployeeContractInfo::getSituation, EmployeeConstants.SITUATION_SIX)
 				.ne(TEmployeeContractInfo::getSituation, EmployeeConstants.SITUATION_SEVEN)
-				.eq(TEmployeeContractInfo::getSettleDomain, settleDomain)
-				.orderByDesc(TEmployeeContractInfo::getContractStart));
-
-		// 获取合同数据（全部2023-1-16 11:32:12 倩倩要求：B端人员里要看到作废中止的合同（原话：显示没有问题））
-		List<TEmployeeContractInfo> allContractInfoList = contractInfoMapper.selectList(Wrappers.<TEmployeeContractInfo>query().lambda()
-				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
-				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
+				.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
+				.isNotNull(TEmployeeContractInfo::getAuditTimeLast)
 				.eq(TEmployeeContractInfo::getSettleDomain, settleDomain)
 				.orderByDesc(TEmployeeContractInfo::getContractStart));
 		// 处理详情对应的合同信息
-		if (Common.isNotNull(contractInfoList)){
-			initEmpBusinessContractInfo(businessDetailVo, contractInfoList, allContractInfoList);
+		if (Common.isNotNull(contractInfoList)) {
+			initEmpBusinessContractInfo(businessDetailVo, contractInfoList);
 		}
 		// 获取最高学历
 		List<TEmpEducation> educations = empEducationMapper.selectList(Wrappers.<TEmpEducation>query().lambda()
@@ -1598,14 +1593,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 	}
 
 	private void initEmpBusinessContractInfo(EmployeeBusinessDetailVo businessDetailVo
-			, List<TEmployeeContractInfo> contractInfoList, List<TEmployeeContractInfo> allContractInfoList) {
+			, List<TEmployeeContractInfo> contractInfoList) {
 		businessDetailVo.setSituationCount(contractInfoList.size());
 		if (businessDetailVo.getSituationCount() > CommonConstants.ONE_INT){
 			businessDetailVo.setSituation(EmpBusinessConstants.empContractSituationRenew);
 		}else {
 			businessDetailVo.setSituation(EmpBusinessConstants.empContractSituationNew);
 		}
-		businessDetailVo.setContractInfoList(allContractInfoList);
+		businessDetailVo.setContractInfoList(contractInfoList);
 		TEmployeeContractInfo contractInfo = contractInfoList.get(CommonConstants.ZERO_INT);
 		if (null != contractInfo.getContractEnd()){
 			businessDetailVo.setContractEndDate(DateUtil.formatDate(contractInfo.getContractEnd()));

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

@@ -898,7 +898,7 @@
 		FROM t_employee_project a
 		left join t_business_employee_extend_info b on a.EMP_IDCARD = b.EMP_IDCARD
 		left join t_settle_domain c on a.DEPT_ID = c.ID
-		where a.DELETE_FLAG = '0' and c.DELETE_FLAG = '0'
+		where a.DELETE_FLAG = '0' and c.DELETE_FLAG = '0' and a.PROJECT_STATUS = '0'
 		<include refid="BusinessQuery"/>
 		order by a.ENJOIN_DATE DESC
 	</select>
@@ -925,22 +925,14 @@
 		<if test="query.businessTelecomNumber != null and query.businessTelecomNumber.trim() != ''">
 			AND b.BUSINESS_TELECOM_NUMBER like CONCAT('%',#{query.businessTelecomNumber} ,'%')
 		</if>
-		<if test="query.businessWorkingStatus == null">
-			<!--AND if(b.BUSINESS_WORKING_STATUS is not null, b.BUSINESS_WORKING_STATUS is not null, a.WORK_FLAG = '0') 2022-01-19 fxj 调整-->
-			AND a.PROJECT_STATUS = '0'
-		</if>
 		<!-- businessWorkingStatus: 0 在职  1 离职  -->
 		<if test="query.businessWorkingStatus != null and query.businessWorkingStatus.trim() != ''">
 			<!-- 0查询在职 -->
 			<if test="query.businessWorkingStatus == '0'.toString()">
-				<!-- 在职状态为 0在职 3临时 不等于1为在职 -->
-				<!-- AND if(b.BUSINESS_WORKING_STATUS is not null, b.BUSINESS_WORKING_STATUS <![CDATA[<>]]> '1', a.WORK_FLAG = '0') 2022-01-19 fxj 调整-->
-				AND a.PROJECT_STATUS = '0'
+				AND (b.BUSINESS_WORKING_STATUS is null or b.BUSINESS_WORKING_STATUS = '0')
 			</if>
 			<!-- 1查询离职 -->
 			<if test="query.businessWorkingStatus == '1'.toString()">
-				<!-- 离职 1 -->
-				AND a.PROJECT_STATUS = '0'
 				AND b.BUSINESS_WORKING_STATUS = '1'
 			</if>
 		</if>
@@ -990,7 +982,7 @@
 		FROM t_employee_project a
 		left join t_business_employee_extend_info b on a.EMP_IDCARD = b.EMP_IDCARD
 		left join t_settle_domain c on a.DEPT_ID = c.ID
-		where a.DELETE_FLAG = '0' and c.DELETE_FLAG = '0'
+		where a.DELETE_FLAG = '0' and c.DELETE_FLAG = '0' and a.PROJECT_STATUS = '0'
 		    <include refid="BusinessQuery"/>
 		order by a.ENJOIN_DATE DESC
 	</select>

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/util/SalaryAccountUtil.java

@@ -393,6 +393,7 @@ public class SalaryAccountUtil implements Serializable {
 								tSalaryEmployeeService.updateById(emp);
 							}
 						}
+						newEmp.setIssueStatus(isIssue);
 						// 劳务费要使用人员信息
 						if (!notLabour) {
 							R<TSalaryEmployee> eR = this.getNewEmp(newEmp, i, errorList, notLabour, entity, salaryType, dept, user