Commit 4aa2545c authored by fangxinjiang's avatar fangxinjiang

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

parents 340f9913 3b367c30
...@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceAlert; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceAlert;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.InsuranceSearchVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TEmployeeInsurancePreSearchVo;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceAlertSearchVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceAlertSearchVo;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
......
...@@ -8946,7 +8946,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -8946,7 +8946,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
qw.setCreateTime(LocalDateTime.now()); qw.setCreateTime(LocalDateTime.now());
qw.setCustomerUserLoginname(customerUserLoginname); qw.setCustomerUserLoginname(customerUserLoginname);
qw.setCustomerUsername(customerUsername); qw.setCustomerUsername(customerUsername);
qw.setDescription("张三-" + empIdCard + ",商险续保办理失败 <br>请及时处理,以免产生用工风险!"); qw.setDescription(empName + CommonConstants.CENTER_SPLIT_LINE_STRING + empIdCard + ",商险续保办理失败 <br>请及时处理,以免产生用工风险!");
// 派单失败,组装需要推送企微的明细 // 派单失败,组装需要推送企微的明细
TInsurancePreRenewDetailQwDetail qwDetail = new TInsurancePreRenewDetailQwDetail(); TInsurancePreRenewDetailQwDetail qwDetail = new TInsurancePreRenewDetailQwDetail();
qwDetail.setPreId(preRenewId); qwDetail.setPreId(preRenewId);
...@@ -9012,7 +9012,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -9012,7 +9012,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
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", "【作业自动化——商险续保办理失败提醒】"); textcard.put("title", "【作业自动化——商险续保办理失败提醒】");
textcard.put("url", String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName() + "/auth/oauth/wxLogin", "77" + mainId)); textcard.put("url", String.format(SecurityConstants.WX_GET_MESSAGE_AUTH_URL, wxConfig.getCorpid(), wxConfig.getDomainName() + "/auth/oauth/wxLogin", "78" + mainId));
textcard.put("description", content); textcard.put("description", content);
requestMap.put("touser", sendUser); requestMap.put("touser", sendUser);
requestMap.put("agentid", wxConfig.getAgentid()); requestMap.put("agentid", wxConfig.getAgentid());
......
...@@ -11,7 +11,6 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser; ...@@ -11,7 +11,6 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysUser;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysUserListVo; import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysUserListVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysUsersVo; import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysUsersVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain; import com.yifu.cloud.plus.v1.yifu.archives.entity.TSettleDomain;
import com.yifu.cloud.plus.v1.yifu.archives.vo.EmployeeContractExportAuditVO;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainListVo;
import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.TSettleDomainRegistListVo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ClientNameConstants;
......
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