Commit 79d0d75f authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/develop' into develop

parents 09e6784f eeb1eb62
package com.yifu.cloud.plus.v1.yifu.common.core.vo; package com.yifu.cloud.plus.v1.yifu.common.core.vo;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
...@@ -12,5 +13,6 @@ import lombok.NoArgsConstructor; ...@@ -12,5 +13,6 @@ import lombok.NoArgsConstructor;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
public class RowIndex { public class RowIndex {
@ExcelAttribute(name = "行号")
private Integer rowIndex; private Integer rowIndex;
} }
package com.yifu.cloud.plus.v1.yifu.ekp.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
/**
* @author zhaji
* @description TODO
* @date 2022-08-31 08:57:02
*/
@Data
@Component
@PropertySource("classpath:ekpInsuranceConfig.properties")
@ConfigurationProperties(value = "insurance",ignoreInvalidFields = false)
public class EkpInsuranceProperties {
String insuranceUrl;
String insuranceFdModelId;
String insuranceFdFlowId;
String insuranceDocStatus;
String insuranceLoginName;
String insuranceFocSubject;
}
...@@ -30,15 +30,4 @@ public class EkpSalaryProperties { ...@@ -30,15 +30,4 @@ public class EkpSalaryProperties {
String docSubject; String docSubject;
String insuranceUrl;
String insuranceFdModelId;
String insuranceFdFlowId;
String insuranceDocStatus;
String insuranceLoginName;
String insuranceFocSubject;
} }
...@@ -3,15 +3,14 @@ package com.yifu.cloud.plus.v1.yifu.ekp.util; ...@@ -3,15 +3,14 @@ package com.yifu.cloud.plus.v1.yifu.ekp.util;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.ekp.config.EkpSalaryProperties; import com.yifu.cloud.plus.v1.yifu.ekp.config.EkpInsuranceProperties;
import com.yifu.cloud.plus.v1.yifu.ekp.vo.EKPInsurancePushParam; import com.yifu.cloud.plus.v1.yifu.ekp.vo.EKPInsurancePushParam;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInteractiveParam;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam; import com.yifu.cloud.plus.v1.yifu.insurances.vo.TInsuranceSettlePushParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.http.*; import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
...@@ -28,17 +27,17 @@ import java.time.format.DateTimeFormatter; ...@@ -28,17 +27,17 @@ import java.time.format.DateTimeFormatter;
* @date 2022-08-05 09:42:33 * @date 2022-08-05 09:42:33
*/ */
@Slf4j @Slf4j
@EnableConfigurationProperties(EkpSalaryProperties.class) @EnableConfigurationProperties(EkpInsuranceProperties.class)
public class EKPInsuranceUtil { public class EkpInsuranceUtil {
@Resource @Resource
private EkpSalaryProperties ekpProperties; private EkpInsuranceProperties ekpInsuranceProperties;
/** /**
* 多层级的VO对象,且包含上传功能的样例 * 多层级的VO对象,且包含上传功能的样例
* 注意key的书写格式,类似EL表达式的方式,属性关系用'.', 列表和数组关系用[],Map关系用["xxx"] * 注意key的书写格式,类似EL表达式的方式,属性关系用'.', 列表和数组关系用[],Map关系用["xxx"]
*/ */
public String sendToEKP(EKPInteractiveParam param){ public String sendToEkp(EkpInteractiveParam param){
log.info("推送EKP开始"); log.info("推送EKP开始");
RestTemplate yourRestTemplate = new RestTemplate(); RestTemplate yourRestTemplate = new RestTemplate();
EKPInsurancePushParam pushParam = insuranceDetail2PushParam(param); EKPInsurancePushParam pushParam = insuranceDetail2PushParam(param);
...@@ -48,16 +47,16 @@ public class EKPInsuranceUtil { ...@@ -48,16 +47,16 @@ public class EKPInsuranceUtil {
//指向EKP的接口url //指向EKP的接口url
//把ModelingAppModelParameterAddForm转换成MultiValueMap //把ModelingAppModelParameterAddForm转换成MultiValueMap
JSONObject loginName = new JSONObject(); JSONObject loginName = new JSONObject();
loginName.append("LoginName",ekpProperties.getInsuranceLoginName()); loginName.append("LoginName",ekpInsuranceProperties.getInsuranceLoginName());
String loginData = new ObjectMapper().writeValueAsString(loginName); String loginData = new ObjectMapper().writeValueAsString(loginName);
MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>(); MultiValueMap<String,Object> wholeForm = new LinkedMultiValueMap<>();
//wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") ); //wholeForm.add("docSubject", new String(docSubject.getBytes("UTF-8"),"ISO-8859-1") );
wholeForm.add("docSubject",ekpProperties.getInsuranceFocSubject()); wholeForm.add("docSubject",ekpInsuranceProperties.getInsuranceFocSubject());
wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}"); wholeForm.add("docCreator", "{\"LoginName\":\"admin\"}");
//wholeForm.add("docCreator", loginData); //wholeForm.add("docCreator", loginData);
wholeForm.add("docStatus", ekpProperties.getInsuranceDocStatus()); wholeForm.add("docStatus", ekpInsuranceProperties.getInsuranceDocStatus());
wholeForm.add("fdModelId", ekpProperties.getInsuranceFdModelId()); wholeForm.add("fdModelId", ekpInsuranceProperties.getInsuranceFdModelId());
wholeForm.add("fdFlowId", ekpProperties.getInsuranceFdFlowId()); wholeForm.add("fdFlowId", ekpInsuranceProperties.getInsuranceFdFlowId());
//wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1")); //wholeForm.add("formValues", new String(formValues.getBytes("UTF-8"),"ISO-8859-1"));
wholeForm.add("formValues", formValues); wholeForm.add("formValues", formValues);
//wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") ); //wholeForm.add("formValues", new String("{\"fd_3adfe6af71a1cc\":\"王五\", \"fd_3adfe658c6229e\":\"2019-03-26\", \"fd_3adfe6592b4158\":\"这里内容\"}".getBytes("UTF-8"),"ISO-8859-1") );
...@@ -69,7 +68,7 @@ public class EKPInsuranceUtil { ...@@ -69,7 +68,7 @@ public class EKPInsuranceUtil {
//必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果 //必须设置上传类型,如果入参是字符串,使用MediaType.TEXT_PLAIN;如果
HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers); HttpEntity<MultiValueMap<String,Object>> entity = new HttpEntity<MultiValueMap<String,Object>>(wholeForm,headers);
//有返回值的情况 VO可以替换成具体的JavaBean //有返回值的情况 VO可以替换成具体的JavaBean
ResponseEntity<String> obj = yourRestTemplate.exchange(ekpProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class); ResponseEntity<String> obj = yourRestTemplate.exchange(ekpInsuranceProperties.getInsuranceUrl(), HttpMethod.POST, entity, String.class);
log.info("obj:"+obj); log.info("obj:"+obj);
String body = obj.getBody(); String body = obj.getBody();
if (StringUtils.isBlank(body)){ if (StringUtils.isBlank(body)){
...@@ -92,7 +91,7 @@ public class EKPInsuranceUtil { ...@@ -92,7 +91,7 @@ public class EKPInsuranceUtil {
* @param param 转换类 * @param param 转换类
* @return {@link TInsuranceSettlePushParam} * @return {@link TInsuranceSettlePushParam}
*/ */
public static EKPInsurancePushParam insuranceDetail2PushParam(EKPInteractiveParam param){ public static EKPInsurancePushParam insuranceDetail2PushParam(EkpInteractiveParam param){
String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")); String format = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
EKPInsurancePushParam pushParam = new EKPInsurancePushParam(); EKPInsurancePushParam pushParam = new EKPInsurancePushParam();
param.setHappenDate(format); param.setHappenDate(format);
...@@ -106,7 +105,7 @@ public class EKPInsuranceUtil { ...@@ -106,7 +105,7 @@ public class EKPInsuranceUtil {
if(null != param.getSettleType()){ if(null != param.getSettleType()){
pushParam.setFd_3adfe6af71a1cc(param.getSettleType()); pushParam.setFd_3adfe6af71a1cc(param.getSettleType());
}else{ }else{
pushParam.setFd_3adfe6af71a1cc(CommonConstants.ZERO_INT); pushParam.setFd_3adfe6af71a1cc(CommonConstants.EMPTY_STRING);
} }
//项目编码 //项目编码
pushParam.setFd_3adfe658c6229e(param.getDeptNo()); pushParam.setFd_3adfe658c6229e(param.getDeptNo());
...@@ -230,7 +229,7 @@ public class EKPInsuranceUtil { ...@@ -230,7 +229,7 @@ public class EKPInsuranceUtil {
if(null != param.getInteractiveType()){ if(null != param.getInteractiveType()){
pushParam.setFd_3af9197b31071c(param.getInteractiveType()); pushParam.setFd_3af9197b31071c(param.getInteractiveType());
}else{ }else{
pushParam.setFd_3af9197b31071c(CommonConstants.ZERO_INT); pushParam.setFd_3af9197b31071c(CommonConstants.EMPTY_STRING);
} }
//有无预估 //有无预估
......
...@@ -13,12 +13,12 @@ public class EKPInsurancePushParam { ...@@ -13,12 +13,12 @@ public class EKPInsurancePushParam {
/** /**
* 单据类型 200 单选(1,预估单,2,实缴单,3,差异单) * 单据类型 200 单选(1,预估单,2,实缴单,3,差异单)
*/ */
private Integer fd_3adfe6af71a1cc; private String fd_3adfe6af71a1cc;
/** /**
* 交易类型 交易类型 1新增结算单,2作废结算信息,3更新保单信息 * 交易类型 交易类型 1新增结算单,2作废结算信息,3更新保单信息
*/ */
private Integer fd_3af9197b31071c; private String fd_3af9197b31071c;
/** /**
* 项目编码 200 * 项目编码 200
......
...@@ -136,5 +136,9 @@ public class EkpPushFundParam implements Serializable { ...@@ -136,5 +136,9 @@ public class EkpPushFundParam implements Serializable {
* 我司到款单位 * 我司到款单位
**/ **/
private String fd_3b019a2e9bfdd6; private String fd_3b019a2e9bfdd6;
/**
* 公积金id
**/
private String fd_3b0afbaf10df2c;
} }
\ No newline at end of file
...@@ -240,5 +240,9 @@ public class EkpPushSocialParam implements Serializable { ...@@ -240,5 +240,9 @@ public class EkpPushSocialParam implements Serializable {
* 我司到款单位 * 我司到款单位
**/ **/
private String fd_3b01953871b8be; private String fd_3b01953871b8be;
/**
* 社保id
**/
private String fd_3b0afbe1f94a08;
} }
\ No newline at end of file
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yifu.cloud.plus.v1.yifu.ekp.util.EKPInsuranceUtil,\ com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\ com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSalaryUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\ com.yifu.cloud.plus.v1.yifu.ekp.util.EkpSocialUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
\ No newline at end of file
insurance.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
insurance.insuranceFdModelId=181d73279372e5a55438a47d7436ab7e
insurance.insuranceFdFlowId=18267f206233f29cbd3c5ee425c9408a
insurance.insuranceDocStatus=20
insurance.insuranceLoginName=admin
insurance.insuranceFocSubject=\u85AA\u8D44\u8BA2\u5355\u660E\u7EC6\u6570\u636E\u63A5\u53E3
...@@ -4,11 +4,5 @@ ekp.fdFlowId=182b40249c1bc940d7226b941c7a4183 ...@@ -4,11 +4,5 @@ ekp.fdFlowId=182b40249c1bc940d7226b941c7a4183
ekp.docStatus=20 ekp.docStatus=20
ekp.LoginName=admin ekp.LoginName=admin
ekp.docSubject=\u85AA\u8D44\u8BA2\u5355\u660E\u7EC6\u6570\u636E\u63A5\u53E3 ekp.docSubject=\u85AA\u8D44\u8BA2\u5355\u660E\u7EC6\u6570\u636E\u63A5\u53E3
ekp.insuranceUrl=http://119.96.227.251:8080/api/sys-modeling/appModelRestService/addModel
ekp.insuranceFdModelId=181d73279372e5a55438a47d7436ab7e
ekp.insuranceFdFlowId=18267f206233f29cbd3c5ee425c9408a
ekp.insuranceDocStatus=20
ekp.insuranceLoginName=admin
ekp.insuranceFocSubject='??????'
...@@ -1025,6 +1025,31 @@ public class InsurancesConstants { ...@@ -1025,6 +1025,31 @@ public class InsurancesConstants {
public static final String BUY_TYPE_ERROR = "购买类型错误"; public static final String BUY_TYPE_ERROR = "购买类型错误";
/**
* 预估单
*/
public static final String ESTIMATE_SETTLE_BILL = "预估单";
/**
* 实缴单
*/
public static final String ACTUAL_SETTLE_BILL = "实缴单";
/**
* 新增结算单
*/
public static final String NEW_SETTLE_BILL = "新增结算单";
/**
* 结算中
*/
public static final String UPDATE_SETTLE_BILL = "更新结算单信息";
/**
* 结算中
*/
public static final String ABOLISH_SETTLE_BILL = "作废结算单信息";
} }
...@@ -15,7 +15,7 @@ import java.time.LocalDate; ...@@ -15,7 +15,7 @@ import java.time.LocalDate;
* @date 2022-08-09 11:09:12 * @date 2022-08-09 11:09:12
*/ */
@Data @Data
public class EKPInteractiveParam implements Serializable { public class EkpInteractiveParam implements Serializable {
private static final long serialVersionUID = -2689686777914935788L; private static final long serialVersionUID = -2689686777914935788L;
...@@ -43,7 +43,7 @@ public class EKPInteractiveParam implements Serializable { ...@@ -43,7 +43,7 @@ public class EKPInteractiveParam implements Serializable {
* 单据类型 (0、与薪资合并结算 1、单独结算) * 单据类型 (0、与薪资合并结算 1、单独结算)
*/ */
@Schema(description = "单据类型 (1、预估单 2、实缴单)") @Schema(description = "单据类型 (1、预估单 2、实缴单)")
private Integer settleType; private String settleType;
/** /**
* 项目编码 * 项目编码
...@@ -163,7 +163,7 @@ public class EKPInteractiveParam implements Serializable { ...@@ -163,7 +163,7 @@ public class EKPInteractiveParam implements Serializable {
* 单据状态 * 单据状态
*/ */
@Schema(description = "状态:1新增结算单,2更新结算单信息,3作废结算单信息") @Schema(description = "状态:1新增结算单,2更新结算单信息,3作废结算单信息")
private Integer interactiveType; private String interactiveType;
/** /**
* EKP推送类型 * EKP推送类型
......
...@@ -21,7 +21,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser; ...@@ -21,7 +21,7 @@ import com.yifu.cloud.plus.v1.yifu.common.core.vo.YifuUser;
import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil; import com.yifu.cloud.plus.v1.yifu.common.dapr.util.ArchivesDaprUtil;
import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils; import com.yifu.cloud.plus.v1.yifu.common.security.util.SecurityUtils;
import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants; import com.yifu.cloud.plus.v1.yifu.ekp.constant.EkpConstants;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EKPInsuranceUtil; import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil;
import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants; import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.*; import com.yifu.cloud.plus.v1.yifu.insurances.entity.*;
import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper; import com.yifu.cloud.plus.v1.yifu.insurances.mapper.insurances.TInsuranceDetailMapper;
...@@ -83,7 +83,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -83,7 +83,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
@Resource @Resource
private TInsuranceEkpService tInsuranceEkpService; private TInsuranceEkpService tInsuranceEkpService;
@Resource @Resource
private EKPInsuranceUtil eKPInsuranceUtil; private EkpInsuranceUtil eKPInsuranceUtil;
@Resource @Resource
private EkpSettleService ekpSettleService; private EkpSettleService ekpSettleService;
...@@ -3392,9 +3392,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3392,9 +3392,9 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//先更新本地状态再集中推送至EKP //先更新本地状态再集中推送至EKP
//当前保单结算信息不为空且已推送的情况下,推送EKP进行变更 //当前保单结算信息不为空且已推送的情况下,推送EKP进行变更
threadPool.execute(()->{ threadPool.execute(()->{
List<EKPInteractiveParam> deptDetail = getDeptDetail(ekpList); List<EkpInteractiveParam> deptDetail = getDeptDetail(ekpList);
for (EKPInteractiveParam ekpInteractiveParam : deptDetail) { for (EkpInteractiveParam ekpInteractiveParam : deptDetail) {
String body = eKPInsuranceUtil.sendToEKP(ekpInteractiveParam); String body = eKPInsuranceUtil.sendToEkp(ekpInteractiveParam);
if (!StringUtils.isBlank(body)){ if (!StringUtils.isBlank(body)){
TInsuranceOperate insuranceOperate = new TInsuranceOperate(); TInsuranceOperate insuranceOperate = new TInsuranceOperate();
insuranceOperate.setInsuranceDetailId(ekpInteractiveParam.getDetailId()); insuranceOperate.setInsuranceDetailId(ekpInteractiveParam.getDetailId());
...@@ -3449,7 +3449,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3449,7 +3449,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//预估保费 //预估保费
BigDecimal estimatePremium = success.getEstimatePremium(); BigDecimal estimatePremium = success.getEstimatePremium();
//EKP推送类 //EKP推送类
EKPInteractiveParam interactiveParam = new EKPInteractiveParam(); EkpInteractiveParam interactiveParam = new EkpInteractiveParam();
TInsuranceDetail one = getOne(lambdaQuery().getWrapper().eq(TInsuranceDetail::getId, success.getId())); TInsuranceDetail one = getOne(lambdaQuery().getWrapper().eq(TInsuranceDetail::getId, success.getId()));
BeanCopyUtils.copyProperties(one,interactiveParam); BeanCopyUtils.copyProperties(one,interactiveParam);
LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TInsuranceDetail> updateWrapper = new LambdaUpdateWrapper<>();
...@@ -3506,8 +3506,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3506,8 +3506,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getOldCustomerName()); interactiveParam.setCustomerName(success.getOldCustomerName());
interactiveParam.setDeptNo(success.getOldDeptNo()); interactiveParam.setDeptNo(success.getOldDeptNo());
interactiveParam.setDeptName(success.getOldDeptName()); interactiveParam.setDeptName(success.getOldDeptName());
interactiveParam.setInteractiveType(CommonConstants.THREE_INT); interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(deleteBody)) { if (StringUtils.isNotBlank(deleteBody)) {
//推送成功更新作废推送状态 //推送成功更新作废推送状态
cancel.setIsCancelPush(CommonConstants.ONE_INT); cancel.setIsCancelPush(CommonConstants.ONE_INT);
...@@ -3515,14 +3515,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3515,14 +3515,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//变更后为单独结算 //变更后为单独结算
if (CommonConstants.ONE_INT == newSettleType) { if (CommonConstants.ONE_INT == newSettleType) {
//推送新的结算信息至EKP //推送新的结算信息至EKP
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
interactiveParam.setCustomerCode(success.getNewCustomerCode()); interactiveParam.setCustomerCode(success.getNewCustomerCode());
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String addBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String addBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(addBody)){ if (StringUtils.isNotBlank(addBody)){
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT); newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
...@@ -3540,22 +3540,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3540,22 +3540,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
//推送预估单 //推送预估单
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(null); interactiveParam.setActualPremium(null);
interactiveParam.setSettleType(CommonConstants.ZERO_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
newInsuranceSettle.setUpdateTime(LocalDateTime.now()); newInsuranceSettle.setUpdateTime(LocalDateTime.now());
tInsuranceSettleService.updateById(newInsuranceSettle); tInsuranceSettleService.updateById(newInsuranceSettle);
//推送实缴单 //推送实缴单
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(null); interactiveParam.setEstimatePremium(null);
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -3577,14 +3577,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3577,14 +3577,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
//变更后为单独结算 //变更后为单独结算
if (CommonConstants.ONE_INT == newSettleType) { if (CommonConstants.ONE_INT == newSettleType) {
//推送新的结算信息至EKP //推送新的结算信息至EKP
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
interactiveParam.setCustomerCode(success.getNewCustomerCode()); interactiveParam.setCustomerCode(success.getNewCustomerCode());
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String addBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String addBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(addBody)){ if (StringUtils.isNotBlank(addBody)){
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT); newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
...@@ -3602,22 +3602,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3602,22 +3602,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
//推送预估单 //推送预估单
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(null); interactiveParam.setActualPremium(null);
interactiveParam.setSettleType(CommonConstants.ZERO_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
newInsuranceSettle.setUpdateTime(LocalDateTime.now()); newInsuranceSettle.setUpdateTime(LocalDateTime.now());
tInsuranceSettleService.updateById(newInsuranceSettle); tInsuranceSettleService.updateById(newInsuranceSettle);
//推送实缴单 //推送实缴单
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(null); interactiveParam.setEstimatePremium(null);
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -3661,11 +3661,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3661,11 +3661,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(null); interactiveParam.setActualPremium(null);
interactiveParam.setSettleType(CommonConstants.ZERO_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if(StringUtils.isNotBlank(estimateBody)){ if(StringUtils.isNotBlank(estimateBody)){
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
tInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); tInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -3713,11 +3713,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3713,11 +3713,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getOldCustomerName()); interactiveParam.setCustomerName(success.getOldCustomerName());
interactiveParam.setDeptNo(success.getOldDeptNo()); interactiveParam.setDeptNo(success.getOldDeptNo());
interactiveParam.setDeptName(success.getOldDeptName()); interactiveParam.setDeptName(success.getOldDeptName());
interactiveParam.setInteractiveType(CommonConstants.THREE_INT); interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
interactiveParam.setEstimatePremium(one.getEstimatePremium()); interactiveParam.setEstimatePremium(one.getEstimatePremium());
interactiveParam.setActualPremium(one.getActualPremium()); interactiveParam.setActualPremium(one.getActualPremium());
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if(StringUtils.isNotBlank(deleteBody)){ if(StringUtils.isNotBlank(deleteBody)){
//推送成功更新作废推送状态 //推送成功更新作废推送状态
cancel.setIsCancelPush(CommonConstants.ONE_INT); cancel.setIsCancelPush(CommonConstants.ONE_INT);
...@@ -3732,11 +3732,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3732,11 +3732,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
interactiveParam.setEstimatePremium(null); interactiveParam.setEstimatePremium(null);
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
String actualBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if(StringUtils.isNotBlank(actualBody)){ if(StringUtils.isNotBlank(actualBody)){
//推送成功,更新推送状态 //推送成功,更新推送状态
newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT); newInsuranceSettle.setIsActualPush(CommonConstants.ONE_INT);
...@@ -3755,11 +3755,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3755,11 +3755,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
interactiveParam.setEstimatePremium(null); interactiveParam.setEstimatePremium(null);
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String actualBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
//推送成功,更新预估和实际保费的推送状态 //推送成功,更新预估和实际保费的推送状态
if(StringUtils.isNotBlank(actualBody)){ if(StringUtils.isNotBlank(actualBody)){
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -3785,33 +3785,33 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3785,33 +3785,33 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getOldCustomerName()); interactiveParam.setCustomerName(success.getOldCustomerName());
interactiveParam.setDeptNo(success.getOldDeptNo()); interactiveParam.setDeptNo(success.getOldDeptNo());
interactiveParam.setDeptName(success.getOldDeptName()); interactiveParam.setDeptName(success.getOldDeptName());
interactiveParam.setInteractiveType(CommonConstants.THREE_INT); interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
interactiveParam.setEstimatePremium(one.getEstimatePremium()); interactiveParam.setEstimatePremium(one.getEstimatePremium());
interactiveParam.setActualPremium(one.getActualPremium()); interactiveParam.setActualPremium(one.getActualPremium());
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if(StringUtils.isNotBlank(deleteBody)){ if(StringUtils.isNotBlank(deleteBody)){
//先推送预估,再推送实际 //先推送预估,再推送实际
interactiveParam.setCustomerCode(success.getNewCustomerCode()); interactiveParam.setCustomerCode(success.getNewCustomerCode());
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
//推送预估单 //推送预估单
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(null); interactiveParam.setActualPremium(null);
interactiveParam.setSettleType(CommonConstants.ZERO_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
newInsuranceSettle.setUpdateTime(LocalDateTime.now()); newInsuranceSettle.setUpdateTime(LocalDateTime.now());
tInsuranceSettleService.updateById(newInsuranceSettle); tInsuranceSettleService.updateById(newInsuranceSettle);
//推送实缴单 //推送实缴单
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(null); interactiveParam.setEstimatePremium(null);
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -3835,22 +3835,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3835,22 +3835,22 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
//推送预估单 //推送预估单
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(null); interactiveParam.setActualPremium(null);
interactiveParam.setSettleType(CommonConstants.ZERO_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(estimateBody)) { if (StringUtils.isNotBlank(estimateBody)) {
newInsuranceSettle.setEstimatePushTime(LocalDateTime.now()); newInsuranceSettle.setEstimatePushTime(LocalDateTime.now());
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
newInsuranceSettle.setUpdateTime(LocalDateTime.now()); newInsuranceSettle.setUpdateTime(LocalDateTime.now());
tInsuranceSettleService.updateById(newInsuranceSettle); tInsuranceSettleService.updateById(newInsuranceSettle);
//推送实缴单 //推送实缴单
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
interactiveParam.setEstimatePremium(null); interactiveParam.setEstimatePremium(null);
interactiveParam.setActualPremium(success.getActualPremium()); interactiveParam.setActualPremium(success.getActualPremium());
String actualBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String actualBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(actualBody)) { if (StringUtils.isNotBlank(actualBody)) {
//推送成功后更新本地推送状态 //推送成功后更新本地推送状态
newInsuranceSettle.setActualPushTime(LocalDateTime.now()); newInsuranceSettle.setActualPushTime(LocalDateTime.now());
...@@ -3874,10 +3874,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3874,10 +3874,10 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getOldCustomerName()); interactiveParam.setCustomerName(success.getOldCustomerName());
interactiveParam.setDeptNo(success.getOldDeptNo()); interactiveParam.setDeptNo(success.getOldDeptNo());
interactiveParam.setDeptName(success.getOldDeptName()); interactiveParam.setDeptName(success.getOldDeptName());
interactiveParam.setInteractiveType(CommonConstants.THREE_INT); interactiveParam.setInteractiveType(InsurancesConstants.ABOLISH_SETTLE_BILL);
interactiveParam.setEstimatePremium(one.getEstimatePremium()); interactiveParam.setEstimatePremium(one.getEstimatePremium());
interactiveParam.setSettleType(CommonConstants.ZERO_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String deleteBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String deleteBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if (StringUtils.isNotBlank(deleteBody)){ if (StringUtils.isNotBlank(deleteBody)){
//推送成功后更新作废信息推送状态 //推送成功后更新作废信息推送状态
cancel.setIsCancelPush(CommonConstants.ONE_INT); cancel.setIsCancelPush(CommonConstants.ONE_INT);
...@@ -3908,11 +3908,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3908,11 +3908,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(null); interactiveParam.setActualPremium(null);
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if(StringUtils.isNotBlank(estimateBody)){ if(StringUtils.isNotBlank(estimateBody)){
//推送成功更新预估推送状态 //推送成功更新预估推送状态
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -3934,11 +3934,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -3934,11 +3934,11 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
interactiveParam.setCustomerName(success.getNewCustomerName()); interactiveParam.setCustomerName(success.getNewCustomerName());
interactiveParam.setDeptNo(success.getNewDeptNo()); interactiveParam.setDeptNo(success.getNewDeptNo());
interactiveParam.setDeptName(success.getNewDeptName()); interactiveParam.setDeptName(success.getNewDeptName());
interactiveParam.setInteractiveType(CommonConstants.ONE_INT); interactiveParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
interactiveParam.setEstimatePremium(success.getEstimatePremium()); interactiveParam.setEstimatePremium(success.getEstimatePremium());
interactiveParam.setActualPremium(null); interactiveParam.setActualPremium(null);
interactiveParam.setSettleType(CommonConstants.ONE_INT); interactiveParam.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
String estimateBody = eKPInsuranceUtil.sendToEKP(interactiveParam); String estimateBody = eKPInsuranceUtil.sendToEkp(interactiveParam);
if(StringUtils.isNotBlank(estimateBody)){ if(StringUtils.isNotBlank(estimateBody)){
//推送成功更新预估推送状态 //推送成功更新预估推送状态
newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT); newInsuranceSettle.setIsEstimatePush(CommonConstants.ONE_INT);
...@@ -5297,15 +5297,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5297,15 +5297,15 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* *
* @author zhaji * @author zhaji
* @param list * @param list
* @return {@link List< EKPInteractiveParam>} * @return {@link List< EkpInteractiveParam >}
*/ */
public List<EKPInteractiveParam> getDeptDetail(List<SettleMonthChangeCheckParam> list){ public List<EkpInteractiveParam> getDeptDetail(List<SettleMonthChangeCheckParam> list){
//根据项目编码获取项目名称 //根据项目编码获取项目名称
List<String> collect = list.stream().map(SettleMonthChangeCheckParam::getDeptNo).distinct().collect(Collectors.toList()); List<String> collect = list.stream().map(SettleMonthChangeCheckParam::getDeptNo).distinct().collect(Collectors.toList());
List<EKPInteractiveParam> ekpInteractiveParams = new ArrayList<>(); List<EkpInteractiveParam> ekpInteractiveParams = new ArrayList<>();
R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect); R<SetInfoVo> setInfoByCodes = archivesDaprUtil.getSetInfoByCodes(collect);
if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) { if (null != setInfoByCodes && setInfoByCodes.getCode() == CommonConstants.SUCCESS && Common.isNotNull(setInfoByCodes.getData())) {
EKPInteractiveParam ekpInteractiveParam = new EKPInteractiveParam(); EkpInteractiveParam ekpInteractiveParam = new EkpInteractiveParam();
Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap(); Map<String, ProjectSetInfoVo> data = setInfoByCodes.getData().getProjectSetInfoVoMap();
for (SettleMonthChangeCheckParam param : list) { for (SettleMonthChangeCheckParam param : list) {
ProjectSetInfoVo projectSetInfoVo = data.get(param.getDeptNo()); ProjectSetInfoVo projectSetInfoVo = data.get(param.getDeptNo());
...@@ -5331,7 +5331,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5331,7 +5331,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
public String pushEstimate(TInsuranceDetail tInsuranceDetail,Integer type){ public String pushEstimate(TInsuranceDetail tInsuranceDetail,Integer type){
Integer pushType = null; Integer pushType = null;
//1,推送预估保费,2,推送实际保费,3推送预估冲正保费,4更新实际保费 //1,推送预估保费,2,推送实际保费,3推送预估冲正保费,4更新实际保费
EKPInteractiveParam param = new EKPInteractiveParam(); EkpInteractiveParam param = new EkpInteractiveParam();
List<String> deptNoList =new ArrayList<>(); List<String> deptNoList =new ArrayList<>();
deptNoList.add(tInsuranceDetail.getDeptNo()); deptNoList.add(tInsuranceDetail.getDeptNo());
BeanCopyUtils.copyProperties(tInsuranceDetail,param); BeanCopyUtils.copyProperties(tInsuranceDetail,param);
...@@ -5354,14 +5354,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5354,14 +5354,14 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
} }
//1,推送预估保费(用户办理成功,推送预估保费) //1,推送预估保费(用户办理成功,推送预估保费)
if(CommonConstants.ONE_INT == type){ if(CommonConstants.ONE_INT == type){
param.setInteractiveType(CommonConstants.ONE_INT); param.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
param.setSettleType(CommonConstants.ONE_INT); param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
pushType = CommonConstants.ONE_INT; pushType = CommonConstants.ONE_INT;
} }
//2,推送实际保费(用于登记保单保费未推送过实缴保费) //2,推送实际保费(用于登记保单保费未推送过实缴保费)
if(CommonConstants.TWO_INT == type){ if(CommonConstants.TWO_INT == type){
param.setInteractiveType(CommonConstants.ONE_INT); param.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
param.setSettleType(CommonConstants.TWO_INT); param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
pushType = CommonConstants.TWO_INT; pushType = CommonConstants.TWO_INT;
} }
//3推送预估冲正保费(用于投保退回场景) //3推送预估冲正保费(用于投保退回场景)
...@@ -5375,21 +5375,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5375,21 +5375,21 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if(null != byId.getActualPremium()){ if(null != byId.getActualPremium()){
param.setActualPremium(byId.getActualPremium().negate()); param.setActualPremium(byId.getActualPremium().negate());
} }
param.setInteractiveType(CommonConstants.ONE_INT); param.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
param.setSettleType(CommonConstants.ONE_INT); param.setSettleType(InsurancesConstants.ESTIMATE_SETTLE_BILL);
pushType = CommonConstants.FIVE_INT; pushType = CommonConstants.FIVE_INT;
} }
//4更新实际保费(用于登记保单保费场景推送过实缴保费) //4更新实际保费(用于登记保单保费场景推送过实缴保费)
if(CommonConstants.FOUR_INT == type){ if(CommonConstants.FOUR_INT == type){
param.setInteractiveType(CommonConstants.TWO_INT); param.setInteractiveType(InsurancesConstants.UPDATE_SETTLE_BILL);
param.setSettleType(CommonConstants.ONE_INT); param.setSettleType(InsurancesConstants.ACTUAL_SETTLE_BILL);
pushType = CommonConstants.SEVEN_INT; pushType = CommonConstants.SEVEN_INT;
} }
if(StringUtils.isBlank(eKPInsuranceUtil.sendToEKP(param))){ if(StringUtils.isBlank(eKPInsuranceUtil.sendToEkp(param))){
saveInsuranceEkp(param,pushType); saveInsuranceEkp(param,pushType);
return null; return null;
}else { }else {
return eKPInsuranceUtil.sendToEKP(param); return eKPInsuranceUtil.sendToEkp(param);
} }
} }
...@@ -5414,7 +5414,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap ...@@ -5414,7 +5414,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
* @param * @param
* @return {@link String} * @return {@link String}
*/ */
public Boolean saveInsuranceEkp(EKPInteractiveParam param,Integer pushType){ public Boolean saveInsuranceEkp(EkpInteractiveParam param, Integer pushType){
TInsuranceEkp ekp = new TInsuranceEkp(); TInsuranceEkp ekp = new TInsuranceEkp();
BeanCopyUtils.copyProperties(param,ekp); BeanCopyUtils.copyProperties(param,ekp);
ekp.setId(null); ekp.setId(null);
......
...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; ...@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.R; import com.yifu.cloud.plus.v1.yifu.common.core.util.R;
import com.yifu.cloud.plus.v1.yifu.ekp.util.EKPInsuranceUtil; import com.yifu.cloud.plus.v1.yifu.ekp.util.EkpInsuranceUtil;
import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants; import com.yifu.cloud.plus.v1.yifu.insurances.constants.InsurancesConstants;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceDetail;
import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp; import com.yifu.cloud.plus.v1.yifu.insurances.entity.TInsuranceEkp;
...@@ -17,12 +17,11 @@ import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpSer ...@@ -17,12 +17,11 @@ import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceEkpSer
import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService; import com.yifu.cloud.plus.v1.yifu.insurances.service.insurance.TInsuranceSettleService;
import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils; import com.yifu.cloud.plus.v1.yifu.insurances.util.BeanCopyUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.util.BigDecimalUtils; import com.yifu.cloud.plus.v1.yifu.insurances.util.BigDecimalUtils;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.EKPInteractiveParam; import com.yifu.cloud.plus.v1.yifu.insurances.vo.EkpInteractiveParam;
import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo; import com.yifu.cloud.plus.v1.yifu.insurances.vo.SettleVo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -42,7 +41,7 @@ import java.util.List; ...@@ -42,7 +41,7 @@ import java.util.List;
public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService { public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService {
@Resource @Resource
EKPInsuranceUtil eKPInsuranceUtil; EkpInsuranceUtil ekpInsuranceUtil;
@Resource @Resource
TInsuranceSettleService tInsuranceSettleService; TInsuranceSettleService tInsuranceSettleService;
...@@ -84,10 +83,10 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T ...@@ -84,10 +83,10 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
failList.add(tInsuranceEkp); failList.add(tInsuranceEkp);
continue; continue;
} }
EKPInteractiveParam ekpParam = new EKPInteractiveParam(); EkpInteractiveParam ekpParam = new EkpInteractiveParam();
BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam); BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
if(actualStatus.equals(InsurancesConstants.SETTLE_ZERO)){ if(actualStatus.equals(InsurancesConstants.SETTLE_ZERO)){
String s = eKPInsuranceUtil.sendToEKP(ekpParam); String s = ekpInsuranceUtil.sendToEkp(ekpParam);
//如果发送成功 //如果发送成功
if (StringUtils.isNotBlank(s)){ if (StringUtils.isNotBlank(s)){
//预估则更新预估保费 //预估则更新预估保费
...@@ -133,8 +132,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T ...@@ -133,8 +132,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if(!BigDecimalUtils.isNullOrZero(actualPremium)){ if(!BigDecimalUtils.isNullOrZero(actualPremium)){
ekpParam.setActualPremium(actualPremium.negate()); ekpParam.setActualPremium(actualPremium.negate());
} }
ekpParam.setInteractiveType(CommonConstants.ONE_INT); ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
String s = eKPInsuranceUtil.sendToEKP(ekpParam); String s = ekpInsuranceUtil.sendToEkp(ekpParam);
if(StringUtils.isNotBlank(s)){ if(StringUtils.isNotBlank(s)){
tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT); tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
successLit.add(tInsuranceEkp); successLit.add(tInsuranceEkp);
...@@ -143,7 +142,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T ...@@ -143,7 +142,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
} }
//如果为红冲数据则正常发送 //如果为红冲数据则正常发送
}else if(CommonConstants.FIVE_INT == pushType || CommonConstants.SIX_INT == pushType){ }else if(CommonConstants.FIVE_INT == pushType || CommonConstants.SIX_INT == pushType){
String s = eKPInsuranceUtil.sendToEKP(ekpParam); String s = ekpInsuranceUtil.sendToEkp(ekpParam);
if(StringUtils.isNotBlank(s)){ if(StringUtils.isNotBlank(s)){
tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT); tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
successLit.add(tInsuranceEkp); successLit.add(tInsuranceEkp);
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity; package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -47,7 +48,7 @@ public class TStatisticsBonus { ...@@ -47,7 +48,7 @@ public class TStatisticsBonus {
* ID * ID
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("ID") @ExcelIgnore
@Schema(description = "ID") @Schema(description = "ID")
private String id; private String id;
/** /**
...@@ -61,10 +62,10 @@ public class TStatisticsBonus { ...@@ -61,10 +62,10 @@ public class TStatisticsBonus {
/** /**
* 申报月份(YYYYMM) * 申报月份(YYYYMM)
*/ */
@ExcelAttribute(name = "申报月份(YYYYMM)", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6) @ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6)
@NotBlank(message = "申报月份(YYYYMM)不能为空") @NotBlank(message = "申报月份(YYYYMM)不能为空")
@Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符") @Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符")
@ExcelProperty("申报月份(YYYYMM)") @ExcelProperty("申报月份")
@Schema(description = "申报月份(YYYYMM)") @Schema(description = "申报月份(YYYYMM)")
private String declareMonth; private String declareMonth;
/** /**
...@@ -78,9 +79,9 @@ public class TStatisticsBonus { ...@@ -78,9 +79,9 @@ public class TStatisticsBonus {
/** /**
* 身份证号 * 身份证号
*/ */
@ExcelAttribute(name = "身份证号", maxLength = 32) @ExcelAttribute(name = "证件号码", maxLength = 32)
@Length(max = 32, message = "身份证号不能超过32个字符") @Length(max = 32, message = "身份证号不能超过32个字符")
@ExcelProperty("身份证号") @ExcelProperty("证件号码")
@Schema(description = "身份证号") @Schema(description = "身份证号")
private String empIdcard; private String empIdcard;
/** /**
......
...@@ -71,9 +71,9 @@ public class TStatisticsCurrentReport { ...@@ -71,9 +71,9 @@ public class TStatisticsCurrentReport {
/** /**
* 身份证号 * 身份证号
*/ */
@ExcelAttribute(name = "身份证号", maxLength = 25) @ExcelAttribute(name = "身份证号", maxLength = 25)
@Length(max = 25, message = "身份证号不能超过25个字符") @Length(max = 25, message = "身份证号不能超过25个字符")
@ExcelProperty("身份证号") @ExcelProperty("身份证号")
private String empIdcard; private String empIdcard;
/** /**
* 本期收入 * 本期收入
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity; package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -44,7 +45,7 @@ public class TStatisticsLabor { ...@@ -44,7 +45,7 @@ public class TStatisticsLabor {
* ID * ID
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("ID") @ExcelIgnore
private String id; private String id;
/** /**
* 申报单位 * 申报单位
...@@ -56,10 +57,10 @@ public class TStatisticsLabor { ...@@ -56,10 +57,10 @@ public class TStatisticsLabor {
/** /**
* 申报月份(YYYYMM) * 申报月份(YYYYMM)
*/ */
@ExcelAttribute(name = "申报月份(YYYYMM)", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6) @ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份不能为空", maxLength = 6)
@NotBlank(message = "申报月份(YYYYMM)不能为空") @NotBlank(message = "申报月份(YYYYMM)不能为空")
@Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符") @Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符")
@ExcelProperty("申报月份(YYYYMM)") @ExcelProperty("申报月份")
private String declareMonth; private String declareMonth;
/** /**
* 员工姓名 * 员工姓名
...@@ -71,9 +72,9 @@ public class TStatisticsLabor { ...@@ -71,9 +72,9 @@ public class TStatisticsLabor {
/** /**
* 身份证号 * 身份证号
*/ */
@ExcelAttribute(name = "身份证号", maxLength = 32) @ExcelAttribute(name = "证件号码", maxLength = 32)
@Length(max = 32, message = "身份证号不能超过32个字符") @Length(max = 32, message = "身份证号不能超过32个字符")
@ExcelProperty("身份证号") @ExcelProperty("证件号码")
private String empIdcard; private String empIdcard;
/** /**
* 证件类型 * 证件类型
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity; package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
...@@ -44,7 +45,7 @@ public class TStatisticsRemuneration { ...@@ -44,7 +45,7 @@ public class TStatisticsRemuneration {
* ID * ID
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("ID") @ExcelIgnore
private String id; private String id;
/** /**
* 申报单位 * 申报单位
...@@ -56,10 +57,10 @@ public class TStatisticsRemuneration { ...@@ -56,10 +57,10 @@ public class TStatisticsRemuneration {
/** /**
* 申报月份(YYYYMM) * 申报月份(YYYYMM)
*/ */
@ExcelAttribute(name = "申报月份(YYYYMM)", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6) @ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份不能为空", maxLength = 6)
@NotBlank(message = "申报月份(YYYYMM)不能为空") @NotBlank(message = "申报月份(YYYYMM)不能为空")
@Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符") @Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符")
@ExcelProperty("申报月份(YYYYMM)") @ExcelProperty("申报月份")
private String declareMonth; private String declareMonth;
/** /**
* 员工姓名 * 员工姓名
......
...@@ -278,7 +278,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -278,7 +278,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
} else { } else {
//年终奖单独扣税 //年终奖单独扣税
finalSalaryNoSalary = calculationSalary(annousTax,infoVo.getAnnualBonus()); finalSalaryNoSalary = calculationSalary(annousTax,infoVo.getAnnualBonus());
BigDecimal annualTSalary = calculationSalaryT(personTax,infoVo.getAnnualTSalary(),sumTax); BigDecimal annualTSalary = calculationSalaryT(personTax,infoVo.getAnnualTSalary());
finalSalaryNoSalary = BigDecimalUtils.safeAdd(finalSalaryNoSalary,annualTSalary); finalSalaryNoSalary = BigDecimalUtils.safeAdd(finalSalaryNoSalary,annualTSalary);
wSalary = BigDecimalUtils.safeAdd(infoVo.getAnnualBonus(), infoVo.getAnnualTSalary()); wSalary = BigDecimalUtils.safeAdd(infoVo.getAnnualBonus(), infoVo.getAnnualTSalary());
finalSalaryWithSalary = calculationSalary(annousTax, wSalary); finalSalaryWithSalary = calculationSalary(annousTax, wSalary);
...@@ -491,7 +491,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -491,7 +491,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
} }
/** /**
* @param annousTax 年终奖扣税阶梯表list * @param annousTax 薪资扣税阶梯表list
* @param annualSalary 年终奖 * @param annualSalary 年终奖
* @Description: 计算薪资扣税-个税 * @Description: 计算薪资扣税-个税
* @Author: huyc * @Author: huyc
...@@ -528,7 +528,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -528,7 +528,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
* @Date: 2022/8/23 * @Date: 2022/8/23
* @return: java.math.BigDecimal * @return: java.math.BigDecimal
**/ **/
private static BigDecimal calculationSalaryT(List<TSalaryTaxConfig> personTax, BigDecimal annualSalary, BigDecimal sumTax) { private static BigDecimal calculationSalaryT(List<TSalaryTaxConfig> personTax, BigDecimal annualSalary) {
//本次年终奖纳税额 //本次年终奖纳税额
BigDecimal res = BigDecimal.ZERO; BigDecimal res = BigDecimal.ZERO;
//计算年终奖税 //计算年终奖税
...@@ -539,7 +539,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap ...@@ -539,7 +539,7 @@ public class TStatisticsBonusServiceImpl extends ServiceImpl<TStatisticsBonusMap
//annualSalary = realDeduSalary * ((double) ((annualSalary.getTaxRate() * 1.0) / 100)) - sumTax - sub.getQuick(); //annualSalary = realDeduSalary * ((double) ((annualSalary.getTaxRate() * 1.0) / 100)) - sumTax - sub.getQuick();
res = annualSalary.multiply(new BigDecimal(sub.getWithholdingRate()).divide( res = annualSalary.multiply(new BigDecimal(sub.getWithholdingRate()).divide(
SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP)) SalaryConstants.B_ONEHUNDRED, SalaryConstants.PLACES, BigDecimal.ROUND_HALF_UP))
.subtract(sumTax).subtract(sub.getQuickDeducation());// 应纳税额 .subtract(sub.getQuickDeducation());// 应纳税额
break; break;
} }
} }
......
...@@ -153,7 +153,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics ...@@ -153,7 +153,7 @@ public class TStatisticsCurrentReportServiceImpl extends ServiceImpl<TStatistics
} }
private LambdaQueryWrapper buildQueryWrapper(TStatisticsCurrentReportSearchVo entity) { private LambdaQueryWrapper buildQueryWrapper(TStatisticsCurrentReportSearchVo entity) {
LambdaQueryWrapper<TStatisticsCurrentReport> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<TStatisticsCurrentReport> wrapper = Wrappers.lambdaQuery(entity);
return wrapper; return wrapper;
} }
......
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
left join t_salary_account_item annualBonusTax on annualBonusTax.SALARY_ACCOUNT_ID = a.id and annualBonusTax.JAVA_FIED_NAME='annualBonusTax' left join t_salary_account_item annualBonusTax on annualBonusTax.SALARY_ACCOUNT_ID = a.id and annualBonusTax.JAVA_FIED_NAME='annualBonusTax'
left join t_salary_account_item annualBonus on annualBonus.SALARY_ACCOUNT_ID = a.id and annualBonus.JAVA_FIED_NAME='annualBonus' left join t_salary_account_item annualBonus on annualBonus.SALARY_ACCOUNT_ID = a.id and annualBonus.JAVA_FIED_NAME='annualBonus'
where where
a.SETTLEMENT_MONTH = #{lastMonth} and a.DELETE_FLAG = 0 and a.FORM_TYPE != '7' and a.FORM_TYPE != '3' and s.DELETE_FLAG = 0 a.SETTLEMENT_MONTH = #{lastMonth} and a.DELETE_FLAG = 0 and a.FORM_TYPE != '7' and a.FORM_TYPE != '3' and a.FORM_TYPE != '4' and s.DELETE_FLAG = 0
GROUP BY a.EMP_IDCARD,a.INVOICE_TITLE,a.SETTLEMENT_MONTH) GROUP BY a.EMP_IDCARD,a.INVOICE_TITLE,a.SETTLEMENT_MONTH)
</insert> </insert>
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<!--统计--> <!--统计-->
<select id="doStatisticsLabor" resultMap="tStatisticsLaborMap"> <select id="doStatisticsLabor" resultMap="tStatisticsLaborMap">
select select
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,sum(a.ACTUAL_SALARY) INCOME, #{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX + a.SALARY_TAX_UNIT) PERSONAL_TAX,sum(a.RELAY_SALARY_UNIT) INCOME,
a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE a.INVOICE_TITLE DECLARE_UNIT,'一般劳务报酬所得' INCOME_ITEM,'居民身份证' CARD_TYPE
from t_salary_account a from t_salary_account a
where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '3' where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '3'
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<select id="doStatisticsRemuneration" resultMap="tStatisticsRemunerationMap"> <select id="doStatisticsRemuneration" resultMap="tStatisticsRemunerationMap">
select select
#{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX, #{nowMonth} DECLARE_MONTH,a.EMP_NAME,a.EMP_IDCARD,sum(a.SALARY_TAX) PERSONAL_TAX,
sum(a.ACTUAL_SALARY) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE sum(a.SALARY_TAX_UNIT) INCOME,a.INVOICE_TITLE DECLARE_UNIT,'居民身份证' CARD_TYPE
from t_salary_account a from t_salary_account a
where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '4' where a.DELETE_FLAG = 0 and a.SETTLEMENT_MONTH = #{lastMonth} and a.FORM_TYPE = '4'
GROUP BY a.EMP_IDCARD,DECLARE_UNIT GROUP BY a.EMP_IDCARD,DECLARE_UNIT
......
...@@ -2380,6 +2380,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2380,6 +2380,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING); socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING);
//我司到款单位 //我司到款单位
socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING); socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
//社保id
socialParam.setFd_3b0afbe1f94a08(library.getId());
String body = ekpSocialUtil.sendToEKP(socialParam); String body = ekpSocialUtil.sendToEKP(socialParam);
if (Common.isNotNull(body)) { if (Common.isNotNull(body)) {
...@@ -2484,6 +2486,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap ...@@ -2484,6 +2486,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//我司到款单位 //我司到款单位
fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING); fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING);
//公积金id
fundParam.setFd_3b0afbaf10df2c(library.getId());
String body = ekpFundUtil.sendToEKP(fundParam); String body = ekpFundUtil.sendToEKP(fundParam);
if (Common.isNotNull(body)) { if (Common.isNotNull(body)) {
......
...@@ -2447,6 +2447,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2447,6 +2447,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
} }
//我司到款单位 //我司到款单位
socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING); socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
//社保id
socialParam.setFd_3b0afbe1f94a08(library.getId());
String body = ekpSocialUtil.sendToEKP(socialParam); String body = ekpSocialUtil.sendToEKP(socialParam);
if (Common.isNotNull(body)) { if (Common.isNotNull(body)) {
...@@ -2551,6 +2553,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa ...@@ -2551,6 +2553,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING); fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//我司到款单位 //我司到款单位
fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING); fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING);
//公积金id
fundParam.setFd_3b0afbaf10df2c(library.getId());
String body = ekpFundUtil.sendToEKP(fundParam); String body = ekpFundUtil.sendToEKP(fundParam);
if (Common.isNotNull(body)) { if (Common.isNotNull(body)) {
......
...@@ -156,9 +156,6 @@ ...@@ -156,9 +156,6 @@
a.UNIT_UNEMPLOYMENT_SET, a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_INJURY_SET, a.UNIT_INJURY_SET,
a.UNIT_BIRTH_SET, a.UNIT_BIRTH_SET,
a.PERSONAL_PENSION_SET,
a.PERSONAL_MEDICAL_SET,
a.PERSONAL_UNEMPLOYMENT_SET,
a.UNIT_PENSION_PER, a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_PER, a.UNIT_MEDICAL_PER,
a.UNIT_UNEMPLOYMENT_PER, a.UNIT_UNEMPLOYMENT_PER,
...@@ -240,9 +237,6 @@ ...@@ -240,9 +237,6 @@
a.UNIT_UNEMPLOYMENT_SET, a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_INJURY_SET, a.UNIT_INJURY_SET,
a.UNIT_BIRTH_SET, a.UNIT_BIRTH_SET,
a.PERSONAL_PENSION_SET,
a.PERSONAL_MEDICAL_SET,
a.PERSONAL_UNEMPLOYMENT_SET,
a.UNIT_PENSION_PER, a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_PER, a.UNIT_MEDICAL_PER,
a.UNIT_UNEMPLOYMENT_PER, a.UNIT_UNEMPLOYMENT_PER,
......
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