Commit 0aaecdd4 authored by hongguangwu's avatar hongguangwu

MVP1.7.16-delete_flag

parent 0a0d64de
...@@ -461,11 +461,15 @@ public class FascUtil { ...@@ -461,11 +461,15 @@ public class FascUtil {
fieldName = detail.getHrFieldId(); fieldName = detail.getHrFieldId();
fieldNameChinese = detail.getHrField(); fieldNameChinese = detail.getHrField();
if (FascConstants.CONTRACT_DURATION.equals(fieldName)) { if (FascConstants.CONTRACT_DURATION.equals(fieldName)) {
if (Common.isNotNull(contract.getContractDurationYear())) { if (Common.isNotNull(contract.getContractDurationYear()) && !CommonConstants.ZERO_STRING.equals(contract.getContractDurationYear())) {
fieldValue = contract.getContractDurationYear() + YEAR_STR; fieldValue = contract.getContractDurationYear() + YEAR_STR;
} }
if (Common.isNotNull(contract.getContractDurationMonth()) && !CommonConstants.ZERO_STRING.equals(contract.getContractDurationMonth())) { if (Common.isNotNull(contract.getContractDurationMonth()) && !CommonConstants.ZERO_STRING.equals(contract.getContractDurationMonth())) {
if (Common.isNotNull(fieldValue)) {
fieldValue += contract.getContractDurationMonth() + MONTH_STR; fieldValue += contract.getContractDurationMonth() + MONTH_STR;
} else {
fieldValue = contract.getContractDurationMonth() + MONTH_STR;
}
} }
} else if (FascConstants.DISPATCH_PERIOD.equals(fieldName)) { } else if (FascConstants.DISPATCH_PERIOD.equals(fieldName)) {
fieldValue = contract.getDispatchPeriodYear() + CommonConstants.CENTER_SPLIT_LINE_STRING + contract.getDispatchPeriodMonth(); fieldValue = contract.getDispatchPeriodYear() + CommonConstants.CENTER_SPLIT_LINE_STRING + contract.getDispatchPeriodMonth();
......
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