diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
index b3296596e..45de6f2ab 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
@@ -1,6 +1,7 @@
package com.engine.salary.entity.siaccount.po;
import com.engine.salary.annotation.Encrypt;
+import com.engine.salary.elog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -20,94 +21,112 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
//hrsa_bill_batch
+@ElogTransform(name = "福利台账主表")
public class InsuranceAccountBatchPO {
/**
* 主键id
*/
+ @ElogTransform(name = "主键id")
private Long id;
/**
* 账单月份
*/
+ @ElogTransform(name = "账单月份")
private String billMonth;
/**
* 账单状态 0-未归档 1-已归档
*/
+ @ElogTransform(name = "账单状态")
private Integer billStatus;
/**
* 社保核算人数
*/
+ @ElogTransform(name = "社保核算人数")
private Integer socialNum;
/**
* 公积金核算人数
*/
+ @ElogTransform(name = "公积金核算人数")
private Integer fundNum;
/**
* 其他福利核算人数
*/
+ @ElogTransform(name = "其他福利核算人数")
private Integer otherNum;
/**
* 社保缴费总额(单位+个人)
*/
@Encrypt
+ @ElogTransform(name = "社保缴费总额(单位+个人)")
private String socialPay;
/**
* 公积金缴费总额(单位+个人)
*/
@Encrypt
+ @ElogTransform(name = "公积金缴费总额(单位+个人)")
private String fundPay;
/**
* 其他福利缴费总额(单位+个人)
*/
@Encrypt
+ @ElogTransform(name = "其他福利缴费总额(单位+个人)")
private String otherPay;
/**
* 核算人
*/
+ @ElogTransform(name = "核算人")
private String accountant;
/**
* 备注
*/
+ @ElogTransform(name = "备注")
private String remarks;
/**
* 创建人id
*/
+ @ElogTransform(name = "创建人id")
private Long creator;
/**
* 是否删除
*/
+ @ElogTransform(name = "是否删除")
private Integer deleteType;
/**
* 创建时间
*/
+ @ElogTransform(name = "创建时间")
private Date createTime;
/**
* 更新时间
*/
+ @ElogTransform(name = "更新时间")
private Date updateTime;
/**
* 租户key
*/
+ @ElogTransform(name = "租户key")
private String tenantKey;
/**
* 个税扣缴义务人
*/
+ @ElogTransform(name = "个税扣缴义务人id")
private Long paymentOrganization;
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
index 9cd2ad7f0..9b7c33cef 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
@@ -3,6 +3,7 @@ package com.engine.salary.entity.siaccount.po;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryTable;
+import com.engine.salary.elog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -23,260 +24,308 @@ import java.util.Date;
@AllArgsConstructor
@SalaryTable(pageId = "2394fba1-1381-428a-8532-4e1e6b86626e", tableType = WeaTableType.CHECKBOX)
//hrsa_bill_detail
+@ElogTransform(name = "福利台账明细表")
public class InsuranceAccountDetailPO {
/**
* 主键id
*/
+ @ElogTransform(name = "主键id")
private Long id;
/**
* 员工id
*/
+ @ElogTransform(name = "员工id")
private Long employeeId;
/**
* 账单月份
*/
+ @ElogTransform(name = "账单月份")
private String billMonth;
/**
* 账单状态 0-未归档 1-已归档
*/
+ @ElogTransform(name = "账单状态")
private Integer billStatus;
/**
* 缴纳状态
*/
+ @ElogTransform(name = "缴纳状态")
private Integer paymentStatus;
/**
* 补缴月份/退差月份
*/
+ @ElogTransform(name = "补缴月份/退差月份")
private String supplementaryMonth;
/**
* 补缴项目
*/
+ @ElogTransform(name = "补缴项目")
private String supplementaryProjects;
/**
* 数据来源 0-系统核算 1-临时数据
*/
+ @ElogTransform(name = "数据来源")
private Integer resourceFrom;
/**
* 社保缴纳组织
*/
+ @ElogTransform(name = "社保缴纳组织")
private Long socialPayOrg;
/**
* 社保账号
*/
+ @ElogTransform(name = "社保账号")
private String socialAccount;
/**
* 公积金缴纳组织
*/
+ @ElogTransform(name = "公积金缴纳组织")
private Long fundPayOrg;
/**
* 公积金账号
*/
+ @ElogTransform(name = "公积金账号")
private String fundAccount;
/**
* 补充公积金账号
*/
+ @ElogTransform(name = "补充公积金账号")
private String supplementFundAccount;
/**
* 其他福利缴纳组织
*/
+ @ElogTransform(name = "其他福利缴纳组织")
private Long otherPayOrg;
/**
* 社保方案ID
*/
+ @ElogTransform(name = "社保方案ID")
private Long socialSchemeId;
/**
* 社保缴纳基数
*/
@Encrypt
+ @ElogTransform(name = "社保缴纳基数")
private String socialPaymentBaseString;
/**
* 社保缴纳基数——单位
*/
@Encrypt
+ @ElogTransform(name = "社保缴纳基数——单位")
private String socialPaymentComBaseString;
/**
* 公积金方案ID
*/
+ @ElogTransform(name = "公积金方案ID")
private Long fundSchemeId;
/**
* 公积金缴纳基数
*/
@Encrypt
+ @ElogTransform(name = "公积金缴纳基数")
private String fundPaymentBaseString;
/**
* 公积金缴纳基数——单位
*/
@Encrypt
+ @ElogTransform(name = "公积金缴纳基数——单位")
private String fundPaymentComBaseString;
/**
* 其他福利方案id
*/
+ @ElogTransform(name = "其他福利方案id")
private Long otherSchemeId;
/**
* 其他福利缴纳基数
*/
@Encrypt
+ @ElogTransform(name = "其他福利缴纳基数")
private String otherPaymentBaseString;
/**
* 其他福利缴纳基数——单位
*/
@Encrypt
+ @ElogTransform(name = "其他福利缴纳基数——单位")
private String otherPaymentComBaseString;
/**
* 社保个人缴费明细
*/
@Encrypt
+ @ElogTransform(name = "社保个人缴费明细")
private String socialPerJson;
/**
* 社保个人合计
*/
@Encrypt
+ @ElogTransform(name = "社保个人合计")
private String socialPerSum;
/**
* 公积金个人缴费明细
*/
@Encrypt
+ @ElogTransform(name = "公积金个人缴费明细")
private String fundPerJson;
/**
* 公积金个人合计
*/
@Encrypt
+ @ElogTransform(name = "公积金个人合计")
private String fundPerSum;
/**
* 其他福利个人缴费明细
*/
@Encrypt
+ @ElogTransform(name = "其他福利个人缴费明细")
private String otherPerJson;
/**
* 其他福利个人合计
*/
@Encrypt
+ @ElogTransform(name = "其他福利个人合计")
private String otherPerSum;
/**
* 个人合计
*/
@Encrypt
+ @ElogTransform(name = "个人合计")
private String perSum;
/**
* 社保单位缴费明细
*/
@Encrypt
+ @ElogTransform(name = "社保单位缴费明细")
private String socialComJson;
/**
* 社保单位合计
*/
@Encrypt
+ @ElogTransform(name = "社保单位合计")
private String socialComSum;
/**
* 公积金单位缴费明细
*/
+ @ElogTransform(name = "公积金单位缴费明细")
private String fundComJson;
/**
* 公积金单位合计
*/
+ @ElogTransform(name = "公积金单位合计")
private String fundComSum;
/**
* 其他福利单位缴费明细
*/
+ @ElogTransform(name = "其他福利单位缴费明细")
private String otherComJson;
/**
* 其他福利单位合计
*/
+ @ElogTransform(name = "其他福利单位合计")
private String otherComSum;
/**
* 单位合计
*/
@Encrypt
+ @ElogTransform(name = "单位合计")
private String comSum;
/**
* 社保合计
*/
@Encrypt
+ @ElogTransform(name = "社保合计")
private String socialSum;
/**
* 公积金合计
*/
@Encrypt
+ @ElogTransform(name = "公积金合计")
private String fundSum;
/**
* 其他福利合计
*/
@Encrypt
+ @ElogTransform(name = "其他福利合计")
private String otherSum;
/**
* 合计
*/
@Encrypt
+ @ElogTransform(name = "合计")
private String total;
/**
* 创建人id
*/
+ @ElogTransform(name = "创建人id")
private Long creator;
/**
* 是否删除
*/
+ @ElogTransform(name = "是否删除")
private Integer deleteType;
/**
* 创建时间
*/
+ @ElogTransform(name = "创建时间")
private Date createTime;
/**
* 更新时间
*/
+ @ElogTransform(name = "更新时间")
private Date updateTime;
/**
* 租户key
*/
+ @ElogTransform(name = "租户key")
private String tenantKey;
/**
* 个税扣缴义务人
*/
+ @ElogTransform(name = "个税扣缴义务人")
private Long paymentOrganization;
}
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
index 24ebde645..ff9ece22b 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
@@ -1,5 +1,6 @@
package com.engine.salary.entity.siaccount.po;
+import com.engine.salary.elog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -18,86 +19,103 @@ import java.util.Date;
@NoArgsConstructor
@AllArgsConstructor
//hrsa_compensation_log
+@ElogTransform(name = "福利台账-调差历史表")
public class InsuranceCompensationPO {
/**
* 主键id
*/
+ @ElogTransform(name = "主键id")
private Long id;
/**
* 缴纳组织
*/
+ @ElogTransform(name = "缴纳组织")
private Long paymentAgency;
/**
* 个税扣缴义务人
*/
+ @ElogTransform(name = "个税扣缴义务人id")
private Long paymentOrganization;
/**
* 创建人id
*/
+ @ElogTransform(name = "创建人id")
private Long creator;
/**
* 是否删除
*/
+ @ElogTransform(name = "是否删除")
private Integer deleteType;
/**
* 创建时间
*/
+ @ElogTransform(name = "创建时间")
private Date createTime;
/**
* 更新时间
*/
+ @ElogTransform(name = "更新时间")
private Date updateTime;
/**
* 租户key
*/
+ @ElogTransform(name = "租户key")
private String tenantKey;
/**
* 员工id
*/
+ @ElogTransform(name = "员工id")
private Long employeeId;
/**
* 统计调差福利
*/
+ @ElogTransform(name = "统计调差福利")
private Integer welfareType;
/**
* 统计调差福利类型
*/
+ @ElogTransform(name = "统计调差福利类型")
private String categoryType;
/**
* 国家核算金额
*/
+ @ElogTransform(name = "国家核算金额")
private String countryTotal;
/**
* 公司核算金额
*/
+ @ElogTransform(name = "公司核算金额")
private String companyTotal;
/**
* 应调差额
*/
+ @ElogTransform(name = "应调差额")
private String adjustmentTotal;
/**
* 调差到
*/
+ @ElogTransform(name = "调差到")
private Long adjustTo;
/**
* 账单月份
*/
+ @ElogTransform(name = "账单月份")
private String billMonth;
//---------条件-------
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
index 60cd71788..7a183297d 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.java
@@ -50,6 +50,9 @@ public interface InsuranceAccountBatchMapper {
*/
void updateById(InsuranceAccountBatchPO pos);
+ InsuranceAccountBatchPO getById(@Param("id") Long id);
+
+
/**
*
* @param billMonth
diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
index 61223c9b0..4b45cb2f3 100644
--- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
+++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountBatchMapper.xml
@@ -244,6 +244,15 @@
+
+