From d3abd3bf0d6341424748cce7d6a9ba1ebafba629 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Wed, 29 Jul 2020 17:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2=E6=8E=92=E5=BA=8F=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/VolunteerInfoDTO.java | 6 ++++++ .../epdc/controller/VolunteerInfoController.java | 15 ++++++++++++--- .../esua/epdc/entity/VolunteerInfoEntity.java | 5 +++++ .../main/resources/mapper/VolunteerInfoDao.xml | 8 +++++--- 4 files changed, 28 insertions(+), 6 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 c96e068e..44df7742 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 @@ -211,4 +211,10 @@ public class VolunteerInfoDTO implements Serializable { * 志愿者签名 */ private String volunteerSignature; + + + /** + * 志愿者排序 + */ + private Integer volunteerOrder; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java index 208eab22..fd616f44 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java @@ -108,11 +108,20 @@ public class VolunteerInfoController { public Result volunteerInfoCheck(@RequestBody VolunteerInfoDTO dto) { return volunteerInfoService.volunteerInfoCheck(dto); } - + /*** + * 只能修改排序 + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/7/29 16:44 + */ @PutMapping - public Result update(@RequestBody VolunteerInfoDTO dto) { + public Result update(@RequestBody VolunteerInfoDTO formDto) { //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); +// ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + VolunteerInfoDTO dto = new VolunteerInfoDTO(); + dto.setVolunteerOrder(formDto.getVolunteerOrder()); + dto.setId(formDto.getId()); volunteerInfoService.update(dto); return new Result(); } 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 c8a84e04..dfca3804 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 @@ -148,4 +148,9 @@ public class VolunteerInfoEntity extends DeptScope { * 志愿者签名 */ private String volunteerSignature; + + /** + * 志愿者排序 + */ + private Integer volunteerOrder; } 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 481c6856..b49fb8ce 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 @@ -54,7 +54,8 @@ u.POINTS points, date_format(v.REGIST_TIME,'%Y.%m.%d %H.%i') registTimeString, v.REGIST_TIME registTime, - v.AUDIT_STATUS auditStatus + v.AUDIT_STATUS auditStatus, + v.VOLUNTEER_ORDER volunteerOrder FROM epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID and u.del_flag = '0' @@ -103,7 +104,8 @@ v.INTRODUCE introduce, u.POINTS points, date_format(v.REGIST_TIME,'%Y.%m.%d %H.%i') registTimeString, - v.REGIST_TIME registTime + v.REGIST_TIME registTime, + v.VOLUNTEER_ORDER volunteerOrder FROM epdc_volunteer_info v left join epdc_user u on v.USER_ID = u.ID where v.ID = #{id} @@ -221,7 +223,7 @@ WHERE v.DEL_FLAG = 0 AND v.AUDIT_STATUS != 2 - ORDER BY CONVERT(v.VOLUNTEER_NICKNAME USING gbk) + ORDER BY v.VOLUNTEER_ORDER ASC LIMIT #{pageIndex},#{pageSize}