Merge remote-tracking branch 'origin/develop' into develop

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

@@ -70,7 +70,7 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 			return R.failed(CommonConstants.PARAM_IS_NOT_ERROR);
 		}
 		// 取值最新审核的合同  2022-10-13  倩倩确认 最早取值审核通过的 最早合同开始时间
-		TEmployeeContractInfo last = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
+		TEmployeeContractInfo first = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
 				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
@@ -79,12 +79,12 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
 				.last(CommonConstants.LAST_ONE_SQL));
 
 		// 取值最早审核的合同
-		TEmployeeContractInfo first = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
+		TEmployeeContractInfo last = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
 				.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
 				.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING)
 				.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
-				.orderByDesc(TEmployeeContractInfo::getContractEnd)
+				.orderByDesc(TEmployeeContractInfo::getCreateTime)
 				.last(CommonConstants.LAST_ONE_SQL));
 		TCertRecordVo vo = new TCertRecordVo();
 		vo.setEmpIdcard(project.getEmpIdcard());

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

@@ -38,6 +38,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
 import com.yifu.cloud.plus.v1.yifu.common.core.util.RedisUtil;
 import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
 import com.yifu.cloud.plus.v1.yifu.common.dapr.util.UpmsDaprUtils;
+import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -154,8 +155,8 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 					}
 				}
 				tSettleDomainInfo = baseMapper.selectOne(Wrappers.<TSettleDomain>query().lambda()
-						.eq(TSettleDomain::getDeleteFlag,CommonConstants.ZERO_STRING)
 						.eq(TSettleDomain::getDepartNo,tSettleDomain.getDepartNo())
+						.orderByDesc(BaseEntity::getCreateTime)
 						.last(CommonConstants.LAST_ONE_SQL));
 				if (Common.isNotNull(tSettleDomainInfo)) {
 					tSettleDomain.setId(tSettleDomainInfo.getId());
@@ -169,6 +170,7 @@ public class TSettleDomainServiceImpl extends ServiceImpl<TSettleDomainMapper, T
 						saveForEkp(res.getData().getUserIds(),tSettleDomain.getId());
 					}
 				}
+				tSettleDomain.setDeleteFlag(CommonConstants.ZERO_STRING);
 				if (Common.isNotNull(tSettleDomainInfo)) {
 					baseMapper.updateById(tSettleDomain);
 				} else {

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

@@ -270,6 +270,7 @@
 		a.BPO_FLAG
 		FROM t_settle_domain a
 		where 1=1
+			and a.DELETE_FLAG = '0'
 			<if test="codes != null and codes.size() > 0">
 				and  a.DEPART_NO in
 				<foreach collection="codes" item="param" index="index" open="(" close=")" separator=",">

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

@@ -895,7 +895,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		}
 		param.setCreateBy(user.getId());
 		menuUtil.setAuthSql(user, param);
-		List<InsuranceExportListVO> insuranceExportList = new ArrayList<>();
+		List<InsuranceExportListVO> insuranceExportList;
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待投保」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){
 			insuranceExportList =  baseMapper.getInsuranceExportListBySelect(param.getIdList());
@@ -3093,7 +3093,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 				//发票号是否更新
 				boolean booleanInvoiceNo = StringUtils.isNotBlank(param.getInvoiceNo()) && !param.getInvoiceNo().equals(detail.getInvoiceNo());
 				//保费是否更新
-				boolean booleanActualPremium = StringUtils.isNotBlank(param.getActualPremium()) && detail.getActualPremium().compareTo(new BigDecimal(param.getActualPremium())) != 0;
+				boolean booleanActualPremium = true;
+				if (Common.isNotNull(detail.getActualPremium())) {
+					booleanActualPremium = StringUtils.isNotBlank(param.getActualPremium()) && detail.getActualPremium().compareTo(new BigDecimal(param.getActualPremium())) != 0;
+				}
 				//如果当前为合并结算
 				if (CommonConstants.ZERO_INT == detail.getSettleType() && StringUtils.isNotBlank(detail.getDefaultSettleId())){
 					TInsuranceSettle settle = tInsuranceSettleService.getById(detail.getDefaultSettleId());