Commit acee5560 authored by hongguangwu's avatar hongguangwu

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

parents 96308df7 20d4073c
...@@ -851,7 +851,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra ...@@ -851,7 +851,7 @@ public class TEmployeeContractPreServiceImpl extends ServiceImpl<TEmployeeContra
try { try {
// 查询符合条件的合同:状态为"签署中"(6) 且 为电子签任务(signType=0) 且 入职日期到当日正好一个月 // 查询符合条件的合同:状态为"签署中"(6) 且 为电子签任务(signType=0) 且 入职日期到当日正好一个月
LocalDate currentDate = LocalDate.now(); LocalDate currentDate = LocalDate.now();
LocalDate oneMonthAgo = currentDate.minusMonths(1); LocalDate oneMonthAgo = currentDate.minusMonths(1).plusDays(1);
List<TEmployeeContractPre> contractsToRevoke = baseMapper.selectList(Wrappers.<TEmployeeContractPre>query() List<TEmployeeContractPre> contractsToRevoke = baseMapper.selectList(Wrappers.<TEmployeeContractPre>query()
.lambda() .lambda()
......
...@@ -455,6 +455,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe ...@@ -455,6 +455,11 @@ public class TEmployeePreLogServiceImpl extends ServiceImpl<TEmployeePreLogMappe
simNew.put("socialIsBuy", isSocailBuyNew); simNew.put("socialIsBuy", isSocailBuyNew);
this.setLogBaseInfo(empPreId, old, simNew, user, differenceSocialKey, logId, detailSocialLog); this.setLogBaseInfo(empPreId, old, simNew, user, differenceSocialKey, logId, detailSocialLog);
detailList.add(detailSocialLog); detailList.add(detailSocialLog);
if (Common.isNotNull(diffTitle)) {
diffTitle += "、社保信息";
} else {
diffTitle = "社保信息";
}
} }
//查询老的社保明细 //查询老的社保明细
R<EmployeePreSocialListVo> socialSdr = socialDaprUtils.getSocialPreInfoList(empPreId); R<EmployeePreSocialListVo> socialSdr = socialDaprUtils.getSocialPreInfoList(empPreId);
......
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<include refid="tEmployeeContractPre_where"/> <include refid="tEmployeeContractPre_where"/>
</where> </where>
order by a.create_time desc order by a.create_time desc
limit 0,2000 limit 0,5
</select> </select>
<!--tEmployeeContractPre导出查询--> <!--tEmployeeContractPre导出查询-->
......
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