Commit 973f3012 authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/MVP1.7.16' into MVP1.7.16

parents 0ff3bd91 26dd64cc
...@@ -416,6 +416,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -416,6 +416,10 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
//1.9.11 huych 附件类型不比较差异 //1.9.11 huych 附件类型不比较差异
contractOld.setAttaList(null); contractOld.setAttaList(null);
employeeContractPre.setAttaList(null); employeeContractPre.setAttaList(null);
//如果电子签签署失败要变更成待发起
if (contractOld.getProcessStatus().equals(CommonConstants.SEVEN_STRING)) {
employeeContractPre.setProcessStatus(CommonConstants.ONE_STRING);
}
differenceContractKey = HrEquator.comparisonValueIgnoreField(contractOld, employeeContractPre, CONTRACT_IGNORE_FIELD); differenceContractKey = HrEquator.comparisonValueIgnoreField(contractOld, employeeContractPre, CONTRACT_IGNORE_FIELD);
if (differenceContractKey.length() > 0) { if (differenceContractKey.length() > 0) {
if (Common.isNotNull(diffTitle)) { if (Common.isNotNull(diffTitle)) {
......
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
1=1 1=1
<include refid="employeeRegistration_where"/> <include refid="employeeRegistration_where"/>
</where> </where>
limit 0,2000 limit 0,3
</select> </select>
<!--employeeRegistration简单分页查询--> <!--employeeRegistration简单分页查询-->
......
...@@ -385,7 +385,8 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap ...@@ -385,7 +385,8 @@ public class TDispatchInfoPreServiceImpl extends ServiceImpl<TDispatchInfoPreMap
List<ErrorMessage> errorMessageList = new ArrayList<>(); List<ErrorMessage> errorMessageList = new ArrayList<>();
dispatchInfoService.importTDispatchInfo(disList, errorMessageList,user, null, new HashMap<>()); dispatchInfoService.importTDispatchInfo(disList, errorMessageList,user, null, new HashMap<>());
if (!errorMessageList.stream().allMatch(message -> message.getMessage().equals(CommonConstants.SAVE_SUCCESS))) { if (!errorMessageList.stream().allMatch(message -> message.getMessage().equals(CommonConstants.SAVE_SUCCESS))) {
errorMessageListAll.addAll(errorMessageList); List<ErrorMessage> relErrorMessageList = errorMessageList.stream().filter(message -> !message.getMessage().equals(CommonConstants.SAVE_SUCCESS)).collect(Collectors.toList());
errorMessageListAll.addAll(relErrorMessageList);
//更新社保状态为2发起失败 //更新社保状态为2发起失败
for (ErrorMessage errorMessage : errorMessageList) { for (ErrorMessage errorMessage : errorMessageList) {
if (!errorMessage.getMessage().equals(CommonConstants.SAVE_SUCCESS)) { if (!errorMessage.getMessage().equals(CommonConstants.SAVE_SUCCESS)) {
......
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
<include refid="tDispatchInfoPre_other_where"/> <include refid="tDispatchInfoPre_other_where"/>
</where> </where>
order by a.create_time desc order by a.create_time desc
limit 0,2000 limit 0,3
</select> </select>
<!--tDispatchInfoPre社保待派单数据查询--> <!--tDispatchInfoPre社保待派单数据查询-->
......
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