代码优化

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/SalaryUploadServiceImpl.java

@@ -197,7 +197,7 @@ public class SalaryUploadServiceImpl extends ServiceImpl<TSalaryStandardMapper,
 					}
 				}
 			} catch (Exception e) {
-				log.error(e.getMessage());
+				log.error("薪资导入异常：",e);
 				return R.failed("数据导入解析失败！");
 			}
 

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TPreDispatchInfoServiceImpl.java

@@ -1172,12 +1172,12 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 		}
 		// 默认合同名称为代理社保 合同类型为其他
 		info.setContractNameAdd(PreDispatchConstants.CONTRACT_NAME);
-		info.setContractTypeAdd(CommonConstants.THREE_STRING);
-		info.setContractStartAdd(info.getContractStart());
+		info.setContractTypeAdd(CommonConstants.ONE_STRING);
+		info.setContractStartAdd(DateUtil.getFirstDayString(info.getPensionStart()));
 		// 默认为开始时间后的两年时间
-		info.setContractEndAdd(info.getContractEnd());
+		info.setContractEndAdd(DateUtil.getFirstDayString(DateUtil.getYearAndMonth(info.getPensionStart(),24)));
 		// 默认合同期限2年
-		info.setContractTermAdd(Integer.toString(Common.getYearOfTime(info.getContractStart(), info.getContractEnd())));
+		info.setContractTermAdd(CommonConstants.TWO_STRING);
 		// 默认工时制 综合工时制2
 		info.setWorkingHoursAdd(CommonConstants.TWO_STRING);