diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java index 7fc30292e..b18a80be4 100644 --- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java +++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java @@ -90,7 +90,7 @@ public class SpecialAddDeductionBiz extends BaseBean { try { SpecialAddDeductionMapper mapper = sqlSession.getMapper(SpecialAddDeductionMapper.class); encryptUtil.encryptList(param, SpecialAddDeductionPO.class); - List> partition = Lists.partition(param, 100); + List> partition = Lists.partition(param, 50); partition.forEach(mapper::updateBatchSelective); sqlSession.commit(); } finally { diff --git a/src/com/engine/salary/web/AddUpDeductionController.java b/src/com/engine/salary/web/AddUpDeductionController.java index 42ff50530..b153fd475 100644 --- a/src/com/engine/salary/web/AddUpDeductionController.java +++ b/src/com/engine/salary/web/AddUpDeductionController.java @@ -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");