From 0a1972ae1740b0b4a06b040fbce10c46122ca261 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 31 May 2021 10:48:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?pinyin=E8=81=94=E5=8A=A8=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 87675d742c..42ec69d1ac 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -145,7 +145,7 @@ thirdplat: appkey: @thirdplat.jcet.g.appkey@ appsecret: @thirdplat.jcet.g.appsecret@ pyld: - domain: https://epmet-ext1-py.elinkservice.cn/platform + domain: https://epmet-ext1.pingyin.gov.cn/platform appId: 7a5aec009ba4eba8e254ee64fe3775e1 appKey: 14faef9af508d1c253b720ea5a43f9de appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595 From cd34ec78f6c9fbcaaf89b6a0ea8c4442c266f1c7 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 31 May 2021 14:05:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=96=E4=B9=8B=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index 0697a46edd..1a9b76f055 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -118,7 +118,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { if (!CollectionUtils.isEmpty(customerIds)) { customerIds.forEach(customerId -> { if (StringUtils.isNotBlank(formDTO.getStartMonth()) && StringUtils.isNotBlank(formDTO.getEndMonth())) { - List daysBetween = DateUtils.getMonthBetween(formDTO.getStartDate(), formDTO.getEndDate()); + List daysBetween = DateUtils.getMonthBetween(formDTO.getStartMonth(), formDTO.getEndMonth()); daysBetween.forEach(monthId -> { extractMonthly(customerId, monthId); }); From a3a51074a415aa58a164a350f94ec0e176c1ee35 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 31 May 2021 15:00:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=B0=83=E5=8A=A8bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/StaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 2c5a8fb6f7..d72d3cdd8a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -233,7 +233,7 @@ public class StaffServiceImpl implements StaffService { customerAgencyService.update(oldAgencyDTO); //新组织总人数加一 CustomerAgencyDTO newAgencyDTO = customerAgencyService.get(fromDTO.getAgencyId()); - newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() - NumConstant.ONE); + newAgencyDTO.setTotalUser(newAgencyDTO.getTotalUser() + NumConstant.ONE); customerAgencyService.update(newAgencyDTO); //5.逻辑删除工作人员原组织加入的部门、网格,部门、网格总人数减1 customerDepartmentService.updateDepartment(fromDTO.getStaffId());