Merge branch 'feature-zhaji' into 'develop'

Feature zhaji

See merge request fangxinjiang/yifu!242

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -3110,7 +3110,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(!Common.isNotEmpty(insuranceRefundCheckList)){
 			return R.failed("当前导入的减员信息为空");
 		}
-		if(insuranceRefundCheckList.size() > CommonConstants.TWENTY_THOUSAND){
+		if(insuranceRefundCheckList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
 			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
 		}
 		Map<String, List<InsuranceRefundCheck>> refundMap = checkInsuranceRefundList(insuranceRefundCheckList,user);
@@ -3212,7 +3212,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		param.setDeptNoList(deptList);
 		insuredList = this.baseMapper.getInsuredList(param);
 		if (CollectionUtils.isNotEmpty(insuredList)){
-			if(insuredList.size() > CommonConstants.TWENTY_THOUSAND){
+			if(insuredList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
 				return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
 			}
 			//根据项目编码获取项目名称
@@ -3287,7 +3287,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		param.setDeptNoList(deptNoList);
 		List<InsuranceRefundListVo> insuranceRefundList = this.baseMapper.getInsuranceRefundList(param);
 		if (CollectionUtils.isNotEmpty(insuranceRefundList)){
-			if(insuranceRefundList.size() > CommonConstants.TWENTY_THOUSAND){
+			if(insuranceRefundList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
 				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
 			}
 			//根据项目编码获取项目名称
@@ -3369,7 +3369,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			refundExportList = baseMapper.getRefundExportList(param);
 		}
 		if (CollectionUtils.isNotEmpty(refundExportList)){
-			if(refundExportList.size() > CommonConstants.TWENTY_THOUSAND){
+			if(refundExportList.size() > CommonConstants.EXPORT_TWENTY_THOUSAND){
 				return R.failed(InsurancesConstants.EXPORT_TOO_LONG);
 			}
 			List<TInsuranceDetail> detailList = new ArrayList<>();
@@ -3517,7 +3517,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (CollectionUtils.isEmpty(insuranceRefundImportList)) {
 			return R.failed(InsurancesConstants.INSURANCE_REFUND_IMPORT_LIST_IS_EMPTY);
 		}
-		if(insuranceRefundImportList.size() > CommonConstants.TWENTY_THOUSAND){
+		if(insuranceRefundImportList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
 			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
 		}
 		Map<String, List<InsuranceHandleImportParam>> map = insuranceChangeCheck(insuranceRefundImportList, user,true);
@@ -3582,7 +3582,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if (!Common.isNotEmpty(settleMonthCheckList)) {
 			return R.failed(InsurancesConstants.SETTLE_MONTH_CHANGE_LIST_IS_EMPTY);
 		}
-		if(settleMonthCheckList.size() > CommonConstants.TWENTY_THOUSAND){
+		if(settleMonthCheckList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
 			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
 		}
 		Map<String, List<SettleMonthChangeCheckParam>> map = settleMonthChangeCheck(settleMonthCheckList, user);
@@ -3669,7 +3669,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		if(!Common.isNotEmpty(deptChangeCheckList)){
 			return R.failed(InsurancesConstants.OPERATION_LIST_IS_EMPTY);
 		}
-		if(deptChangeCheckList.size() > CommonConstants.TWENTY_THOUSAND){
+		if(deptChangeCheckList.size() > CommonConstants.IMPORT_TWENTY_THOUSAND){
 			return R.failed(InsurancesConstants.IMPORT_TOO_LONG);
 		}
 		Map<String, List<DeptChangeCheckParam>> stringListMap = deptChangeCheck(deptChangeCheckList,user);

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceEkpServiceImpl.java

@@ -70,9 +70,9 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
 				TInsuranceSettle insuranceSettle = tInsuranceSettleService.getById(tInsuranceEkp.getDefaultSettleId());
 				boolean settleIdEquals = tInsuranceEkp.getDefaultSettleId().equals(defaultSettleId);
 				//预估是否已发送
-				boolean estimatePush = Common.isEmpty(insuranceSettle) && insuranceSettle.getIsEstimatePush() == CommonConstants.ZERO_INT;
+				boolean estimatePush = Common.isEmpty(insuranceSettle) || insuranceSettle.getIsEstimatePush() == CommonConstants.ZERO_INT;
 				//实缴是否已发送
-				boolean actualPush = Common.isEmpty(insuranceSettle) && insuranceSettle.getIsActualPush() == CommonConstants.ZERO_INT;
+				boolean actualPush = Common.isEmpty(insuranceSettle) || insuranceSettle.getIsActualPush() == CommonConstants.ZERO_INT;
 				//结算类型是否一致
 				boolean settleTypeEquals = settleType.equals(byId.getSettleType().toString());
 				EkpInteractiveParam ekpParam = new EkpInteractiveParam();