Commit 8a1b30e1 authored by fangxinjiang's avatar fangxinjiang

版本切换-fxj

parent 75f727f6
...@@ -1185,9 +1185,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -1185,9 +1185,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//计费方式(0:按天,1:按月) //计费方式(0:按天,1:按月)
if (null != insuranceDetailVO.getBillingType()){ if (null != insuranceDetailVO.getBillingType()){
if (CommonConstants.ZERO_INT == insuranceDetailVO.getBillingType().intValue()){ if (CommonConstants.ZERO_INT == insuranceDetailVO.getBillingType().intValue()){
insuranceDetailVO.setPurchaseCycle(insuranceDetailVO.getPurchaseCycle() + "天"); insuranceDetailVO.setBuyCycle(insuranceDetailVO.getPurchaseCycle());
}else if (CommonConstants.ONE_INT == insuranceDetailVO.getBillingType().intValue()){ }else if (CommonConstants.ONE_INT == insuranceDetailVO.getBillingType().intValue()){
insuranceDetailVO.setPurchaseCycle(insuranceDetailVO.getPurchaseCycle() + "个月"); insuranceDetailVO.setBuyCycle(insuranceDetailVO.getPurchaseCycle());
} }
} }
......
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
a.PAYMENT_STATUS as paymentStatus, a.PAYMENT_STATUS as paymentStatus,
a.PAYMENT_TIME as paymentTime, a.PAYMENT_TIME as paymentTime,
a.IS_JFCD as isJfcd, a.IS_JFCD as isJfcd,
a.PURCHASE_CYCLE as purchaseCycle, IF(a.BILLING_TYPE='0',CONCAT(a.PURCHASE_CYCLE,'天'),CONCAT(a.PURCHASE_CYCLE,'个月')) as purchaseCycle,
a.BILLING_TYPE as billingType, a.BILLING_TYPE as billingType,
a.PRE_HANDLE_TIME as preHandleTime, a.PRE_HANDLE_TIME as preHandleTime,
a.ESTIMATE_PREMIUM as estimatePremium a.ESTIMATE_PREMIUM as estimatePremium
...@@ -436,7 +436,8 @@ ...@@ -436,7 +436,8 @@
a.REFUND_ID as refundId, a.REFUND_ID as refundId,
a.EXPIRE_REMARK, a.EXPIRE_REMARK,
a.EXPIRE_IGNORE_FLAG, a.EXPIRE_IGNORE_FLAG,
a.IS_ADRESS as isAdress,PAYMENT_STATUS,PAYMENT_TIME,IS_JFCD,PURCHASE_CYCLE,PRE_HANDLE_TIME a.IS_ADRESS as isAdress,a.PAYMENT_STATUS,a.PAYMENT_TIME,a.IS_JFCD,
IF(a.BILLING_TYPE='0',CONCAT(a.PURCHASE_CYCLE,'天'),CONCAT(a.PURCHASE_CYCLE,'个月')) PURCHASE_CYCLE,a.PRE_HANDLE_TIME
from t_insurance_detail a from t_insurance_detail a
left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID left join t_insurance_settle tis on a.DEFAULT_SETTLE_ID = tis.ID
where a.ID = #{id} where a.ID = #{id}
......
...@@ -2390,6 +2390,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2390,6 +2390,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return empVoMap; return empVoMap;
} }
//autoFalg "0" 为自动化
private boolean validImport(List<ErrorMessage> errorMessageList, private boolean validImport(List<ErrorMessage> errorMessageList,
TDispatchImportVo excel, TDispatchImportVo excel,
ProjectSetInfoVo setInfoVo, ProjectSetInfoVo setInfoVo,
...@@ -2517,7 +2518,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2517,7 +2518,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//档案试用期必填 20241128 fxj 1.7.2 //档案试用期必填 20241128 fxj 1.7.2
if (Common.isEmpty(empVo.getTryPeriod()) if (Common.isEmpty(empVo.getTryPeriod())
&& Common.isEmpty(excel.getTryPeriod()) && Common.isEmpty(excel.getTryPeriod())
&& CommonConstants.ZERO_STRING.equals(empVo.getTryPeriod())) { && CommonConstants.ZERO_STRING.equals(empVo.getTryPeriod()) && !CommonConstants.ZERO_STRING.equals(autoFlag)) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_TRYPERIOD_NOT_EMPTY))); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_TRYPERIOD_NOT_EMPTY)));
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment