Commit 51c6f926 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.21' into MVP1.7.21

parents c7c85b8e 1ac0b8d3
...@@ -566,7 +566,7 @@ public class SalaryAccountUtil implements Serializable { ...@@ -566,7 +566,7 @@ public class SalaryAccountUtil implements Serializable {
if (!this.setNewEmpBase(newEmps, newEmps.getLineNums() + dataRow, errorList, notLabour if (!this.setNewEmpBase(newEmps, newEmps.getLineNums() + dataRow, errorList, notLabour
, entity, salaryType, dept, user, entity.getSalaryStyle() , entity, salaryType, dept, user, entity.getSalaryStyle()
, CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()), invoiceTitle , CommonConstants.ZERO_STRING.equals(entity.getSalaryGiveTime()), invoiceTitle
, entity.getSaiList(), bankMap)) { , entity.getSaiList(), bankMap, costReductionMap, tSalaryAccountService)) {
isContinue = false; isContinue = false;
continue; continue;
} }
...@@ -1156,7 +1156,8 @@ public class SalaryAccountUtil implements Serializable { ...@@ -1156,7 +1156,8 @@ public class SalaryAccountUtil implements Serializable {
private boolean setNewEmpBase(TSalaryEmployee newEmp, int i, List<ErrorMessage> errorList, boolean notLabour private boolean setNewEmpBase(TSalaryEmployee newEmp, int i, List<ErrorMessage> errorList, boolean notLabour
, TSalaryAccountVo entity, String salaryType, TSettleDomainSelectVo dept, YifuUser user, String salaryStyle , TSalaryAccountVo entity, String salaryType, TSettleDomainSelectVo dept, YifuUser user, String salaryStyle
, boolean salaryGiveTimeFlag, String invoiceTitle, List<TSalaryAccountItemVo> saiList, Map<String, String> bankMap) { , boolean salaryGiveTimeFlag, String invoiceTitle, List<TSalaryAccountItemVo> saiList, Map<String, String> bankMap
, Map<String, BigDecimal> costReductionMap, TSalaryAccountService tSalaryAccountService) {
String newEmpStr = "新员工"; String newEmpStr = "新员工";
if (!notLabour) { if (!notLabour) {
newEmpStr = "劳务费"; newEmpStr = "劳务费";
...@@ -1208,7 +1209,14 @@ public class SalaryAccountUtil implements Serializable { ...@@ -1208,7 +1209,14 @@ public class SalaryAccountUtil implements Serializable {
TSalaryAccountItemVo sai = new TSalaryAccountItemVo(); TSalaryAccountItemVo sai = new TSalaryAccountItemVo();
sai.setCnName(SalaryConstants.COST_REDUCTION); sai.setCnName(SalaryConstants.COST_REDUCTION);
sai.setJavaFiedName(SalaryConstants.COST_REDUCTION_JAVA); sai.setJavaFiedName(SalaryConstants.COST_REDUCTION_JAVA);
sai.setSalaryMoney(DateUtil.getTaxMonthMoney(entity.getTaxMonth())); BigDecimal costReduction = costReductionMap.get(entity.getEmpIdcard());
if (costReduction == null) {
costReduction = tSalaryAccountService.getCostReductionToCard(entity.getEmpIdcard(), invoiceTitle);
}
if (costReduction == null) {
costReduction = SalaryConstants.COST_MONEY;
}
sai.setSalaryMoney(costReduction);
sai.setIsTax(CommonConstants.ZERO_INT); sai.setIsTax(CommonConstants.ZERO_INT);
saiList.add(sai); saiList.add(sai);
newEmp.setTaxMonth(entity.getTaxMonth()); newEmp.setTaxMonth(entity.getTaxMonth());
......
...@@ -222,7 +222,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe ...@@ -222,7 +222,8 @@ public class TSocialFriendPushServiceImpl extends ServiceImpl<TSocialFriendMappe
if (spireTempFiles != null && spireTempFiles.length > 0) { if (spireTempFiles != null && spireTempFiles.length > 0) {
int count = 0; int count = 0;
long totalSize = 0; long totalSize = 0;
long oneMinuteAgo = System.currentTimeMillis() - 600000; // 删30分钟前的数据
long oneMinuteAgo = System.currentTimeMillis() - 30L * 60 * 1000;
long fileSize; long fileSize;
for (File file : spireTempFiles) { for (File file : spireTempFiles) {
if (file.isFile() && file.canWrite()) { if (file.isFile() && file.canWrite()) {
......
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