Skip to content

Y
yifu-mvp
Commit c4619dde authored by fangxinjiang's avatar fangxinjiang
Browse files
Options

派单导出优化

parent a017dd5e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java
View file @ c4619dde
...@@ -1104,6 +1104,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1104,6 +1104,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setEmpName(excel.getEmpName()); dispatch.setEmpName(excel.getEmpName());
dispatch.setEmpNational(excel.getEmpNational()); dispatch.setEmpNational(excel.getEmpNational());
dispatch.setEmpType(excel.getEmpType()); dispatch.setEmpType(excel.getEmpType());
dispatch.setTryPeriod(excel.getTryPeriod());
dispatch.setEmpMobile(excel.getEmpMobile()); dispatch.setEmpMobile(excel.getEmpMobile());
dispatch.setType(CommonConstants.ZERO_STRING); dispatch.setType(CommonConstants.ZERO_STRING);
dispatch.setCurrentOperator(user.getNickname()); dispatch.setCurrentOperator(user.getNickname());
...@@ -2615,6 +2616,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2615,6 +2616,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
socialFund.setFundStatus(CommonConstants.FIVE_STRING); socialFund.setFundStatus(CommonConstants.FIVE_STRING);
socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING); socialFund.setFundReduceStatus(CommonConstants.ZERO_STRING);
} }
if (Common.isNotNull(temp.toString())){
temp.deleteCharAt(temp.length()-1);
}
dispatch.setDispatchItem(temp.toString()); dispatch.setDispatchItem(temp.toString());
dispatch.setBelongUnitName(socialFund.getUnitName()); dispatch.setBelongUnitName(socialFund.getUnitName());
dispatch.setBelongUnit(socialFund.getUnitId()); dispatch.setBelongUnit(socialFund.getUnitId());
...@@ -2631,6 +2635,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2631,6 +2635,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setFileProvince(empVo.getFileProvince()); dispatch.setFileProvince(empVo.getFileProvince());
dispatch.setFileCity(empVo.getFileCity()); dispatch.setFileCity(empVo.getFileCity());
dispatch.setFileTown(empVo.getFileTown()); dispatch.setFileTown(empVo.getFileTown());
dispatch.setContractName(empVo.getContractName());
dispatch.setContractSubName(empVo.getContractSubName());
} }
return dispatch; return dispatch;
} }
......
yifu-social/yifu-social-biz/src/main/resources/mapper/TSocialFundInfoMapper.xml
View file @ c4619dde
...@@ -174,8 +174,8 @@ ...@@ -174,8 +174,8 @@
<result property="idCardTown" column="ID_CARD_TOWN"/> <result property="idCardTown" column="ID_CARD_TOWN"/>
<result property="idCardAddress" column="ID_CARD_ADDRESS"/> <result property="idCardAddress" column="ID_CARD_ADDRESS"/>
<result property="fileProvince" column="FILE_PROVINCE"/> <result property="fileProvince" column="FILE_PROVINCE"/>
<result property="fileCity" column="FILE__CITY"/> <result property="fileCity" column="FILE_CITY"/>
<result property="fileTown" column="FILE__TOWN"/> <result property="fileTown" column="FILE_TOWN"/>
<result property="post" column="POST"/> <result property="post" column="POST"/>
<result property="tryPeriod" column="TRY_PERIOD"/> <result property="tryPeriod" column="TRY_PERIOD"/>
<result property="workingHours" column="WORKING_HOURS"/> <result property="workingHours" column="WORKING_HOURS"/>
......
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