Commit 93506ea6 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents 8020e05b 0aaecdd4
...@@ -60,6 +60,8 @@ public class FascUtil { ...@@ -60,6 +60,8 @@ public class FascUtil {
private static final String DATA_COVER = "dataCover"; private static final String DATA_COVER = "dataCover";
private static final String DATE_FORMAT = "dateFormat"; private static final String DATE_FORMAT = "dateFormat";
private static final String YEAR_STR = "年";
private static final String MONTH_STR = "个月";
private static final SerializerFeature[] features = new SerializerFeature[]{ private static final SerializerFeature[] features = new SerializerFeature[]{
WriteMapNullValue, WriteNullNumberAsZero, WriteNullListAsEmpty, WriteMapNullValue, WriteNullNumberAsZero, WriteNullListAsEmpty,
...@@ -459,7 +461,16 @@ public class FascUtil { ...@@ -459,7 +461,16 @@ 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)) {
fieldValue = contract.getContractDurationYear() + CommonConstants.CENTER_SPLIT_LINE_STRING + contract.getContractDurationMonth(); if (Common.isNotNull(contract.getContractDurationYear()) && !CommonConstants.ZERO_STRING.equals(contract.getContractDurationYear())) {
fieldValue = contract.getContractDurationYear() + YEAR_STR;
}
if (Common.isNotNull(contract.getContractDurationMonth()) && !CommonConstants.ZERO_STRING.equals(contract.getContractDurationMonth())) {
if (Common.isNotNull(fieldValue)) {
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();
} else if (FascConstants.EMP_SEX.equals(fieldName)) { } else if (FascConstants.EMP_SEX.equals(fieldName)) {
......
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
FROM t_fasc_template_detail a FROM t_fasc_template_detail a
left join t_fasc_template b on a.sign_template_id = b.sign_template_id left join t_fasc_template b on a.sign_template_id = b.sign_template_id
left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field left join t_fasc_hr_field h on h.hr_field_id = a.hr_field_id and h.hr_field = a.hr_field
where b.delete_Flag = '0' and a.hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId} where b.delete_Flag = '0' and a.delete_flag = '0' and a.hr_field_id is not null and a.sign_template_id = #{fadadaTemplateId}
</select> </select>
<!--tFascTemplateDetail简单分页查询--> <!--tFascTemplateDetail简单分页查询-->
......
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