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

Merge branch 'fix/specialAddDeduction_cannotImport' into release/2.7.3.2304.01

This commit is contained in:
Harryxzy 2023-04-11 10:16:00 +08:00
parent 6bb5f8ddb4 d5f6d053b3
commit 593ad0d3a4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/biz/SpecialAddDeductionBiz.java
View File

@ -90,7 +90,7 @@ public class SpecialAddDeductionBiz extends BaseBean {
try {
SpecialAddDeductionMapper mapper = sqlSession.getMapper(SpecialAddDeductionMapper.class);
encryptUtil.encryptList(param, SpecialAddDeductionPO.class);
List<List<SpecialAddDeductionPO>> partition = Lists.partition(param, 100);
List<List<SpecialAddDeductionPO>> partition = Lists.partition(param, 50);
partition.forEach(mapper::updateBatchSelective);
sqlSession.commit();
} finally {

5
src/com/engine/salary/web/AddUpDeductionController.java
View File

@ -9,6 +9,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpDeductionDTO;
import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO;
import com.engine.salary.entity.datacollection.param.*;
import com.engine.salary.util.ResponseResult;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.wrapper.AddUpDeductionWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
@ -198,9 +199,11 @@ public class AddUpDeductionController {
if (StringUtils.isNotBlank(id)) {
param.setId(Long.valueOf(id));
}
String declareMonth = request.getParameter("declareMonth");
if (StringUtils.isNotBlank(declareMonth)) {
param.setDeclareMonth(Arrays.asList(declareMonth.split(",")));
param.setDeclareMonth(Arrays.stream(declareMonth.split(",")).map(e -> e + "-01 00:00:00").collect(Collectors.toList()));
param.setDeclareMonthDate(Arrays.stream(declareMonth.split(",")).map(e -> e + "-01 00:00:00").map(SalaryDateUtil::dateStrToLocalTime).collect(Collectors.toList()));
}
String username = request.getParameter("username");