diff --git a/.gitignore b/.gitignore index 224e480e..8ce2c6f0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,10 +2,10 @@ ### Java template # Compiled class file *.class - +*.iml # Log file *.log - +*.iml # BlueJ files *.ctxt diff --git a/esua-epdc/epdc-admin/epdc-admin-client/epdc-admin-client.iml b/esua-epdc/epdc-admin/epdc-admin-client/epdc-admin-client.iml deleted file mode 100644 index 53f60451..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-client/epdc-admin-client.iml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/epdc-admin-server.iml b/esua-epdc/epdc-admin/epdc-admin-server/epdc-admin-server.iml deleted file mode 100644 index 71429958..00000000 --- a/esua-epdc/epdc-admin/epdc-admin-server/epdc-admin-server.iml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin.iml b/esua-epdc/epdc-admin/epdc-admin.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-admin/epdc-admin.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-auth/epdc-auth.iml b/esua-epdc/epdc-auth/epdc-auth.iml deleted file mode 100644 index 4bbdb3bd..00000000 --- a/esua-epdc/epdc-auth/epdc-auth.iml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-common-clienttoken/epdc-common-clienttoken.iml b/esua-epdc/epdc-commons/epdc-common-clienttoken/epdc-common-clienttoken.iml deleted file mode 100644 index 29d6795a..00000000 --- a/esua-epdc/epdc-commons/epdc-common-clienttoken/epdc-common-clienttoken.iml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-api-version-control/epdc-commons-api-version-control.iml b/esua-epdc/epdc-commons/epdc-commons-api-version-control/epdc-commons-api-version-control.iml deleted file mode 100644 index 425965c8..00000000 --- a/esua-epdc/epdc-commons/epdc-commons-api-version-control/epdc-commons-api-version-control.iml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-dynamic-datasource/epdc-commons-dynamic-datasource.iml b/esua-epdc/epdc-commons/epdc-commons-dynamic-datasource/epdc-commons-dynamic-datasource.iml deleted file mode 100644 index d5360b9f..00000000 --- a/esua-epdc/epdc-commons/epdc-commons-dynamic-datasource/epdc-commons-dynamic-datasource.iml +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/epdc-commons-mybatis.iml b/esua-epdc/epdc-commons/epdc-commons-mybatis/epdc-commons-mybatis.iml deleted file mode 100644 index 9b447e3d..00000000 --- a/esua-epdc/epdc-commons/epdc-commons-mybatis/epdc-commons-mybatis.iml +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-tools-phone/epdc-commons-tools-phone.iml b/esua-epdc/epdc-commons/epdc-commons-tools-phone/epdc-commons-tools-phone.iml deleted file mode 100644 index 597f3cc9..00000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools-phone/epdc-commons-tools-phone.iml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/epdc-commons-tools-wx-ma.iml b/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/epdc-commons-tools-wx-ma.iml deleted file mode 100644 index 65aa4b95..00000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools-wx-ma/epdc-commons-tools-wx-ma.iml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-tools-wx-mp/epdc-commons-tools-wx-mp.iml b/esua-epdc/epdc-commons/epdc-commons-tools-wx-mp/epdc-commons-tools-wx-mp.iml deleted file mode 100644 index 360e9a40..00000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools-wx-mp/epdc-commons-tools-wx-mp.iml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/epdc-commons-tools.iml b/esua-epdc/epdc-commons/epdc-commons-tools/epdc-commons-tools.iml deleted file mode 100644 index 7e057631..00000000 --- a/esua-epdc/epdc-commons/epdc-commons-tools/epdc-commons-tools.iml +++ /dev/null @@ -1,143 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/epdc-commons.iml b/esua-epdc/epdc-commons/epdc-commons.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-commons/epdc-commons.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/shibei-gird-sdk/shibei-gird-sdk.iml b/esua-epdc/epdc-commons/shibei-gird-sdk/shibei-gird-sdk.iml deleted file mode 100644 index c6e453fd..00000000 --- a/esua-epdc/epdc-commons/shibei-gird-sdk/shibei-gird-sdk.iml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-commons/spring-boot-httpclient-starter/spring-boot-httpclient-starter.iml b/esua-epdc/epdc-commons/spring-boot-httpclient-starter/spring-boot-httpclient-starter.iml deleted file mode 100644 index 6f5a61fa..00000000 --- a/esua-epdc/epdc-commons/spring-boot-httpclient-starter/spring-boot-httpclient-starter.iml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-gateway/epdc-gateway.iml b/esua-epdc/epdc-gateway/epdc-gateway.iml deleted file mode 100644 index 53b6c905..00000000 --- a/esua-epdc/epdc-gateway/epdc-gateway.iml +++ /dev/null @@ -1,215 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/epdc-activiti-client.iml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/epdc-activiti-client.iml deleted file mode 100644 index 01c37402..00000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-client/epdc-activiti-client.iml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml deleted file mode 100644 index 7f07d65d..00000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti-server/epdc-activiti-server.iml +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml b/esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-activiti/epdc-activiti.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/epdc-api-client.iml b/esua-epdc/epdc-module/epdc-api/epdc-api-client/epdc-api-client.iml deleted file mode 100644 index ec96c1ca..00000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/epdc-api-client.iml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml deleted file mode 100644 index b847ce68..00000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java index b86e3a5f..dc4cce65 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java @@ -7,7 +7,9 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserRegisterFormDTO; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; @@ -105,4 +107,18 @@ public class ApiAppUserV2Controller { return appUserService.volunteerV2Authenticate(tokenDto, formDto); } + + /*** + * 志愿者列表v2 + * @param tokenDto + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/7/23 13:31 + */ + @GetMapping("volunteer/"+ Constant.VERSION_CONTROL+"/list") + public Result volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return appUserService.listVolunteerV2(tokenDto, dto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index e44ec2b5..a250467a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -367,6 +367,17 @@ public interface UserFeignClient { @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + /* + * 志愿者列表 v2 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + @GetMapping("app-user/epdc-app/volunteerinfo/V2/list") + Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto); + + /* * 志愿者列表 * @param dto diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 0d88b231..bc81a0ec 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -180,11 +180,14 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", formDTO); } + @Override + public Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteerV2", dto); + } @Override public Result> listVolunteer(EpdcAppVolunteerListFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteer", dto); } - @Override public Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertV2VolunteerInfo", dto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index ef236947..88be1c36 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -258,6 +258,17 @@ public interface AppUserService { */ Result getUserWxPhone(EpdcAppUserMaInfoFormDTO formDto); + /* + * 志愿者列表 v2 + * @param tokenDto + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + Result listVolunteerV2(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto); + + /* * 志愿者列表 * @param tokenDto diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 2c959738..fe9d8dc0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1442,6 +1442,12 @@ public class AppUserServiceImpl implements AppUserService { return new Result().ok(authorizationDto); } + @Override + public Result listVolunteerV2(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + dto.setGridId(tokenDto.getGridId()); + return userFeignClient.listVolunteerV2(dto); + } + @Override public Result> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { dto.setGridId(tokenDto.getGridId()); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api.iml b/esua-epdc/epdc-module/epdc-api/epdc-api.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-api/epdc-api.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/epdc-custom-client.iml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/epdc-custom-client.iml deleted file mode 100644 index c208a288..00000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/epdc-custom-client.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/epdc-custom-server.iml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/epdc-custom-server.iml deleted file mode 100644 index 1ff8470f..00000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/epdc-custom-server.iml +++ /dev/null @@ -1,255 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom.iml b/esua-epdc/epdc-module/epdc-custom/epdc-custom.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-client/epdc-demo-client.iml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-client/epdc-demo-client.iml deleted file mode 100644 index c208a288..00000000 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-client/epdc-demo-client.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/epdc-demo-server.iml b/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/epdc-demo-server.iml deleted file mode 100644 index 934dbbda..00000000 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo-server/epdc-demo-server.iml +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-demo/epdc-demo.iml b/esua-epdc/epdc-module/epdc-demo/epdc-demo.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-demo/epdc-demo.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/epdc-events-client.iml b/esua-epdc/epdc-module/epdc-events/epdc-events-client/epdc-events-client.iml deleted file mode 100644 index 06142e9b..00000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/epdc-events-client.iml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/epdc-events-server.iml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/epdc-events-server.iml deleted file mode 100644 index bd5cfa92..00000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/epdc-events-server.iml +++ /dev/null @@ -1,258 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events.iml b/esua-epdc/epdc-module/epdc-events/epdc-events.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-events/epdc-events.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/epdc-group-client.iml b/esua-epdc/epdc-module/epdc-group/epdc-group-client/epdc-group-client.iml deleted file mode 100644 index fefc7842..00000000 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/epdc-group-client.iml +++ /dev/null @@ -1,151 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/epdc-group-server.iml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/epdc-group-server.iml deleted file mode 100644 index 685e56d1..00000000 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/epdc-group-server.iml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group.iml b/esua-epdc/epdc-module/epdc-group/epdc-group.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-group/epdc-group.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/epdc-heart-client.iml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/epdc-heart-client.iml deleted file mode 100644 index f358f416..00000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/epdc-heart-client.iml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/epdc-heart-server.iml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/epdc-heart-server.iml deleted file mode 100644 index e5c76c45..00000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/epdc-heart-server.iml +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart.iml b/esua-epdc/epdc-module/epdc-heart/epdc-heart.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-client/epdc-job-client.iml b/esua-epdc/epdc-module/epdc-job/epdc-job-client/epdc-job-client.iml deleted file mode 100644 index 2a942bce..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-client/epdc-job-client.iml +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/epdc-job-server.iml b/esua-epdc/epdc-module/epdc-job/epdc-job-server/epdc-job-server.iml deleted file mode 100644 index bb3b14bb..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/epdc-job-server.iml +++ /dev/null @@ -1,226 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job.iml b/esua-epdc/epdc-module/epdc-job/epdc-job.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/epdc-kpi-client.iml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/epdc-kpi-client.iml deleted file mode 100644 index c208a288..00000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/epdc-kpi-client.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/epdc-kpi-server.iml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/epdc-kpi-server.iml deleted file mode 100644 index 40bfdd99..00000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/epdc-kpi-server.iml +++ /dev/null @@ -1,230 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi.iml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-client/epdc-message-client.iml b/esua-epdc/epdc-module/epdc-message/epdc-message-client/epdc-message-client.iml deleted file mode 100644 index 01c37402..00000000 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-client/epdc-message-client.iml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/epdc-message-server.iml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/epdc-message-server.iml deleted file mode 100644 index e1af9d94..00000000 --- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/epdc-message-server.iml +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message.iml b/esua-epdc/epdc-module/epdc-message/epdc-message.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-message/epdc-message.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-module.iml b/esua-epdc/epdc-module/epdc-module.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-module.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-client/epdc-news-client.iml b/esua-epdc/epdc-module/epdc-news/epdc-news-client/epdc-news-client.iml deleted file mode 100644 index c208a288..00000000 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-client/epdc-news-client.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/epdc-news-server.iml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/epdc-news-server.iml deleted file mode 100644 index b9ee5daa..00000000 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/epdc-news-server.iml +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 8ebd86cf..cebe416d 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -120,13 +120,14 @@ public class NewsServiceImpl extends BaseServiceImpl implem if (StringUtils.isNotBlank(gridId)) { wrapper.like("ALL_DEPT_IDS", gridId.trim()); } - wrapper.eq(FieldConstant.CREATED_BY, user.getId()); + wrapper.in("DEPT_ID", user.getDeptIdList()); //draft 前端传上来的一个标志 有则代表是存草稿箱的 1 if (StringUtils.isNotEmpty(draft)) { wrapper.eq(StringUtils.isNotBlank(draft), "NEWS_RELEASE_STATE", YesOrNoEnum.YES.value()); } else { wrapper.eq("NEWS_RELEASE_STATE", YesOrNoEnum.NO.value()); } + wrapper.groupBy("ID"); wrapper.orderByDesc(FieldConstant.CREATED_TIME); return wrapper; } @@ -142,10 +143,10 @@ public class NewsServiceImpl extends BaseServiceImpl implem return dto; } - private List getParentAllDeptInfo(List listDeptId){ + private List getParentAllDeptInfo(List listDeptId) { // [0,1,2,3] List allDeptIdsShowList = new ArrayList<>(); - for (Long list : listDeptId){ + for (Long list : listDeptId) { // 查询父级部门 Result parentAndAllDept = adminFeignClient.getParentAndAllDept(list.toString()); ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData(); @@ -153,7 +154,7 @@ public class NewsServiceImpl extends BaseServiceImpl implem String[] deptIdsShow = allDeptIds.split(","); Long[] allDeptIdsShowLong = new Long[deptIdsShow.length]; // 从第一级开始保存 - for (int i = 0; i <= deptIdsShow.length -1; i++){ + for (int i = 0; i <= deptIdsShow.length - 1; i++) { allDeptIdsShowLong[i] = Long.valueOf(deptIdsShow[i]); } allDeptIdsShowList.add(allDeptIdsShowLong); @@ -176,7 +177,6 @@ public class NewsServiceImpl extends BaseServiceImpl implem } - @Override @Transactional(rollbackFor = Exception.class) public void update(NewsDTO dto) { @@ -344,16 +344,17 @@ public class NewsServiceImpl extends BaseServiceImpl implem /** * 查看新闻详情时，判断是否要插入新闻已读表 + * * @param formDto * @return void * @Author zhangyong * @Date 10:47 2020-05-15 **/ - private void isInsertNewsRead(EpdcNewsDetailFormDTO formDto){ + private void isInsertNewsRead(EpdcNewsDetailFormDTO formDto) { // 查看新闻详情时，判断是否是第一次查看本条新闻 int readCount = newsUserReadService.countNewsIsRead(formDto); // 是插入新闻已读表 - if (readCount == 0){ + if (readCount == 0) { NewsUserReadDTO dto = new NewsUserReadDTO(); dto.setNewsId(formDto.getNewsId()); dto.setUserId(formDto.getUserId()); @@ -361,6 +362,7 @@ public class NewsServiceImpl extends BaseServiceImpl implem } // 否无操作 } + @Override @Transactional(rollbackFor = Exception.class) public Result modifyStatement(EpdcNewsStatementFromDTO statementFromDto) { @@ -520,7 +522,7 @@ public class NewsServiceImpl extends BaseServiceImpl implem public PageData allPage(Map params) { UserDetail user = SecurityUser.getUser(); List deptIdList = user.getDeptIdList(); - params.put("deptIdList",deptIdList); + params.put("deptIdList", deptIdList); IPage page = getPage(params); List newsDaoList = baseDao.selectAllPage(params); return new PageData<>(newsDaoList, page.getTotal()); @@ -543,17 +545,16 @@ public class NewsServiceImpl extends BaseServiceImpl implem } /** - * * 组织机构信息处理 * - * @params [dto, newsList] * @return java.util.List + * @params [dto, newsList] * @author liuchuang * @since 2020/3/7 14:47 */ private List handleOrganizationInfo(OrganizationModifyDTO dto, List newsList) { List entities = new ArrayList<>(); - for (NewsDTO news: newsList) { + for (NewsDTO news : newsList) { NewsEntity entity = new NewsEntity(); if (StringUtils.isNotEmpty(news.getParentDeptIds()) && StringUtils.isNotEmpty(news.getParentDeptNames())) { List parentDeptIds = Arrays.asList(news.getParentDeptIds().split(",")); diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news.iml b/esua-epdc/epdc-module/epdc-news/epdc-news.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-news/epdc-news.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/epdc-oss-client.iml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/epdc-oss-client.iml deleted file mode 100644 index c208a288..00000000 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-client/epdc-oss-client.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/epdc-oss-server.iml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/epdc-oss-server.iml deleted file mode 100644 index 60396afc..00000000 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/epdc-oss-server.iml +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss.iml b/esua-epdc/epdc-module/epdc-oss/epdc-oss.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-oss/epdc-oss.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java new file mode 100644 index 00000000..eef1f887 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/result/PointsStatisticsListResultDTO.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; +@Data +public class PointsStatisticsListResultDTO implements Serializable { + + private static final long serialVersionUID = 8249595537995735691L; + + /** + * 总积分 + */ + private int allPoints; + + /** + * 消耗积分 + */ + private int residuePoints; + + /** + * 操作描述 + */ + private String operationDesc; + +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java index f98294cf..7a8dd2db 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; +import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; import com.elink.esua.epdc.excel.PointsLogsExcel; import com.elink.esua.epdc.service.PointsLogsService; import org.springframework.beans.factory.annotation.Autowired; @@ -121,4 +122,30 @@ public class PointsLogsController { ValidatorUtils.validateEntity(formDto); return pointsLogsService.confirmUserAdjustPoint(formDto); } + + + /*** + * 积分分类统计 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/7/21 9:22 + */ + @GetMapping("/point/listPagePoints") + public Result> listPagePoints(@RequestParam Map params) { + PageData list = pointsLogsService.listPagePoint(params); + return new Result>().ok(list); + } + + /*** + * 积分总览 + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/7/21 9:22 + */ + @GetMapping("/point/pointsOverview") + public Result pointsOverview(@RequestParam Map params) { + return new Result().ok(pointsLogsService.getPointsOverview(params)); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java index 618c1aa2..927a6c85 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsRuleController.java @@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,4 +102,16 @@ public class PointsRuleController { return pointsRuleService.getPointRule(ruleCode); } + /*** + * 规则列表 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2020/7/20 17:28 + */ + @GetMapping("ruleList") + public Result> getRuleList() { + List list = pointsRuleService.list(new HashMap<>()); + return new Result>().ok(list); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java index a66b79b5..d9387f35 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java @@ -20,12 +20,9 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingTopTenDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingUserDTO; -import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; import org.apache.ibatis.annotations.Mapper; @@ -128,4 +125,22 @@ public interface PointsLogsDao extends BaseDao { * @Date: 2020-05-13 */ int selectCountPointsRanking(EpdcAppPointsRankingFormDTO formDto); + + /*** + * 积分分类统计 + * @param params + * @return java.util.List + * @author qushutong + * @date 2020/7/21 10:37 + */ + List selectPointsList(Map params); + + /*** + * 积分总览 + * @param params + * @return com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO + * @author qushutong + * @date 2020/7/21 10:37 + */ + PointsStatisticsListResultDTO selectPointsOverview(Map params); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index f0f98098..9e506aaa 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; +import com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; import java.util.List; @@ -171,4 +172,22 @@ public interface PointsLogsService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result confirmUserAdjustPoint(EpdcAdjustUserPointsDTO formDto); + + /*** + * 积分分类统计 + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author qushutong + * @date 2020/7/21 10:36 + */ + PageData listPagePoint(Map params); + + /*** + * 积分总览 + * @param params + * @return com.elink.esua.epdc.dto.result.PointsStatisticsListResultDTO + * @author qushutong + * @date 2020/7/21 10:36 + */ + PointsStatisticsListResultDTO getPointsOverview(Map params); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index aa7bbd56..4f81f6d0 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -161,15 +161,15 @@ public class PointsLogsServiceImpl extends BaseServiceImpl behaviorCodeInfoByBehaviorCode = pointsBehaviorService.getBehaviorCodeInfoByBehaviorCode(formDto.getBehaviorCode()); - if (!behaviorCodeInfoByBehaviorCode.success() || behaviorCodeInfoByBehaviorCode.getData()==null){ + if (!behaviorCodeInfoByBehaviorCode.success() || behaviorCodeInfoByBehaviorCode.getData() == null) { throw new RenException("获取动作编码信息异常或无此动作编码"); } - PointsLogsEntity pointsLogsEntity=new PointsLogsEntity(); + PointsLogsEntity pointsLogsEntity = new PointsLogsEntity(); pointsLogsEntity.setVolunteerId(formDto.getId()); pointsLogsEntity.setUserId(formDto.getUserId()); pointsLogsEntity.setNickname(formDto.getNickname()); @@ -195,7 +195,7 @@ public class PointsLogsServiceImpl extends BaseServiceImpl * @Author zhangyong * @Date 16:09 2020-05-13 **/ - private List sortListPointsRank(EpdcAppPointsRankingFormDTO formDto){ + private List sortListPointsRank(EpdcAppPointsRankingFormDTO formDto) { List listPointsRank = new ArrayList<>(); listPointsRank = baseDao.selectListPointsRanking(formDto); int sortNumber = 1; - if (listPointsRank != null){ - for (int i = 1; i < listPointsRank.size(); i++){ + if (listPointsRank != null) { + for (int i = 1; i < listPointsRank.size(); i++) { listPointsRank.get(0).setRank(NumConstant.ONE); - if(listPointsRank.get(i - NumConstant.ONE).getPoints().intValue() == listPointsRank.get(i).getPoints().intValue()){ + if (listPointsRank.get(i - NumConstant.ONE).getPoints().intValue() == listPointsRank.get(i).getPoints().intValue()) { listPointsRank.get(i).setRank(sortNumber); } else { sortNumber = sortNumber + NumConstant.ONE; @@ -310,12 +312,13 @@ public class PointsLogsServiceImpl extends BaseServiceImpl listPagePoint(Map params) { + IPage page = getPage(params); + List list = baseDao.selectPointsList(params); + return new PageData(list, page.getTotal()); + } + + @Override + public PointsStatisticsListResultDTO getPointsOverview(Map params) { + return baseDao.selectPointsOverview(params); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml index 9bbac039..d5398e2e 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml @@ -180,4 +180,47 @@ ) p GROUP BY p.points ) tab + + + + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/epdc-user-client.iml b/esua-epdc/epdc-module/epdc-user/epdc-user-client/epdc-user-client.iml deleted file mode 100644 index c208a288..00000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/epdc-user-client.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListCountResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListCountResultDTO.java new file mode 100644 index 00000000..782eaa43 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListCountResultDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + + +/** + * @author: qushutong + * @Date: 2020/7/20 13:51 + * @Description:移动端接口-志愿者列表接口返回值 + */ +@Data +public class EpdcAppVolunteerListCountResultDTO implements Serializable { + + private static final long serialVersionUID = 3908231797102233188L; + + /** + * 志愿者数量 + */ + private Integer volunteerCount; + /** + * 列表 + */ + List volunteerList; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/epdc-user-server.iml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/epdc-user-server.iml deleted file mode 100644 index 4c2c5cef..00000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/epdc-user-server.iml +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java index f35f6536..dd7ef36f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java @@ -8,6 +8,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; import com.elink.esua.epdc.service.VolunteerInfoService; @@ -75,6 +76,7 @@ public class EpdcAppVolunteerInfoController { return volunteerInfoService.listVolunteer(dto); } + /** * 志愿者添加 V2接口 * diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/v2/EpdcAppVolunteerInfoV2Controller.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/v2/EpdcAppVolunteerInfoV2Controller.java new file mode 100644 index 00000000..c1069a1f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/v2/EpdcAppVolunteerInfoV2Controller.java @@ -0,0 +1,46 @@ +package com.elink.esua.epdc.controller.v2; + +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; +import com.elink.esua.epdc.service.VolunteerInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 对移动端开放 + * + * @author wanggongfeng + * @date 2019/9/6 20:31 + */ +@RestController +@RequestMapping(Constant.EPDC_APP + "volunteerinfo"+Constant.VERSION_CONTROL) +public class EpdcAppVolunteerInfoV2Controller { + @Autowired + private VolunteerInfoService volunteerInfoService; + + /** + * 志愿者列表 v2 + * + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:08 2020-05-18 + **/ + @GetMapping("list") + public Result volunteerListV2(@RequestBody EpdcAppVolunteerListFormDTO dto) { + return volunteerInfoService.listVolunteerV2(dto); + } + + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java index b537fc28..3d703d28 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java @@ -149,4 +149,14 @@ public interface VolunteerInfoDao extends BaseDao { * @Date 19:52 2020-05-27 **/ void updateVolunteerAauthentication(EpdcCompleteVolunteerInfoV2FormDTO formDTO); + + + /*** + * 志愿者数量 + * @param + * @return java.lang.Integer + * @author qushutong + * @date 2020/7/20 10:53 + */ + Integer selectListVolunteerCount(); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java index cb39bb71..f51f6ed5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; import com.elink.esua.epdc.entity.VolunteerInfoEntity; @@ -208,6 +209,16 @@ public interface VolunteerInfoService extends BaseService { */ Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto); + /* + * 志愿者列表v2 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto); + + /* * 志愿者列表 * @param dto diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java index 90e65549..9578085e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java @@ -43,6 +43,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; import com.elink.esua.epdc.entity.VolunteerInfoEntity; @@ -397,7 +398,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl data = baseDao.selectListVolunteer(dto); return new Result().ok(data); } - + @Override + public Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto) { + int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); + dto.setPageIndex(pageIndex); + List data = baseDao.selectListVolunteer(dto); + EpdcAppVolunteerListCountResultDTO volunteerListCountResultDTO = new EpdcAppVolunteerListCountResultDTO(); + volunteerListCountResultDTO.setVolunteerCount(baseDao.selectListVolunteerCount()); + volunteerListCountResultDTO.setVolunteerList(data); + return new Result().ok(volunteerListCountResultDTO); + } @Override @Transactional(rollbackFor = Exception.class) public Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index a715346b..481c6856 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -225,6 +225,16 @@ LIMIT #{pageIndex},#{pageSize} + + UPDATE epdc_volunteer_info SET diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user.iml b/esua-epdc/epdc-module/epdc-user/epdc-user.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-user/epdc-user.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml b/esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml deleted file mode 100644 index c5093d10..00000000 --- a/esua-epdc/epdc-module/epdc-webservice/epdc-webservice.iml +++ /dev/null @@ -1,253 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-client/epdc-websocket-client.iml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-client/epdc-websocket-client.iml deleted file mode 100644 index 9071abc1..00000000 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-client/epdc-websocket-client.iml +++ /dev/null @@ -1,128 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/epdc-websocket-server.iml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/epdc-websocket-server.iml deleted file mode 100644 index 3afa8656..00000000 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket-server/epdc-websocket-server.iml +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket.iml b/esua-epdc/epdc-module/epdc-websocket/epdc-websocket.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/epdc-module/epdc-websocket/epdc-websocket.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/esua-epdc/esua-epdc.iml b/esua-epdc/esua-epdc.iml deleted file mode 100644 index d1f05fac..00000000 --- a/esua-epdc/esua-epdc.iml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file