Commit eeb1eb62 authored by hongguangwu's avatar hongguangwu

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

parents 32757702 a76d4d7f
......@@ -105,7 +105,7 @@ public class EkpInsuranceUtil {
if(null != param.getSettleType()){
pushParam.setFd_3adfe6af71a1cc(param.getSettleType());
}else{
pushParam.setFd_3adfe6af71a1cc(CommonConstants.ZERO_INT);
pushParam.setFd_3adfe6af71a1cc(CommonConstants.EMPTY_STRING);
}
//项目编码
pushParam.setFd_3adfe658c6229e(param.getDeptNo());
......@@ -229,7 +229,7 @@ public class EkpInsuranceUtil {
if(null != param.getInteractiveType()){
pushParam.setFd_3af9197b31071c(param.getInteractiveType());
}else{
pushParam.setFd_3af9197b31071c(CommonConstants.ZERO_INT);
pushParam.setFd_3af9197b31071c(CommonConstants.EMPTY_STRING);
}
//有无预估
......
......@@ -13,12 +13,12 @@ public class EKPInsurancePushParam {
/**
* 单据类型 200 单选(1,预估单,2,实缴单,3,差异单)
*/
private Integer fd_3adfe6af71a1cc;
private String fd_3adfe6af71a1cc;
/**
* 交易类型 交易类型 1新增结算单,2作废结算信息,3更新保单信息
*/
private Integer fd_3af9197b31071c;
private String fd_3af9197b31071c;
/**
* 项目编码 200
......
......@@ -136,5 +136,9 @@ public class EkpPushFundParam implements Serializable {
* 我司到款单位
**/
private String fd_3b019a2e9bfdd6;
/**
* 公积金id
**/
private String fd_3b0afbaf10df2c;
}
\ No newline at end of file
......@@ -240,5 +240,9 @@ public class EkpPushSocialParam implements Serializable {
* 我司到款单位
**/
private String fd_3b01953871b8be;
/**
* 社保id
**/
private String fd_3b0afbe1f94a08;
}
\ No newline at end of file
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.EkpSocialUtil,\
com.yifu.cloud.plus.v1.yifu.ekp.util.EkpFundUtil
\ No newline at end of file
......@@ -1025,6 +1025,31 @@ public class InsurancesConstants {
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 = "作废结算单信息";
}
......@@ -43,7 +43,7 @@ public class EkpInteractiveParam implements Serializable {
* 单据类型 (0、与薪资合并结算 1、单独结算)
*/
@Schema(description = "单据类型 (1、预估单 2、实缴单)")
private Integer settleType;
private String settleType;
/**
* 项目编码
......@@ -163,7 +163,7 @@ public class EkpInteractiveParam implements Serializable {
* 单据状态
*/
@Schema(description = "状态:1新增结算单,2更新结算单信息,3作废结算单信息")
private Integer interactiveType;
private String interactiveType;
/**
* EKP推送类型
......
......@@ -41,7 +41,7 @@ import java.util.List;
public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, TInsuranceEkp> implements TInsuranceEkpService {
@Resource
EkpInsuranceUtil eKPInsuranceUtil;
EkpInsuranceUtil ekpInsuranceUtil;
@Resource
TInsuranceSettleService tInsuranceSettleService;
......@@ -86,7 +86,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
EkpInteractiveParam ekpParam = new EkpInteractiveParam();
BeanCopyUtils.copyProperties(tInsuranceEkp,ekpParam);
if(actualStatus.equals(InsurancesConstants.SETTLE_ZERO)){
String s = eKPInsuranceUtil.sendToEkp(ekpParam);
String s = ekpInsuranceUtil.sendToEkp(ekpParam);
//如果发送成功
if (StringUtils.isNotBlank(s)){
//预估则更新预估保费
......@@ -132,8 +132,8 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
if(!BigDecimalUtils.isNullOrZero(actualPremium)){
ekpParam.setActualPremium(actualPremium.negate());
}
ekpParam.setInteractiveType(CommonConstants.ONE_INT);
String s = eKPInsuranceUtil.sendToEkp(ekpParam);
ekpParam.setInteractiveType(InsurancesConstants.NEW_SETTLE_BILL);
String s = ekpInsuranceUtil.sendToEkp(ekpParam);
if(StringUtils.isNotBlank(s)){
tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
successLit.add(tInsuranceEkp);
......@@ -142,7 +142,7 @@ public class TInsuranceEkpServiceImpl extends ServiceImpl<TInsuranceEkpMapper, T
}
//如果为红冲数据则正常发送
}else if(CommonConstants.FIVE_INT == pushType || CommonConstants.SIX_INT == pushType){
String s = eKPInsuranceUtil.sendToEkp(ekpParam);
String s = ekpInsuranceUtil.sendToEkp(ekpParam);
if(StringUtils.isNotBlank(s)){
tInsuranceEkp.setResendFlag(CommonConstants.ONE_INT);
successLit.add(tInsuranceEkp);
......
......@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......@@ -47,7 +48,7 @@ public class TStatisticsBonus {
* ID
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("ID")
@ExcelIgnore
@Schema(description = "ID")
private String id;
/**
......@@ -61,10 +62,10 @@ public class TStatisticsBonus {
/**
* 申报月份(YYYYMM)
*/
@ExcelAttribute(name = "申报月份(YYYYMM)", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6)
@ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6)
@NotBlank(message = "申报月份(YYYYMM)不能为空")
@Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符")
@ExcelProperty("申报月份(YYYYMM)")
@ExcelProperty("申报月份")
@Schema(description = "申报月份(YYYYMM)")
private String declareMonth;
/**
......@@ -78,9 +79,9 @@ public class TStatisticsBonus {
/**
* 身份证号
*/
@ExcelAttribute(name = "身份证号", maxLength = 32)
@ExcelAttribute(name = "证件号码", maxLength = 32)
@Length(max = 32, message = "身份证号不能超过32个字符")
@ExcelProperty("身份证号")
@ExcelProperty("证件号码")
@Schema(description = "身份证号")
private String empIdcard;
/**
......
......@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......@@ -44,7 +45,7 @@ public class TStatisticsLabor {
* ID
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("ID")
@ExcelIgnore
private String id;
/**
* 申报单位
......@@ -56,10 +57,10 @@ public class TStatisticsLabor {
/**
* 申报月份(YYYYMM)
*/
@ExcelAttribute(name = "申报月份(YYYYMM)", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6)
@ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份不能为空", maxLength = 6)
@NotBlank(message = "申报月份(YYYYMM)不能为空")
@Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符")
@ExcelProperty("申报月份(YYYYMM)")
@ExcelProperty("申报月份")
private String declareMonth;
/**
* 员工姓名
......@@ -71,9 +72,9 @@ public class TStatisticsLabor {
/**
* 身份证号
*/
@ExcelAttribute(name = "身份证号", maxLength = 32)
@ExcelAttribute(name = "证件号码", maxLength = 32)
@Length(max = 32, message = "身份证号不能超过32个字符")
@ExcelProperty("身份证号")
@ExcelProperty("证件号码")
private String empIdcard;
/**
* 证件类型
......
......@@ -17,6 +17,7 @@
package com.yifu.cloud.plus.v1.yifu.salary.entity;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
......@@ -44,7 +45,7 @@ public class TStatisticsRemuneration {
* ID
*/
@TableId(type = IdType.ASSIGN_ID)
@ExcelProperty("ID")
@ExcelIgnore
private String id;
/**
* 申报单位
......@@ -56,10 +57,10 @@ public class TStatisticsRemuneration {
/**
* 申报月份(YYYYMM)
*/
@ExcelAttribute(name = "申报月份(YYYYMM)", isNotEmpty = true, errorInfo = "申报月份(YYYYMM)不能为空", maxLength = 6)
@ExcelAttribute(name = "申报月份", isNotEmpty = true, errorInfo = "申报月份不能为空", maxLength = 6)
@NotBlank(message = "申报月份(YYYYMM)不能为空")
@Length(max = 6, message = "申报月份(YYYYMM)不能超过6个字符")
@ExcelProperty("申报月份(YYYYMM)")
@ExcelProperty("申报月份")
private String declareMonth;
/**
* 员工姓名
......
......@@ -2380,6 +2380,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
socialParam.setFd_3af9ee3d0ba3b6(CommonConstants.EMPTY_STRING);
//我司到款单位
socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
//社保id
socialParam.setFd_3b0afbe1f94a08(library.getId());
String body = ekpSocialUtil.sendToEKP(socialParam);
if (Common.isNotNull(body)) {
......@@ -2484,6 +2486,8 @@ public class TForecastLibraryServiceImpl extends ServiceImpl<TForecastLibraryMap
fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//我司到款单位
fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING);
//公积金id
fundParam.setFd_3b0afbaf10df2c(library.getId());
String body = ekpFundUtil.sendToEKP(fundParam);
if (Common.isNotNull(body)) {
......
......@@ -2447,6 +2447,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
}
//我司到款单位
socialParam.setFd_3b01953871b8be(CommonConstants.EMPTY_STRING);
//社保id
socialParam.setFd_3b0afbe1f94a08(library.getId());
String body = ekpSocialUtil.sendToEKP(socialParam);
if (Common.isNotNull(body)) {
......@@ -2551,6 +2553,8 @@ public class TPaymentInfoServiceImpl extends ServiceImpl<TPaymentInfoMapper, TPa
fundParam.setFd_3adfeb84175f28(CommonConstants.EMPTY_STRING);
//我司到款单位
fundParam.setFd_3b019a2e9bfdd6(CommonConstants.EMPTY_STRING);
//公积金id
fundParam.setFd_3b0afbaf10df2c(library.getId());
String body = ekpFundUtil.sendToEKP(fundParam);
if (Common.isNotNull(body)) {
......
......@@ -156,9 +156,6 @@
a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_INJURY_SET,
a.UNIT_BIRTH_SET,
a.PERSONAL_PENSION_SET,
a.PERSONAL_MEDICAL_SET,
a.PERSONAL_UNEMPLOYMENT_SET,
a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_PER,
a.UNIT_UNEMPLOYMENT_PER,
......@@ -240,9 +237,6 @@
a.UNIT_UNEMPLOYMENT_SET,
a.UNIT_INJURY_SET,
a.UNIT_BIRTH_SET,
a.PERSONAL_PENSION_SET,
a.PERSONAL_MEDICAL_SET,
a.PERSONAL_UNEMPLOYMENT_SET,
a.UNIT_PENSION_PER,
a.UNIT_MEDICAL_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