From 75d66e4cb97f9cf25e282a8a05e3601e570e8a37 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 6 Apr 2023 16:07:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=93=E9=A1=B9=E9=99=84=E5=8A=A0?= =?UTF-8?q?=E6=89=A3=E9=99=A4=E5=AF=BC=E5=85=A5=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SpecialAddDeductionBiz.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { From d5f6d053b37d99280e6113303e87050ff269148c Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 6 Apr 2023 16:20:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B4=AF=E8=AE=A1?= =?UTF-8?q?=E4=B8=93=E9=A1=B9=E9=99=84=E5=8A=A0=E6=89=A3=E9=99=A4=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=85=A8=E9=83=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/web/AddUpDeductionController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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");