Commit 6ca99cf9 authored by hongguangwu's avatar hongguangwu

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

parents 4a8645af f45390f8
...@@ -184,9 +184,9 @@ public class EmployeeContractVO extends RowIndex implements Serializable { ...@@ -184,9 +184,9 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelProperty("档案柜号") @ExcelProperty("档案柜号")
private String fileCabinetNo; private String fileCabinetNo;
/** /**
* 离职日期 * 离职日期 fxj 2025-05-08 优化线上邮件报错 isDate = true
*/ */
@ExcelAttribute(name = "离职日期") @ExcelAttribute(name = "离职日期",isDate = true)
@Schema(description = "离职日期") @Schema(description = "离职日期")
@ExcelProperty("离职日期") @ExcelProperty("离职日期")
private String leaveDate; private String leaveDate;
......
...@@ -116,7 +116,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E ...@@ -116,7 +116,7 @@ public class EkpSocialInfoServiceImpl extends ServiceImpl<EkpSocialInfoMapper, E
EkpSocialInfo socialCount; EkpSocialInfo socialCount;
//获取社保订单明细合计 //获取社保订单明细合计
EkpSocialSumInfoVo socialSumInfo = baseMapper.getCostSumInfo(idCard, month); EkpSocialSumInfoVo socialSumInfo = baseMapper.getCostSumInfo(idCard, dateStringInsert(month));
//预估单位合计 //预估单位合计
BigDecimal ygDwSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgDwSum()); BigDecimal ygDwSum = Common.isEmpty(socialSumInfo) ? BigDecimal.ZERO : BigDecimal.valueOf(socialSumInfo.getYgDwSum());
//实缴单位合计 //实缴单位合计
......
...@@ -384,7 +384,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -384,7 +384,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
if (Common.isEmpty(content)){ if (Common.isEmpty(content)){
content = new StringBuilder(); content = new StringBuilder();
content.append(String.format("项目数:%d、商险临期人数:%d、商险过期人数:%d,<br/>", content.append(String.format("项目数:%d、商险临期人数:%d、商险过期人数:%d,<br/>",
temp.getDomainNum(), temp.getGqNum(), temp.getLqNum())); pushMap.put(user.getWxMessage(), content); temp.getDomainNum(), temp.getLqNum(), temp.getGqNum())); pushMap.put(user.getWxMessage(), content);
} }
} }
} }
...@@ -436,7 +436,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper, ...@@ -436,7 +436,7 @@ public class TInsuranceWarnServiceImpl extends ServiceImpl<TInsuranceWarnMapper,
RestTemplate restTemplate = new RestTemplate(); RestTemplate restTemplate = new RestTemplate();
Map<String, Object> requestMap = new HashMap<>(); Map<String, Object> requestMap = new HashMap<>();
Map<String, Object> textcard = new HashMap<>(); Map<String, Object> textcard = new HashMap<>();
textcard.put("title", "<b>商险待办提醒</b>"); textcard.put("title", "商险待办提醒");
textcard.put("url", String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName() + "/auth/oauth/wxLogin", "66" )); textcard.put("url", String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName() + "/auth/oauth/wxLogin", "66" ));
content.append("请及时至HRO系统进行处理,以免人员脱保!"); content.append("请及时至HRO系统进行处理,以免人员脱保!");
textcard.put("description", content.toString()); textcard.put("description", content.toString());
......
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