From 2159caa3b48428575501a8a1c188396684fb7270 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 10:56:43 +0800 Subject: [PATCH 01/15] =?UTF-8?q?get=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiActUserRelationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java index f9117cacb..a8acaa43b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java @@ -126,7 +126,7 @@ public class ApiActUserRelationController { * @date 2019/12/13 14:41 */ @GetMapping("clockList") - public Result getClockList(@LoginUser TokenDto tokenDto, @PathVariable("actId") String actId) { + public Result getClockList(@LoginUser TokenDto tokenDto, String actId) { Result result = actUserRelationService.getClockList(actId); EpdcAppClockListDTO epdcAppClockListDTO = ConvertUtils.sourceToTarget(result.getData(), EpdcAppClockListDTO.class); Result result1 = new Result(); @@ -144,7 +144,7 @@ public class ApiActUserRelationController { * @date 2019/12/13 14:41 */ @GetMapping("clockAddressDetail") - public Result clockAddressDetail(@PathVariable("actId") String actId) { + public Result clockAddressDetail(String actId) { return actUserRelationService.clockAddressDetail(actId); } From 4616c3cd100826b3cfbc8efba535600f5116ac89 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 14:40:18 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java index f913f911b..b4d4c792e 100644 --- a/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-mybatis/src/main/java/com/elink/esua/epdc/commons/mybatis/utils/DeptEntityUtils.java @@ -12,7 +12,7 @@ import lombok.Data; public class DeptEntityUtils { @Data - public class DeptDto { + public static class DeptDto { /** * 父所有部门ID */ From d7fe4f359a929b500f6f691ee1cde1d87e7223a8 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 15 Jan 2020 15:09:16 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java | 4 ++-- .../esua/epdc/service/impl/KpiResultGridServiceImpl.java | 4 ++-- .../main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java | 2 +- .../esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java | 2 +- .../java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java | 2 +- .../java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java | 2 +- .../esua/epdc/service/impl/VolunteerInfoServiceImpl.java | 2 +- .../src/main/resources/mapper/VolunteerInfoDao.xml | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java index 06a130875..342d357c8 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/enums/KpiResultGridDataEnum.java @@ -15,12 +15,12 @@ public enum KpiResultGridDataEnum { /*** * 群众反映问题网格响应率得分 */ - GIRD_PROBLEM_RESPONSE_RATE_SCORE("gird_problem_response_rate_score","群众反映问题网格响应率得分"), + GRID_PROBLEM_RESPONSE_RATE_SCORE("grid_problem_response_rate_score","群众反映问题网格响应率得分"), /*** * 群众反映问题网格办理满意率得分 */ - GIRD_PROBLEM_SATISFACTION_RATE_SCORE("gird_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分"); + GRID_PROBLEM_SATISFACTION_RATE_SCORE("grid_problem_satisfaction_rate_score","群众反映问题网格办理满意率得分"); private String value; diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java index 374220910..57b95a2ea 100644 --- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiResultGridServiceImpl.java @@ -135,7 +135,7 @@ public class KpiResultGridServiceImpl extends BaseServiceImpl dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGirdId()+""); + Result dtoResult = adminFeignClient.getParentAndAllDept(volunteerEntity.getGridId()+""); ParentAndAllDeptDTO parentAndAllDeptDTO = dtoResult.getData(); volunteerEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); // 父所有部门ID 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 cc63523f3..d04a99f38 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 @@ -14,7 +14,7 @@ - + @@ -112,7 +112,7 @@ eu.REAL_NAME fullName, eu.MOBILE mobile, eu.IDENTITY_NO identityNo, - eugr.GRID_ID girdId, + eugr.GRID_ID gridId, eu.PARENT_DEPT_IDS parentDeptIds, eu.PARENT_DEPT_NAMES parentDeptNames, eu.ALL_DEPT_IDS allDeptIds, From 9f2ba5c47921e9f63988cc874d8582a3639d5edc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 16:44:46 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/EpdcAppVolunteerInfoController.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 7e42ed6d5..99306f05f 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 @@ -9,10 +9,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO; 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.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -46,7 +43,7 @@ public class EpdcAppVolunteerInfoController { * @return */ @GetMapping("insertVolunteerInfo") - public Result insertVolunteerInfo(EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) { + public Result insertVolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoFormDTO epdcCompleteVolunteerInfoFormDTO) { //效验数据 ValidatorUtils.validateEntity(epdcCompleteVolunteerInfoFormDTO, UpdateGroup.class, DefaultGroup.class); Result result = volunteerInfoService.insertVolunteerInfo(epdcCompleteVolunteerInfoFormDTO); From 26dba563f0ad10e2daca608a5159152b3b9dcffa Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 15 Jan 2020 16:59:52 +0800 Subject: [PATCH 05/15] =?UTF-8?q?full=5Fname=E5=AD=97=E6=AE=B5=E6=94=B9?= =?UTF-8?q?=E4=B8=BAreal=5Fname=20by=20=E5=BC=A0=E5=8B=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/VolunteerInfoDTO.java | 5 +++-- .../result/EpdcAdjustVolunteerPointsDTO.java | 2 +- .../result/EpdcVolunteerInfoResultDTO.java | 2 +- .../esua/epdc/entity/VolunteerInfoEntity.java | 2 +- .../esua/epdc/excel/VolunteerInfoExcel.java | 2 +- .../main/resources/mapper/VolunteerInfoDao.xml | 18 +++++++++--------- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java index 359ff495a..26f803b4b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java @@ -17,9 +17,10 @@ package com.elink.esua.epdc.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -46,7 +47,7 @@ public class VolunteerInfoDTO implements Serializable { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女，1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java index 1696f9f45..27933901e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAdjustVolunteerPointsDTO.java @@ -31,7 +31,7 @@ public class EpdcAdjustVolunteerPointsDTO implements Serializable { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女，1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java index c98ad069d..9b5bc2b5f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java @@ -22,7 +22,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女，1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java index cb4584672..cf4e9c810 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java @@ -46,7 +46,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity { /** * 姓名 */ - private String fullName; + private String realName; /** * 性别(0-女，1-男) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java index b9822bcdd..403771953 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java @@ -38,7 +38,7 @@ public class VolunteerInfoExcel { private String userId; @Excel(name = "姓名") - private String fullName; + private String realName; @Excel(name = "性别(0-女，1-男)") private String sex; 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 d04a99f38..725554e52 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 @@ -6,7 +6,7 @@ - + @@ -41,7 +41,7 @@ SELECT v.ID id, v.USER_ID userId, - v.FULL_NAME fullName, + v.REAL_NAME realName, v.SEX sex, v.BIRTHDAY birthday, date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString, @@ -55,8 +55,8 @@ FROM epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID where 1=1 - - and v.FULL_NAME = #{fullName} + + and v.REAL_NAME = #{realName} and v.MOBILE = #{mobile} @@ -74,8 +74,8 @@ FROM epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID where 1=1 - - and v.FULL_NAME = #{fullName} + + and v.REAL_NAME = #{realName} and v.MOBILE = #{mobile} @@ -90,7 +90,7 @@ SELECT v.ID id, v.USER_ID userId, - v.FULL_NAME fullName, + v.REAL_NAME realName, v.SEX sex, v.BIRTHDAY birthday, date_format(v.BIRTHDAY,'%Y.%m.%d') birthdayString, @@ -109,7 +109,7 @@ + + + From c6afe11c4a4308e9bfd5d78a2730b652782ee8a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 15 Jan 2020 18:05:41 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActBannerController.java | 2 +- .../modules/activity/dao/ActBannerDao.java | 6 +++- .../activity/service/ActBannerService.java | 3 ++ .../service/impl/ActBannerServiceImpl.java | 6 ++++ .../mapper/activity/ActBannerDao.xml | 32 +++++++++++++++++++ 5 files changed, 47 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java index 21145b0fc..19e430ff3 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java @@ -52,7 +52,7 @@ public class ActBannerController { @GetMapping("page") public Result> page(@RequestParam Map params){ - PageData page = actBannerService.page(params); + PageData page = actBannerService.getActBannerPage(params); return new Result>().ok(page); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java index 1ea4b2c20..f7ff1fb7e 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java @@ -17,10 +17,14 @@ package com.elink.esua.epdc.modules.activity.dao; +import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; +import java.util.Map; + /** * 爱心互助活动banner 爱心互助活动banner * @@ -29,5 +33,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ActBannerDao extends BaseDao { - + List getActBannerlist(Map params); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java index 229a8bac9..4555386ed 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java @@ -44,6 +44,9 @@ public interface ActBannerService extends BaseService { */ PageData page(Map params); + PageData getActBannerPage(Map params); + + /** * 默认查询 * diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index 90be38a6c..4734d45b9 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java @@ -60,6 +60,12 @@ public class ActBannerServiceImpl extends BaseServiceImpl getActBannerPage(Map params) { + IPage page = getPage(params); + List list = baseDao.getActBannerlist(params); + return new PageData<>(list, page.getTotal()); + } @Override public List list(Map params) { diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index 4ecbd1e8c..bf9d8c9bc 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -22,6 +22,38 @@ + \ No newline at end of file From b74c2b6bc5b50225a7441fe333a418e6938b98c3 Mon Sep 17 00:00:00 2001 From: yinzuomei Date: Wed, 15 Jan 2020 18:21:39 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=9F=A5=E8=AF=A2CachingUserInfoDTOsql?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/UserDao.xml | 38 ++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 006d43d2d..284ca5116 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -400,26 +400,28 @@ - + From 5a9c8db7e647981006bc2bdbf52c796c43b4f79a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 16 Jan 2020 10:12:14 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java index e178ffe5f..6c3ccb3ec 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcCompleteUserInfoFormDTO.java @@ -22,8 +22,8 @@ public class EpdcCompleteUserInfoFormDTO implements Serializable { /** * 身份证号码 */ - @NotBlank(message = "身份证号码不能为空") private String identityNo; + /** * 手机号 */ From 02374a4514b25041099bb935624556d16c6a48ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 16 Jan 2020 13:53:27 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActInfoDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 3fac48ef6..05512e477 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -343,14 +343,14 @@ IF(clock.clockCount is not null ,'1','0') as signupFlag, relation.ID as actUserId, - IF(volunteer.USER_ID is not null ,'1','0') as userVolunteerFlag + volunteer.AUDIT_STATUS as userVolunteerFlag FROM epdc_act_info actInfo left join epdc_act_user_relation relation on relation.DEL_FLAG = '0' and relation.USER_ID = #{userId} and actInfo.ID = relation.ACT_ID LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID - LEFT JOIN epdc_volunteer_rank volunteer ON volunteer.USER_ID = relation.USER_ID AND volunteer.DEL_FLAG = '0' + LEFT JOIN esua_epdc_user.epdc_volunteer_info volunteer ON volunteer.USER_ID = relation.USER_ID AND volunteer.DEL_FLAG = '0' WHERE actInfo.DEL_FLAG = '0' AND actInfo.ID = #{id} From c5ca0eca4f503ba9380a2a9d87ef37bfcc00228d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 16 Jan 2020 14:03:15 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActInfoDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 05512e477..5c86bcd06 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -342,8 +342,7 @@ end as currentUserStatus, IF(clock.clockCount is not null ,'1','0') as signupFlag, relation.ID as actUserId, - - volunteer.AUDIT_STATUS as userVolunteerFlag + IF(volunteer.AUDIT_STATUS is not null and volunteer.AUDIT_STATUS = '1','1','0') as userVolunteerFlag FROM epdc_act_info actInfo left join epdc_act_user_relation relation on relation.DEL_FLAG = '0' From 65b181834200a7ece9b6e18dc15249726d7cc9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Thu, 16 Jan 2020 17:44:09 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiAppActInfoController.java | 22 ++++++++++++++----- .../esua/epdc/feign/ActInfoFeignClient.java | 10 +++++---- .../fallback/ActInfoFeignClientFallback.java | 8 +++---- .../esua/epdc/service/ActInfoService.java | 5 +++-- .../epdc/service/impl/ActInfoServiceImpl.java | 9 ++++---- .../epdc/activity/form/ActInfoAppFormDTO.java | 2 +- .../epdc-heart/epdc-heart-server/pom.xml | 6 +++++ .../controller/AppActInfoController.java | 14 +++++++----- .../activity/service/ActInfoService.java | 5 +++-- .../service/impl/ActInfoServiceImpl.java | 16 +++----------- 10 files changed, 55 insertions(+), 42 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java index b98ebd616..fc5268df8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java @@ -4,6 +4,8 @@ import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.service.ActInfoService; @@ -33,7 +35,8 @@ public class ApiAppActInfoController { * @Date: 2019/11/19 16:34 */ @GetMapping("list") - public Result> listItems(ActInfoAppFormDTO formDto) { + public Result> listItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) { + formDto.setUserId(tokenDto.getUserId()); return actInfoService.listItems(formDto); } /** @@ -44,7 +47,8 @@ public class ApiAppActInfoController { * @Date: 2019/11/19 16:34 */ @GetMapping("signupList") - public Result> signupListItems(ActInfoAppFormDTO formDto) { + public Result> signupListItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) { + formDto.setUserId(tokenDto.getUserId()); return actInfoService.signupListItems(formDto); } @@ -56,8 +60,11 @@ public class ApiAppActInfoController { * @Date: 2019/11/19 16:34 */ @GetMapping("detail/{id}") - public Result detail(@PathVariable String id) { - return actInfoService.getDetail(id); + public Result detail(@PathVariable String id, @LoginUser TokenDto tokenDto) { + ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); + formDto.setId(id); + formDto.setUserId(tokenDto.getUserId()); + return actInfoService.getDetail(formDto); } /** @@ -68,8 +75,11 @@ public class ApiAppActInfoController { * @Date: 2019/11/19 16:34 */ @GetMapping("rejectDetail/{id}") - public Result rejectDetail(@PathVariable String id) { - return actInfoService.getRejectDetail(id); + public Result rejectDetail(@PathVariable String id, @LoginUser TokenDto tokenDto) { + ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); + formDto.setId(id); + formDto.setUserId(tokenDto.getUserId()); + return actInfoService.getRejectDetail(formDto); } /** diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java index b0da74d87..c1ca0968a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java @@ -4,6 +4,8 @@ import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; @@ -56,11 +58,11 @@ public interface ActInfoFeignClient { * @Author: lipengfei * @Date: 2019/11/19 16:42 */ - @GetMapping(value = "heart/appactinfo/detail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getDetail(@PathVariable String id); + @GetMapping(value = "heart/appactinfo/detail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDetail(ActInfoAppFormDTO formDto); - @GetMapping(value = "heart/appactinfo/rejectdetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getRejectDetail(@PathVariable String id); + @GetMapping(value = "heart/appactinfo/rejectdetail", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getRejectDetail(ActInfoAppFormDTO formDto); @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) Result getCancelDetail(@PathVariable String id); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java index 4eee372f9..b83175a18 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActInfoFeignClientFallback.java @@ -34,12 +34,12 @@ public class ActInfoFeignClientFallback implements ActInfoFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "signupListItems", formDto); } @Override - public Result getDetail(@PathVariable String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", id); + public Result getDetail(ActInfoAppFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getDetail", formDto); } @Override - public Result getRejectDetail(@PathVariable String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", id); + public Result getRejectDetail(ActInfoAppFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getRejectDetail", formDto); } @Override public Result getCancelDetail(@PathVariable String id) { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java index 53add1a7a..ffde98c20 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActInfoService.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.result.*; @@ -40,9 +41,9 @@ public interface ActInfoService { * @Author: lipengfei * @Date: 2019/11/19 16:34 */ - Result getDetail(String itemId); + Result getDetail(ActInfoAppFormDTO formDto); - Result getRejectDetail(String itemId); + Result getRejectDetail(ActInfoAppFormDTO formDto); Result getCancelDetail(String itemId); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java index 7380b37df..729c15dc3 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActInfoServiceImpl.java @@ -4,6 +4,7 @@ import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; import com.elink.esua.epdc.dto.item.form.*; @@ -40,12 +41,12 @@ public class ActInfoServiceImpl implements ActInfoService { } @Override - public Result getDetail(String itemId) { - return actInfoFeignClient.getDetail(itemId); + public Result getDetail(ActInfoAppFormDTO formDto) { + return actInfoFeignClient.getDetail(formDto); } @Override - public Result getRejectDetail(String itemId) { - return actInfoFeignClient.getRejectDetail(itemId); + public Result getRejectDetail(ActInfoAppFormDTO formDto) { + return actInfoFeignClient.getRejectDetail(formDto); } @Override public Result getCancelDetail(String itemId) { diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java index ce80d70c6..96221eaab 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActInfoAppFormDTO.java @@ -42,7 +42,7 @@ public class ActInfoAppFormDTO implements Serializable { @Min(value = 1, message = "页码必须大于0") private int pageIndex; - private Long userId; + private String userId; private String id; /** diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml index b7e9ab4b8..be51dc2e4 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml @@ -66,6 +66,12 @@ com.alibaba.boot nacos-config-spring-boot-starter + + com.esua.epdc + epdc-common-clienttoken + 1.0.0 + compile + diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java index ea0115797..9eeae53d4 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActInfoController.java @@ -22,6 +22,8 @@ import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.activity.result.AppActInfoDTO; +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; @@ -87,9 +89,9 @@ public class AppActInfoController { * @Author: lipengfei * @Date: 2019/11/19 16:46 */ - @GetMapping("detail/{id}") - public Result getDetail(@PathVariable String id) { - return this.actInfoService.getDetailByApp(id); + @GetMapping("detail") + public Result getDetail(@RequestBody ActInfoAppFormDTO formDto) { + return this.actInfoService.getDetailByApp(formDto); } /** @@ -99,9 +101,9 @@ public class AppActInfoController { * @Author: lipengfei * @Date: 2019/11/19 16:46 */ - @GetMapping("rejectdetail/{id}") - public Result getRejectDetail(@PathVariable String id) { - return this.actInfoService.getRejectDetailByApp(id); + @GetMapping("rejectdetail") + public Result getRejectDetail(@RequestBody ActInfoAppFormDTO formDto) { + return this.actInfoService.getRejectDetailByApp(formDto); } /** * 项目详情--工作端 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java index be4731bc3..45c46d8c4 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java @@ -23,6 +23,7 @@ import com.elink.esua.epdc.activity.form.ActInfoFormDTO; import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; import com.elink.esua.epdc.activity.result.ActInfoResultDTO; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -95,7 +96,7 @@ public interface ActInfoService extends BaseService { * @Author: liuchuang * @Date: 2019/9/10 20:54 */ - Result getDetailByApp(String id); + Result getDetailByApp(ActInfoAppFormDTO formDto); /** * 移动端-项目详情 * @Params: [formDto] @@ -103,7 +104,7 @@ public interface ActInfoService extends BaseService { * @Author: liuchuang * @Date: 2019/9/10 20:54 */ - Result getRejectDetailByApp(String id); + Result getRejectDetailByApp(ActInfoAppFormDTO formDto); /** * 移动端-项目详情 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index 8a042b7a8..26a1d4eac 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -162,8 +162,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl> signupListItemsByApp(ActInfoAppFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setUserId(SecurityUser.getUserId()); - formDto.setPageIndex(pageIndex); List data = baseDao.signupListItemsByApp(formDto); return new Result>().ok(data); @@ -178,8 +176,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl> listItemsByApp(ActInfoAppFormDTO formDto) { int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); - formDto.setUserId(SecurityUser.getUserId()); - formDto.setPageIndex(pageIndex); List data = baseDao.listItemsByApp(formDto); return new Result>().ok(data); @@ -208,10 +204,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl getDetailByApp(String id) { - ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); - formDto.setId(id); - formDto.setUserId(SecurityUser.getUserId()); + public Result getDetailByApp(ActInfoAppFormDTO formDto) { + Date currentTime = new Date(); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); String dateString = formatter.format(currentTime); @@ -220,11 +214,7 @@ public class ActInfoServiceImpl extends BaseServiceImpl().ok(resultDTO); } @Override - public Result getRejectDetailByApp(String id) { - ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); - formDto.setId(id); - formDto.setUserId(SecurityUser.getUserId()); - + public Result getRejectDetailByApp(ActInfoAppFormDTO formDto) { ActInfoDetailAppResultDTO resultDTO = baseDao.getRejectDetailByApp(formDto); return new Result().ok(resultDTO); } From 970584b13a9b9afbc5755c2d9e76e393bba23c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 17 Jan 2020 10:46:44 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActInfoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 5c86bcd06..4e7e5db2a 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml @@ -349,7 +349,7 @@ and relation.USER_ID = #{userId} and actInfo.ID = relation.ACT_ID LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID - LEFT JOIN esua_epdc_user.epdc_volunteer_info volunteer ON volunteer.USER_ID = relation.USER_ID AND volunteer.DEL_FLAG = '0' + LEFT JOIN esua_epdc_user.epdc_volunteer_info volunteer ON (volunteer.USER_ID = relation.USER_ID OR volunteer.USER_ID =#{userId}) AND volunteer.DEL_FLAG = '0' WHERE actInfo.DEL_FLAG = '0' AND actInfo.ID = #{id}