我要申请 bug修改

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppVolunteerRankServiceImpl.java

@@ -58,6 +58,10 @@ public class AppVolunteerRankServiceImpl implements AppVolunteerRankService {
         // 网格
         dto.setGrid(deptDTO.getGrid());
         dto.setGridId(deptDTO.getGridId());
+        dto.setMobile(userDetail.getMobile());
+        dto.setFaceImg(userDetail.getFaceImg());
+        dto.setRealName(userDetail.getRealName());
+        dto.setNickname(userDetail.getNickname());
         dto.setApplyUserId(userDetail.getUserId());
         return appVolunteerRankFeignClient.addApply(dto);
     }

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActApplyInfoDTO.java

@@ -44,6 +44,26 @@ public class ActApplyInfoDTO implements Serializable {
      */
 	private String applyUserId;
 
+    /**
+     * 申请人昵称
+     */
+    private String nickname;
+    /**
+     * 申请人头像
+     */
+    private String faceImg;
+
+    /**
+     * 申请人手机号
+     */
+    private String mobile;
+
+    /**
+     * 申请人真实姓名
+     */
+    private String realName;
+
+
     /**
      * 志愿服务标题
      */

esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/ActApplyInfoFormDTO.java

@@ -41,6 +41,25 @@ public class ActApplyInfoFormDTO implements Serializable {
      * 申请人ID
      */
 	private String applyUserId;
+    /**
+     * 申请人昵称
+     */
+    private String nickname;
+    /**
+     * 申请人头像
+     */
+    private String faceImg;
+
+    /**
+     * 申请人手机号
+     */
+    private String mobile;
+
+    /**
+     * 申请人真实姓名
+     */
+    private String realName;
+
 
     /**
      * 志愿服务标题
@@ -53,7 +72,7 @@ public class ActApplyInfoFormDTO implements Serializable {
      * 志愿服务内容
      */
     @NotBlank(message = "志愿服务内容不能为空")
-    @Size(min = 0,max = 40,message = "志愿服务内容在500字以内")
+    @Size(min = 0,max = 500,message = "志愿服务内容在500字以内")
     private String actContent;
 
     /**

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActApplyInfoEntity.java

@@ -43,6 +43,25 @@ public class ActApplyInfoEntity extends BaseEpdcEntity {
      */
 	private String applyUserId;
 
+    /**
+     * 申请人昵称
+     */
+    private String nickname;
+    /**
+     * 申请人头像
+     */
+    private String faceImg;
+
+    /**
+     * 申请人手机号
+     */
+    private String mobile;
+
+    /**
+     * 申请人真实姓名
+     */
+    private String realName;
+
     /**
      * 志愿服务标题
      */

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActApplyInfoServiceImpl.java

@@ -39,6 +39,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -118,9 +119,16 @@ public class ActApplyInfoServiceImpl extends BaseServiceImpl<ActApplyInfoDao, Ac
 
     @Override
     public Result addApply(ActApplyInfoFormDTO dto) {
+        if(dto.getActStartTime().before(new Date())){
+            return new Result().error("开始时间不能小于当前时间");
+        }
+        if(dto.getActStartTime().getTime() == dto.getActEndTime().getTime()){
+            return new Result().error("开始时间不能等于结束时间");
+        }
         if(dto.getActStartTime().after(dto.getActEndTime())){
             return new Result().error("开始时间不能大于结束时间");
         }
+
         ActApplyInfoEntity entity = ConvertUtils.sourceToTarget(dto, ActApplyInfoEntity.class);
         insert(entity);
         return new Result();

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActApplyInfoDao.xml

@@ -6,6 +6,10 @@
     <resultMap type="com.elink.esua.epdc.modules.activity.entity.ActApplyInfoEntity" id="actApplyInfoMap">
         <result property="id" column="ID"/>
         <result property="applyUserId" column="APPLY_USER_ID"/>
+        <result property="mobile" column="MOBILE"/>
+        <result property="faceImg" column="FACE_IMG"/>
+        <result property="realName" column="REAL_NAME"/>
+        <result property="nickname" column="NICKNAME"/>
         <result property="actTitle" column="ACT_TITLE"/>
         <result property="actContent" column="ACT_CONTENT"/>
         <result property="actAddress" column="ACT_ADDRESS"/>