qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy

This commit is contained in:
sy 2022-10-18 15:33:46 +08:00
parent e59627776d 6edd65a77e
commit a371ccc992
6 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
resource/sql/薪资还原脚本.sql
View File

@ -14,6 +14,18 @@ delete from hrsa_attend_quote_field where 1=1
;
delete from hrsa_attend_quote_sync_set where 1=1
;
delete from hrsa_scheme_detail where 1=1
;
delete from hrsa_social_archives where 1=1
;
delete from hrsa_fund_archives where 1=1
;
delete from hrsa_other_archives where 1=1
;
delete from hrsa_bill_batch where 1=1
;
@ -23,6 +35,10 @@ delete from hrsa_bill_detail_temp where 1=1
;
delete from hrsa_bill_inspect where 1=1
;
delete from hrsa_insurance_category where 1=1
;
delete from hrsa_check_result where 1=1
;
delete from hrsa_check_result_record where 1=1
@ -31,10 +47,7 @@ delete from hrsa_ck_result_detail_temp where 1=1
;
delete from hrsa_excel_acct_result where 1=1
;
delete from hrsa_fund_archives where 1=1
;
delete from hrsa_other_archives where 1=1
;
delete from hrsa_other_deduction where 1=1
;
delete from hrsa_salary_acct_emp where 1=1
@ -71,11 +84,6 @@ delete from hrsa_salary_sob_range where 1=1
;
delete from hrsa_salary_template where 1=1
;
delete from hrsa_scheme_detail where 1=1
;
delete from hrsa_social_archives where 1=1
;
delete from hrsa_social_security_scheme where 1=1
;
@ -108,8 +116,6 @@ delete from hrsa_tax_rate_base where 1=1
;
delete from hrsa_tax_rate_detail where 1=1
;
delete from hrsa_insurance_category where 1=1
;
delete from hrsa_salary_acct_result_report where 1=1
;

5
src/com/engine/salary/entity/salaryarchive/dto/SalaryArchiveFormDTO.java
View File

@ -32,6 +32,11 @@ public class SalaryArchiveFormDTO {
//基本信息
private Map<String,Object> baseInfo;
/**
* 发薪设置
*/
private Map<String,Object> paySet;
//薪资档案
private List<Map<String, Object>> adjustSalaryItems;

3
src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
View File

@ -2,6 +2,7 @@ package com.engine.salary.entity.salaryarchive.po;
import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveAddTypeEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Builder;
@ -40,11 +41,13 @@ public class SalaryArchivePO {
/**
* 起始发薪日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date payStartDate;
/**
* 最后发薪日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date payEndDate;
/**

2
src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml
View File

@ -555,7 +555,7 @@
<set>
run_status='STOP_FROM_SUSPEND'
</set>
WHERE run_status = 'FIXED' and pay_end_date is not null
WHERE run_status = 'SUSPEND' and pay_end_date is not null
and id IN
<foreach collection="ids" open="(" item="id" separator="," close=")">
#{id}

16
src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
View File

@ -664,17 +664,13 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
po.setOtherPaymentBaseString(AESEncryptUtil.closeEncryptSetting(po.getOtherPaymentBaseString()));
po.setSocialPerJson(AESEncryptUtil.closeEncryptSetting(po.getSocialPerJson()));
po.setSocialPerSum(AESEncryptUtil.closeEncryptSetting(po.getSocialPerSum()));
po.setSocialComJson(AESEncryptUtil.closeEncryptSetting(po.getSocialComJson()));
po.setSocialComSum(AESEncryptUtil.closeEncryptSetting(po.getSocialComSum()));
po.setFundPerJson(AESEncryptUtil.closeEncryptSetting(po.getFundPerJson()));
po.setFundPerSum(AESEncryptUtil.closeEncryptSetting(po.getFundPerSum()));
po.setOtherPerJson(AESEncryptUtil.closeEncryptSetting(po.getOtherPerJson()));
po.setOtherPerSum(AESEncryptUtil.closeEncryptSetting(po.getOtherPerSum()));
po.setPerSum(AESEncryptUtil.closeEncryptSetting(po.getPerSum()));
po.setFundComJson(AESEncryptUtil.closeEncryptSetting(po.getFundComJson()));
po.setFundComSum(AESEncryptUtil.closeEncryptSetting(po.getFundComSum()));
po.setOtherComJson(AESEncryptUtil.closeEncryptSetting(po.getOtherComJson()));
po.setOtherComSum(AESEncryptUtil.closeEncryptSetting(po.getOtherComSum()));
po.setSocialComJson(AESEncryptUtil.closeEncryptSetting(po.getSocialComJson()));
po.setSocialComSum(AESEncryptUtil.closeEncryptSetting(po.getSocialComSum()));
po.setComSum(AESEncryptUtil.closeEncryptSetting(po.getComSum()));
po.setSocialSum(AESEncryptUtil.closeEncryptSetting(po.getSocialSum()));
po.setFundSum(AESEncryptUtil.closeEncryptSetting(po.getFundSum()));
@ -686,17 +682,13 @@ public class SalarySysConfServiceImpl extends Service implements SalarySysConfSe
po.setOtherPaymentBaseString(AESEncryptUtil.encrypt(po.getOtherPaymentBaseString()));
po.setSocialPerJson(AESEncryptUtil.encrypt(po.getSocialPerJson()));
po.setSocialPerSum(AESEncryptUtil.encrypt(po.getSocialPerSum()));
po.setSocialComJson(AESEncryptUtil.encrypt(po.getSocialComJson()));
po.setSocialComSum(AESEncryptUtil.encrypt(po.getSocialComSum()));
po.setFundPerJson(AESEncryptUtil.encrypt(po.getFundPerJson()));
po.setFundPerSum(AESEncryptUtil.encrypt(po.getFundPerSum()));
po.setOtherPerJson(AESEncryptUtil.encrypt(po.getOtherPerJson()));
po.setOtherPerSum(AESEncryptUtil.encrypt(po.getOtherPerSum()));
po.setPerSum(AESEncryptUtil.encrypt(po.getPerSum()));
po.setFundComJson(AESEncryptUtil.encrypt(po.getFundComJson()));
po.setFundComSum(AESEncryptUtil.encrypt(po.getFundComSum()));
po.setOtherComJson(AESEncryptUtil.encrypt(po.getOtherComJson()));
po.setOtherComSum(AESEncryptUtil.encrypt(po.getOtherComSum()));
po.setSocialComJson(AESEncryptUtil.encrypt(po.getSocialComJson()));
po.setSocialComSum(AESEncryptUtil.encrypt(po.getSocialComSum()));
po.setComSum(AESEncryptUtil.encrypt(po.getComSum()));
po.setSocialSum(AESEncryptUtil.encrypt(po.getSocialSum()));
po.setFundSum(AESEncryptUtil.encrypt(po.getFundSum()));

5
src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
View File

@ -344,6 +344,10 @@ public class SalaryArchiveWrapper extends Service {
List<Map<String, Object>> salaryItems = Lists.newArrayList();
// 2.发薪设置表单
Map<String,Object> paySetForm = new HashMap<>();
paySetForm.put("data",po);
// 获取所有可被引用的薪资项目
List<SalaryItemPO> salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems();
@ -363,6 +367,7 @@ public class SalaryArchiveWrapper extends Service {
.id(salaryArchiveId)
.employeeId(employee.getEmployeeId())
.baseInfo(baseInfo)
.paySet(paySetForm)
.adjustSalaryItems(salaryItems)
.build();
}