志愿者列表添加排序字段，接口更换排序规则

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;
 }

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

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;
 }

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}
     </select>