Commit 311e35c6 authored by huyuchen's avatar huyuchen

劳务费稿酬生成修改

parent 059f5931
...@@ -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
...@@ -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;
/** /**
......
...@@ -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;
/** /**
* 员工姓名 * 员工姓名
......
...@@ -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(CommonConstants.EMPTY_STRING);
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(CommonConstants.EMPTY_STRING);
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