Commit eb21a4c0 authored by huyuchen's avatar huyuchen

huych-社保自动化相关提交

parent c5726395
...@@ -300,7 +300,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -300,7 +300,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
Map<String, String> loginNameMap = new HashMap<>(); Map<String, String> loginNameMap = new HashMap<>();
//发起派单 //发起派单
List<ErrorMessage> errorMessageListAll = new ArrayList<>(); List<ErrorMessage> errorMessageListAll = new ArrayList<>();
List<EmployeeContractVO> excelVOList = baseMapper.getDisPatcherContractList(idList,CommonConstants.socialInfoStatus,type); List<EmployeeContractVO> excelVOList = baseMapper.getDisPatcherContractList(idList,Arrays.asList("0","1","3","5","7","11"),type);
// 拆分电子签和线下签 // 拆分电子签和线下签
List<EmployeeContractVO> electronicSignList = new ArrayList<>(); List<EmployeeContractVO> electronicSignList = new ArrayList<>();
...@@ -389,6 +389,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -389,6 +389,9 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
singleContractList.add(contractVO); singleContractList.add(contractVO);
List<ErrorMessage> singleErrorMessageList = new ArrayList<>(); List<ErrorMessage> singleErrorMessageList = new ArrayList<>();
if ("1999999999999999".equals(contractPre.getId())) {
singleContractList.add(contractVO);
}
// 调用合同导入方法 // 调用合同导入方法
contractInfoService.importContract(singleContractList, singleErrorMessageList); contractInfoService.importContract(singleContractList, singleErrorMessageList);
......
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