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

bug修改

This commit is contained in:
MustangDeng 2022-06-06 21:21:10 +08:00
parent 958ffc5aa0
commit bfcb9a78f8
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/ecology9/WEB-INF/prop/hrmSalary.properties
View File

@ -6,6 +6,4 @@ isPermission=false
salaryAdminRoleId=28
#是否开启默认关闭非标-开启后，默认不启用非标，在应用中心非标中进行开启
defaultCloseNonStandard149=true
#AES密钥
AESEncryptScrect=990EB004A1C862721C1513AE90038C9E

19
src/com/engine/salary/encrypt/taxdeclaration/TaxDeclarationDetailPOEncrypt.java
View File

@ -2,6 +2,7 @@ package com.engine.salary.encrypt.taxdeclaration;
import com.engine.salary.encrypt.AESEncryptUtil;
import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO;
import org.docx4j.wml.P;
import java.util.Collection;
import java.util.List;
@ -22,6 +23,16 @@ public class TaxDeclarationDetailPOEncrypt {
return list;
}
public static Collection<TaxDeclarationDetailPO> encryptTaxDeclarationDetailPOList(Collection<TaxDeclarationDetailPO> list) {
if(list == null || list.size() == 0) {
return list;
}
list.forEach(item -> {
item.setFieldValue(AESEncryptUtil.encrypt(item.getFieldValue()));
});
return list;
}
public static List<TaxDeclarationDetailPO> decryptTaxDeclarationDetailPOList(List<TaxDeclarationDetailPO> list) {
if(list == null || list.size() == 0) {
return list;
@ -38,4 +49,12 @@ public class TaxDeclarationDetailPOEncrypt {
});
return list;
}
public static TaxDeclarationDetailPO encryptTaxDeclarationDetailPOItem(TaxDeclarationDetailPO item) {
if(item == null) {
return item;
}
item.setFieldValue(AESEncryptUtil.decrypt(item.getFieldValue()));
return item;
}
}

1
src/com/engine/salary/entity/taxdeclaration/bo/TaxDeclarationBO.java
View File

@ -1,5 +1,6 @@
package com.engine.salary.entity.taxdeclaration.bo;
import com.engine.salary.encrypt.taxdeclaration.TaxDeclarationDetailPOEncrypt;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;

2
src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java
View File

@ -96,7 +96,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla
@Override
public void batchSave(Collection<TaxDeclarationDetailPO> taxDeclarationDetailPOS) {
if (CollectionUtils.isNotEmpty(taxDeclarationDetailPOS)) {
TaxDeclarationDetailPOEncrypt.decryptTaxDeclarationDetailPOList(taxDeclarationDetailPOS);
TaxDeclarationDetailPOEncrypt.encryptTaxDeclarationDetailPOList(taxDeclarationDetailPOS);
List<List<TaxDeclarationDetailPO>> partition = Lists.partition((List) taxDeclarationDetailPOS, 100);
partition.forEach(getTaxDeclarationDetailMapper()::batchInsert);
}

7
src/com/engine/salary/wrapper/TaxDeclarationWrapper.java
View File

@ -8,6 +8,7 @@ import com.engine.salary.biz.TaxAgentBiz;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.component.WeaFormOption;
import com.engine.salary.encrypt.datacollection.AddUpSituationEncrypt;
import com.engine.salary.encrypt.taxdeclaration.TaxDeclarationDetailPOEncrypt;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
@ -21,6 +22,7 @@ import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationInfoDTO;
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationListDTO;
import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationListQueryParam;
import com.engine.salary.entity.taxdeclaration.param.TaxDeclarationSaveParam;
import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationDetailPO;
import com.engine.salary.entity.taxdeclaration.po.TaxDeclarationPO;
import com.engine.salary.entity.taxrate.TaxAgent;
import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
@ -267,14 +269,15 @@ public class TaxDeclarationWrapper extends Service {
}
// 保存个税申报表明细
if (CollectionUtils.isNotEmpty(result.getNeedInsertTaxDeclarationDetails())) {
getTaxDeclarationDetailService(user).batchSave(result.getNeedInsertTaxDeclarationDetails());
Collection<TaxDeclarationDetailPO> needInsertTaxDeclarationDetails = result.getNeedInsertTaxDeclarationDetails();
getTaxDeclarationDetailService(user).batchSave(needInsertTaxDeclarationDetails);
}
// 保存累计情况
if (CollectionUtils.isNotEmpty(result.getNeedInsertAccumulatedSituations())) {
Set<Long> taxAgentIds = SalaryEntityUtil.properties(result.getNeedInsertTaxDeclarations(), TaxDeclarationPO::getTaxAgentId);
getAddUpSituationService(user).deleteByTaxYearMonthAndTaxAgentIds(SalaryDateUtil.localDate2YearMonth(taxCycle),taxAgentIds);
ArrayList<AddUpSituation> addUpSituations = Lists.newArrayList(result.getNeedInsertAccumulatedSituations());
// AddUpSituationEncrypt.decryptAddUpSituationList(addUpSituations);
AddUpSituationEncrypt.encryptAddUpSituationList(addUpSituations);
List<List<AddUpSituation>> partition = Lists.partition(addUpSituations, 100);
partition.forEach(getAddUpSituationMapper()::insertData);
}