Commit b1b8143f authored by fangxinjiang's avatar fangxinjiang

批量办理 100%

parent 8b2e4238
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.archives.entity; package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttributeConstants;
import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity; import com.yifu.cloud.plus.v1.yifu.common.mybatis.base.BaseEntity;
...@@ -117,6 +118,7 @@ public class TEmployeeProject extends BaseEntity { ...@@ -117,6 +118,7 @@ public class TEmployeeProject extends BaseEntity {
*/ */
@Schema(description ="减项时间") @Schema(description ="减项时间")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime leaveTime; private LocalDateTime leaveTime;
/** /**
......
...@@ -215,4 +215,13 @@ public class EmpContractDispatchVo implements Serializable { ...@@ -215,4 +215,13 @@ public class EmpContractDispatchVo implements Serializable {
@ExcelAttribute(name = "客户名称", maxLength = 128) @ExcelAttribute(name = "客户名称", maxLength = 128)
@Schema(description = "客户名称", name = "subjectUnit") @Schema(description = "客户名称", name = "subjectUnit")
private String subjectUnit; private String subjectUnit;
/**
* 合同年限
*/
@NotBlank(message = "合同年限不能为空")
@ExcelAttribute(name = "合同年限", errorInfo = "合同年限不能为空")
@Schema(description = "合同年限", name = "contractTerm")
private String contractTerm;
} }
...@@ -335,6 +335,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -335,6 +335,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
EmpDispatchAddVo addVo = new EmpDispatchAddVo(); EmpDispatchAddVo addVo = new EmpDispatchAddVo();
// 执行数据插入操作 组装 // 执行数据插入操作 组装
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
empVo = null;
excel = excelVOList.get(i); excel = excelVOList.get(i);
fundSet = fundHoldMap.get(excel.getProvidentHousehold()); fundSet = fundHoldMap.get(excel.getProvidentHousehold());
socialSet = socialHoldMap.get(excel.getSocialHousehold()); socialSet = socialHoldMap.get(excel.getSocialHousehold());
...@@ -439,6 +440,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -439,6 +440,10 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
projectsMap = res.getData().getProjectsMap(); projectsMap = res.getData().getProjectsMap();
} }
for (int i = 0; i < excelVOList.size(); i++) { for (int i = 0; i < excelVOList.size(); i++) {
contract = null;
social = null;
project = null;
fund = null;
excel = excelVOList.get(i); excel = excelVOList.get(i);
if (Common.isNotNull(excelVOTemp) && Common.isNotNull(excelVOTemp.get(excel.getEmpIdcard()))){ if (Common.isNotNull(excelVOTemp) && Common.isNotNull(excelVOTemp.get(excel.getEmpIdcard()))){
continue; continue;
...@@ -819,8 +824,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -819,8 +824,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
SysBaseSetInfo fundSet, SysBaseSetInfo fundSet,
TDispatchImportVo excel, TDispatchImportVo excel,
TSocialFundInfo socialFund) { TSocialFundInfo socialFund) {
TDispatchInfo dispatch; TDispatchInfo dispatch = new TDispatchInfo();
dispatch = new TDispatchInfo();
// 初始化派单项 // 初始化派单项
initAddHandleItem(excel, socialFund,dispatch,socialSet); initAddHandleItem(excel, socialFund,dispatch,socialSet);
dispatch.setOrganName(user.getDeptName()); dispatch.setOrganName(user.getDeptName());
...@@ -875,10 +879,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -875,10 +879,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setEmpId(empVo.getId()); dispatch.setEmpId(empVo.getId());
dispatch.setEmpNo(empVo.getEmpNo()); dispatch.setEmpNo(empVo.getEmpNo());
// 封装合同信息 如果有合同取值实际合同信息 // 封装合同信息 如果有合同取值实际合同信息
dispatch.setContractStart(empVo.getContractStart()); if (Common.isNotNull(empVo.getContractStart())){
dispatch.setContractEnd(empVo.getContractEnd()); dispatch.setContractStart(empVo.getContractStart());
dispatch.setContractTerm(empVo.getContractTerm()); dispatch.setContractEnd(empVo.getContractEnd());
dispatch.setContractType(empVo.getContractType()); dispatch.setContractTerm(empVo.getContractTerm());
dispatch.setContractType(empVo.getContractType());
}
dispatch.setFileProvince(empVo.getFileProvince()); dispatch.setFileProvince(empVo.getFileProvince());
dispatch.setFileCity(empVo.getFileCity()); dispatch.setFileCity(empVo.getFileCity());
dispatch.setFileTown(empVo.getFileTown()); dispatch.setFileTown(empVo.getFileTown());
...@@ -1005,6 +1011,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1005,6 +1011,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
fund.setPayPolicy(fundSet.getPayPolicy()); fund.setPayPolicy(fundSet.getPayPolicy());
fund.setLowerLimit(fundSet.getLowerLimit()); fund.setLowerLimit(fundSet.getLowerLimit());
fund.setUpperLimit(fundSet.getUpperLimit()); fund.setUpperLimit(fundSet.getUpperLimit());
fund.setInsuranceIsLatestCardinality(fundSet.getInsuranceIsLatestCardinality());
if (Common.isNotNull(fundSet.getProvince())){ if (Common.isNotNull(fundSet.getProvince())){
fund.setFundProvince(Integer.toString(fundSet.getProvince())); fund.setFundProvince(Integer.toString(fundSet.getProvince()));
} }
...@@ -1356,10 +1363,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -1356,10 +1363,11 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
contract.setContractSubName(excel.getContractSubName()); contract.setContractSubName(excel.getContractSubName());
contract.setDeptNo(excel.getSettleDomainCode()); contract.setDeptNo(excel.getSettleDomainCode());
contract.setPost(excel.getPost()); contract.setPost(excel.getPost());
contract.setSituation(excel.getContractType()); contract.setSituation("正常签订");
contract.setEmpIdcard(excel.getEmpIdcard()); contract.setEmpIdcard(excel.getEmpIdcard());
contract.setEmpName(excel.getEmpName()); contract.setEmpName(excel.getEmpName());
contract.setWorkingHours(excel.getWorkingHours()); contract.setWorkingHours(excel.getWorkingHours());
contract.setContractTerm(excel.getContractTerm());
if (Common.isNotNull(excel.getSocialHousehold())){ if (Common.isNotNull(excel.getSocialHousehold())){
contract.setContractParty(excel.getSocialHousehold()); contract.setContractParty(excel.getSocialHousehold());
} }
...@@ -2528,6 +2536,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2528,6 +2536,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
Date now = new Date(); Date now = new Date();
StringBuffer temp = new StringBuffer(); StringBuffer temp = new StringBuffer();
for (TDispatchInfo dis : disList) { for (TDispatchInfo dis : disList) {
auditInfo = new TAuditInfo();
if (Common.isNotNull(socialFundMap)){ if (Common.isNotNull(socialFundMap)){
sf = socialFundMap.get(dis.getEmpIdcard()); sf = socialFundMap.get(dis.getEmpIdcard());
} }
...@@ -2575,7 +2584,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2575,7 +2584,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
} }
socialMapper.updateById(socialInfo); socialMapper.updateById(socialInfo);
dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark)); dis.setSocialHandleRemark(ServiceUtil.ifNullToEmpty(handleRemark));
auditInfo = new TAuditInfo();
auditInfo.setType(CommonConstants.ONE_STRING); auditInfo.setType(CommonConstants.ONE_STRING);
if (CommonConstants.ZERO_INT == flag) { if (CommonConstants.ZERO_INT == flag) {
temp.setLength(CommonConstants.ZERO_INT); temp.setLength(CommonConstants.ZERO_INT);
......
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