Merge branch 'dev_staff_transfer_bugfix' into dev_temp

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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -122,7 +122,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         if (!CollectionUtils.isEmpty(customerIds)) {
             customerIds.forEach(customerId -> {
                 if (StringUtils.isNotBlank(formDTO.getStartMonth()) && StringUtils.isNotBlank(formDTO.getEndMonth())) {
-                    List<String> daysBetween = DateUtils.getMonthBetween(formDTO.getStartDate(), formDTO.getEndDate());
+                    List<String> daysBetween = DateUtils.getMonthBetween(formDTO.getStartMonth(), formDTO.getEndMonth());
                     daysBetween.forEach(monthId -> {
                         extractMonthly(customerId, monthId);
                     });

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());