派单导出优化

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

@@ -1104,6 +1104,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 		dispatch.setEmpName(excel.getEmpName());
 		dispatch.setEmpNational(excel.getEmpNational());
 		dispatch.setEmpType(excel.getEmpType());
+		dispatch.setTryPeriod(excel.getTryPeriod());
 		dispatch.setEmpMobile(excel.getEmpMobile());
 		dispatch.setType(CommonConstants.ZERO_STRING);
 		dispatch.setCurrentOperator(user.getNickname());
@@ -2615,6 +2616,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			socialFund.setFundStatus(CommonConstants.FIVE_STRING);
 			socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING);
 		}
+		if (Common.isNotNull(temp.toString())){
+			temp.deleteCharAt(temp.length()-1);
+		}
 		dispatch.setDispatchItem(temp.toString());
 		dispatch.setBelongUnitName(socialFund.getUnitName());
 		dispatch.setBelongUnit(socialFund.getUnitId());
@@ -2631,6 +2635,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			dispatch.setFileProvince(empVo.getFileProvince());
 			dispatch.setFileCity(empVo.getFileCity());
 			dispatch.setFileTown(empVo.getFileTown());
+			dispatch.setContractName(empVo.getContractName());
+			dispatch.setContractSubName(empVo.getContractSubName());
 		}
 		return dispatch;
 	}

yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml

@@ -174,8 +174,8 @@
 		<result property="idCardTown" column="ID_CARD_TOWN"/>
 		<result property="idCardAddress" column="ID_CARD_ADDRESS"/>
 		<result property="fileProvince" column="FILE_PROVINCE"/>
-		<result property="fileCity" column="FILE__CITY"/>
-		<result property="fileTown" column="FILE__TOWN"/>
+		<result property="fileCity" column="FILE_CITY"/>
+		<result property="fileTown" column="FILE_TOWN"/>
 		<result property="post" column="POST"/>
 		<result property="tryPeriod" column="TRY_PERIOD"/>
 		<result property="workingHours" column="WORKING_HOURS"/>