From d0642ec30adca3e7a2159dfb210a823a978e68f8 Mon Sep 17 00:00:00 2001 From: xuxinyuan Date: Mon, 3 Jun 2019 14:04:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/views/modules/train/trainExecutionForm.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html b/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html index a5c23ba8..4a07da20 100644 --- a/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html +++ b/jsite-web/src/main/resources/views/modules/train/trainExecutionForm.html @@ -205,19 +205,19 @@ function trainingPlan() { var trainPlanId = $('#trainPlan').val(); - js.print(trainPlanId); + var trainPlanModel; <% var trainPlanData = @JsonMapper.toJsonString(trainPlanList); %> var list = ${trainPlanData}; for (var index in list) { if (trainPlanId == list[index].id) { trainPlanModel = list[index]; - js.print(trainPlanModel); + break; } } - js.print(trainPlanModel); + $('#implTime').val(trainPlanModel.planTime); $('#trainingType').val(trainPlanModel.trainingTypesof); $('#trainingTheme').val(trainPlanModel.trainingDestion); -- Gitee From b7a80278f462d3580d3e7f7601b957af84a206c7 Mon Sep 17 00:00:00 2001 From: xuxinyuan Date: Tue, 4 Jun 2019 13:56:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9form=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wages/service/WagesSocialFunService.java | 13 +++++++++++++ .../modules/wages/web/WagesSocialFunController.java | 2 +- .../views/modules/train/trainExecutionForm.html | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java b/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java index 1fbef109..33c7282a 100644 --- a/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java +++ b/jsite-web/src/main/java/com/jsite/modules/wages/service/WagesSocialFunService.java @@ -50,6 +50,19 @@ public class WagesSocialFunService extends CrudService var list = ${trainPlanData}; for (var index in list) { if (trainPlanId == list[index].id) { trainPlanModel = list[index]; - + js.print(trainPlanModel); break; } } - + js.print(trainPlanModel); $('#implTime').val(trainPlanModel.planTime); $('#trainingType').val(trainPlanModel.trainingTypesof); $('#trainingTheme').val(trainPlanModel.trainingDestion); -- Gitee From b4122f078530aac4f67e0bbeb7cc6db4e9911b92 Mon Sep 17 00:00:00 2001 From: xuxinyuan Date: Tue, 4 Jun 2019 14:25:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E5=85=AC=E7=A7=AF?= =?UTF-8?q?=E9=87=91=E5=87=8F=E5=91=98=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsite/modules/wages/web/WagesSocialFunController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java index 62b8d3fd..cc2783c2 100644 --- a/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java +++ b/jsite-web/src/main/java/com/jsite/modules/wages/web/WagesSocialFunController.java @@ -108,6 +108,7 @@ public class WagesSocialFunController extends BaseController { wagesSocialFun.setInjuryCompany(0.0); wagesSocialFun.setSocialUnitPay(0.0); wagesSocialFun.setSocialPersonalPay(0.0); + wagesSocialFun.setSocialFundStatus("2"); wagesSocialFunService.save(wagesSocialFun); return renderResult(Global.TRUE, "社保减员成功"); } @@ -118,6 +119,7 @@ public class WagesSocialFunController extends BaseController { public String fundReduce(WagesSocialFun wagesSocialFun) { wagesSocialFun.setFundCompanyPay(0.0); wagesSocialFun.setFundPersonalPay(0.0); + wagesSocialFun.setSocialFundStatus("4"); wagesSocialFunService.save(wagesSocialFun); return renderResult(Global.TRUE, "公积金减员成功"); } @@ -142,6 +144,7 @@ public class WagesSocialFunController extends BaseController { wagesSocialFun.setSocialPersonalPay(0.0); wagesSocialFun.setFundCompanyPay(0.0); wagesSocialFun.setFundPersonalPay(0.0); + wagesSocialFun.setSocialFundStatus("6"); wagesSocialFunService.save(wagesSocialFun); return renderResult(Global.TRUE, "社保公积金清零成功"); } -- Gitee