Merge remote-tracking branch 'origin/hotfix/heart_bug' into hotfix/ResidentClient_bug

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java

@@ -17,10 +17,8 @@
 
 package com.elink.esua.epdc.modules.activity.controller;
 
-import com.elink.esua.epdc.activity.ActBannerDTO;
 import com.elink.esua.epdc.activity.ActInfoDTO;
 import com.elink.esua.epdc.activity.form.ActInfoFormDTO;
-import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO;
 import com.elink.esua.epdc.activity.result.ActInfoResultDTO;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
@@ -29,21 +27,16 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
-import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 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.constant.ActStateConstant;
-import com.elink.esua.epdc.dto.ScheduleJobDTO;
 import com.elink.esua.epdc.modules.activity.excel.ActInfoExcel;
-import com.elink.esua.epdc.modules.activity.service.ActBannerService;
 import com.elink.esua.epdc.modules.activity.service.ActInfoService;
-import com.elink.esua.epdc.modules.feign.JobFeignClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -58,7 +51,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("actinfo")
 public class ActInfoController {
-    
+
     @Autowired
     private ActInfoService actInfoService;
 
@@ -131,5 +124,9 @@ public class ActInfoController {
         List<ActInfoDTO> list = actInfoService.list(params);
         ExcelUtils.exportExcelToTarget(response, null, list, ActInfoExcel.class);
     }
+    @GetMapping("/ifTime/{actId}")
+    public Result<String> ifNowTime(@PathVariable("actId") String actId){
+        return  actInfoService.ifNowTime(actId);
+    }
 
-}
+}

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

@@ -185,4 +185,13 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
      * @date 2020/4/3 9:23
      */
     void minusSignUpNum(String actId);
+
+    /**
+    * @Description:  判断活动时间是否已经结束 1 结束  0 还在进行中
+    * @Param: [actId]
+    * @return: com.elink.esua.epdc.commons.tools.utils.Result
+    * @Author: wk
+    * @Date: 2020/6/3
+    */
+    Result<String> ifNowTime(String  actId);
 }

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

@@ -245,6 +245,29 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         baseDao.minusSignUpNum(actId);
     }
 
+    /**
+    * @Description: 判断活动时间是否已经结束 1 结束  0 还在进行中
+    * @Param: [actId]
+    * @return: com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+    * @Author: wk
+    * @Date: 2020/6/3
+    */
+    @Override
+    public Result<String> ifNowTime(String actId) {
+        String returnTime = "0";
+        //根据活动id查询活动结束时间
+        ActInfoEntity entity = baseDao.selectById(actId);
+        Long end =  entity.getActEndTime().getTime();
+        System.out.println(end);
+        Long now = System.currentTimeMillis();
+        System.out.println(now);
+       if (now>end){
+           returnTime = "1";
+       }
+        //获取现在服务器时间并判断活动是否结束
+        return new Result<String>().ok(returnTime);
+    }
+
     @Override
     public Result<ActInfoDetailAppResultDTO> getDetailByApp(ActInfoAppFormDTO formDto) {
         formDto.setTimestamp(DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));

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

@@ -168,7 +168,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             //更新用户积分余额、插入积分日志表
             Result updateUserPointsResult = this.updateUserPoints(dto, actInfoDTO, actUserRelationDTO, actUserPointsLogEntity);
             if (!updateUserPointsResult.success()) {
-                return updateUserPointsResult;
+                return updateUserPointsResult.error("服务器异常，更新积分失败");
             }
             //拒绝加积分
         } else if (ActStateConstant.ACT_USER_RELATION_STATUS_POINTREJECT.equals(dto.getStatus())) {

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

@@ -216,7 +216,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
         } else if (ActUserRelationStatusConstant.NOT_APPROVED.equals(actUserRelationEntity.getStatus())) {
             informationFormDTO.setTitle(HeartNoticeConstant.NOTICE_SIGN_UP_NOT_PASSED);
             informationFormDTO.setBusinessType(HeartNoticeConstant.NOTICE__BUSINESS_TYPE_ACT_FAILURE);
-            informationFormDTO.setBusinessId(actUserLogId);
+            // informationFormDTO.setBusinessId(actUserLogId);
+            informationFormDTO.setBusinessId(actUserRelationEntity.getActId());
         } else {
             return;
         }
@@ -470,7 +471,10 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
                 actUserLog.setActUserRelationId(entity.getId());
                 actUserLog.setOperationType(actUserDefaultState);// 默认状态
                 actUserLog.setOperationTime(new Date());
-                actUserLogDao.insert(actUserLog);
+                int insertCount = actUserLogDao.insert(actUserLog);
+                if (insertCount > NumConstant.ZERO) {
+                    this.insertUserInformation(entity, actUserLog.getId());
+                }
             }
         } else {
             return new Result().ok("该活动暂时没有未审核的志愿者");

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

@@ -126,6 +126,9 @@
         <if test="actStatus != null and actStatus != ''">
             AND actInfo.ACT_STATUS = #{actStatus}
         </if>
+        <if test="title != null and title != ''">
+            AND actInfo.TITLE like '%${title}%'
+        </if>
         ORDER BY
         actInfo.CREATED_TIME DESC
     </select>
@@ -237,8 +240,8 @@
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         <if test='actType != null and actType != "" and actType == "5"'>
-            <![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
-            or actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}
+            <![CDATA[ AND (DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
+            or (actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}))
         </if>
         <if test='actType != null and actType != "" and actType != "5"'>
             AND (relation.STATUS = #{actType}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml

@@ -57,10 +57,10 @@
             left join epdc_user u on v.USER_ID = u.ID and u.del_flag = '0'
         where v.del_flag = '0' and u.id is not null
         <if test="realName !='' and realName != null">
-            and v.REAL_NAME = #{realName}
+            and v.REAL_NAME like '%${realName}%'
         </if>
         <if test="mobile !='' and mobile != null">
-            and v.MOBILE = #{mobile}
+            and v.MOBILE like '%${mobile}%'
         </if>
         <if test="deptId !='' and deptId != null">
             and v.ALL_DEPT_IDS like concat('%',#{deptId},'%')