Commit f285c0dc authored by hongguangwu's avatar hongguangwu

MVP1.7.16-法大大字段

parent d75a814f
...@@ -41,5 +41,9 @@ public interface FascConstants { ...@@ -41,5 +41,9 @@ public interface FascConstants {
// 超时未签署自行变更为线下签 // 超时未签署自行变更为线下签
String TIME_OUT_REASON = "超时未签署自行变更为线下签"; String TIME_OUT_REASON = "超时未签署自行变更为线下签";
// 需要额外转化的字段:
String CONTRACT_DURATION = "contractDurationYear-Month";
String DISPATCH_PERIOD = "dispatchPeriodYear-Month";
//String FIELD_TYPE = "text_single_line,text_multi_line,number,id_card,fill_date,multi_radio,multi_checkbox,picture,select_box,table,verification_code,business_code"; //String FIELD_TYPE = "text_single_line,text_multi_line,number,id_card,fill_date,multi_radio,multi_checkbox,picture,select_box,table,verification_code,business_code";
} }
...@@ -397,6 +397,7 @@ public class FascUtil { ...@@ -397,6 +397,7 @@ public class FascUtil {
tEmployeeContractPreMapper.updateById(contract); tEmployeeContractPreMapper.updateById(contract);
} }
// 第二步:填写控件 // 第二步:填写控件
private R<String> buildDocFieldValue(TEmployeeContractPre contract, String requestId private R<String> buildDocFieldValue(TEmployeeContractPre contract, String requestId
, OpenApiClient openApiClient, String accessToken , OpenApiClient openApiClient, String accessToken
...@@ -409,6 +410,7 @@ public class FascUtil { ...@@ -409,6 +410,7 @@ public class FascUtil {
if (detailList != null && !detailList.isEmpty()) { if (detailList != null && !detailList.isEmpty()) {
DocFieldValueInfo dfv; DocFieldValueInfo dfv;
String fieldValue; String fieldValue;
String fieldName;
for (TFascTemplateDetail detail : detailList) { for (TFascTemplateDetail detail : detailList) {
if (Common.isNotNull(detail.getHrFieldId()) && Common.isNotNull(detail.getHrField())) { if (Common.isNotNull(detail.getHrFieldId()) && Common.isNotNull(detail.getHrField())) {
dfv = new DocFieldValueInfo(); dfv = new DocFieldValueInfo();
...@@ -416,9 +418,15 @@ public class FascUtil { ...@@ -416,9 +418,15 @@ public class FascUtil {
dfv.setFieldId(detail.getFascFieldId()); dfv.setFieldId(detail.getFascFieldId());
// 转化字段 // 转化字段
fieldValue = this.getContractFieldValueByReflection(contract, detail.getHrFieldId()); fieldName = detail.getHrFieldId();
if (FascConstants.CONTRACT_DURATION.equals(fieldName)) {
fieldValue = contract.getContractDurationYear() + CommonConstants.DOWN_LINE_STRING + contract.getContractDurationMonth();
} else if (FascConstants.DISPATCH_PERIOD.equals(fieldName)) {
fieldValue = contract.getDispatchPeriodYear() + CommonConstants.DOWN_LINE_STRING + contract.getDispatchPeriodMonth();
} else {
fieldValue = this.getContractFieldValueByReflection(contract, fieldName);
}
dfv.setFieldValue(fieldValue); dfv.setFieldValue(fieldValue);
dfv.setFieldValue(detail.getHrFieldId());
docFieldValues.add(dfv); docFieldValues.add(dfv);
} }
......
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