Merge remote-tracking branch 'origin/dev_1118' into dev_1118

# Conflicts:
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java
#	esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/controller/EvaluateOfficerController.java

@@ -96,12 +96,13 @@ public class EvaluateOfficerController {
     /***
      * 导入分类Excel表格
      * @Author wanggongfeng
-     * @Description excle层级导入
+     * @Description excle层级导入  ,@PathVariable("deptId") String deptId
      * @Date 2020/02/07 8:20
      */
-    @PostMapping("importExcel")
+    @PostMapping("importExcel/{deptId}")
-    public Result importExcel(@RequestParam("file") MultipartFile file) {
+    public Result importExcel(@RequestParam("file") MultipartFile file, @PathVariable("deptId") String deptId) {
-        return  evaluateOfficerService.insertPartyList(file);
+        return  evaluateOfficerService.insertPartyList(file, deptId);
+        //return new Result();
     }
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/dao/EvaluateOfficerDao.java

@@ -46,4 +46,10 @@ public interface EvaluateOfficerDao extends BaseDao<EvaluateOfficerEntity> {
      * @param evaluateOfficerEntities
      */
     void insertList(@Param("evaluateOfficerEntities")EvaluateOfficerEntity[] evaluateOfficerEntities);
+
+    /**
+     * 清空当前街道数据
+     * @param deptId
+     */
+    void deleteByDeptId(@Param("deptId")String deptId);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/EvaluateOfficerService.java

@@ -105,5 +105,5 @@ public interface EvaluateOfficerService extends BaseService<EvaluateOfficerEntit
     /***
      * 导入分类表格
      */
-    Result insertPartyList(MultipartFile file);
+    Result insertPartyList(MultipartFile file, String deptId);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/evaluate/service/impl/EvaluateOfficerServiceImpl.java

@@ -139,7 +139,12 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
     }
 
     @Override
-    public Result insertPartyList(MultipartFile file) {
+    public Result insertPartyList(MultipartFile file,String deptId) {
+        // 清空当前街道数据
+        if(deptId != null && !"".equals(deptId)){
+            baseDao.deleteByDeptId(deptId);
+        }
+
         //获取excle版本
         String isExcel2003 = getExcelInfo(file);
         Result result = new Result();
@@ -174,9 +179,9 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
                 if (row == null) {
                     continue;
                 }
+                EvaluateOfficerEntity evaluateOfficerEntity = new EvaluateOfficerEntity();
                 // 循环Excel的列
-                for (int c = 0; c < 5; c++) {
+                for (int c = 0; c < 6; c++) {
-                    EvaluateOfficerEntity evaluateOfficerEntity = new EvaluateOfficerEntity();
                     Cell cell = row.getCell(c);
                     if (null != cell) {
                         if (c == 0) {
@@ -209,27 +214,27 @@ public class EvaluateOfficerServiceImpl extends BaseServiceImpl<EvaluateOfficerD
                             String value = getCellContent(cell);
                             evaluateOfficerEntity.setOpposeCount(Integer.parseInt(value));
 
-                        }else if (c == 5) {
+                        }else if ( c == 5) {
                             // 排序
                             String value = getCellContent(cell);
                             evaluateOfficerEntity.setSort(Integer.parseInt(value));
 
                         }
 
-                        evaluateOfficerEntity.setDeptId("11231");
+
-
-                        String userId = SecurityUser.getUserId() == null ? "" : SecurityUser.getUserId().toString();
-                        ;
-                        evaluateOfficerEntity.setId(getLongRandom());
-                        evaluateOfficerEntity.setDelFlag("0");//删除标识  0：未删除    1：删除
-                        evaluateOfficerEntity.setRevision(0);
-                        evaluateOfficerEntity.setCreatedBy(userId);
-                        evaluateOfficerEntity.setUpdatedBy(userId);
-                        evaluateOfficerEntity.setCreatedTime(new Date());
-                        evaluateOfficerEntity.setUpdatedTime(new Date());
                     }
-                    list.add(evaluateOfficerEntity);
                 }
+                evaluateOfficerEntity.setDeptId(deptId);
+
+                String userId = SecurityUser.getUserId() == null ? "" : SecurityUser.getUserId().toString();
+                evaluateOfficerEntity.setId(getLongRandom());
+                evaluateOfficerEntity.setDelFlag("0");//删除标识  0：未删除    1：删除
+                evaluateOfficerEntity.setRevision(0);
+                evaluateOfficerEntity.setCreatedBy(userId);
+                evaluateOfficerEntity.setUpdatedBy(userId);
+                evaluateOfficerEntity.setCreatedTime(new Date());
+                evaluateOfficerEntity.setUpdatedTime(new Date());
+                list.add(evaluateOfficerEntity);
             }
             if(list.size() > 0){
                 EvaluateOfficerEntity[] evaluateOfficerEntities = new EvaluateOfficerEntity[list.size()];

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOfficerDao.xml

@@ -87,5 +87,8 @@
             #{item.updatedTime})
         </foreach>
     </insert>
+    <delete id="deleteByDeptId" parameterType="String">
+        delete from epdc_evaluate_officer where DEPT_ID = #{deptId}
+    </delete>
 
 </mapper>

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

@@ -33,11 +33,10 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.ActStateConstant;
 import com.elink.esua.epdc.constant.ActUserRelationStatusConstant;
 import com.elink.esua.epdc.dto.UserDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActUserClockLogDao;
-import com.elink.esua.epdc.modules.activity.dao.ActUserRelationDao;
 import com.elink.esua.epdc.modules.activity.entity.ActUserClockLogEntity;
-import com.elink.esua.epdc.modules.activity.redis.ActUserClockLogRedis;
 import com.elink.esua.epdc.modules.activity.service.*;
 import com.elink.esua.epdc.modules.feign.PointsFeignClient;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
@@ -47,6 +46,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.text.DecimalFormat;
 import java.util.*;
 
 /**
@@ -58,9 +58,6 @@ import java.util.*;
 @Service
 public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogDao, ActUserClockLogEntity> implements ActUserClockLogService {
 
-    @Autowired
-    private ActUserClockLogRedis actUserClockLogRedis;
-
     @Autowired
     private ActUserRelationService actUserRelationService;
 
@@ -69,6 +66,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
 
     @Autowired
     private ActUserLogService actUserLogService;
+
     @Autowired
     private ActUserPointsLogService actUserPointsLogService;
 
@@ -77,10 +75,9 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
 
     @Autowired
     private UserInfoFeignClient userInfoFeignClient;
+
     @Autowired
     private PointsFeignClient pointsFeignClient;
-    @Autowired
-    private ActUserRelationDao actUserRelationDao;
 
 
     @Override
@@ -149,6 +146,11 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             pointsLogDTO.setOperationPointsType(ActStateConstant.OPERATION_POINTS_TYPE_ADD);
             point =actInfoDTO.getReward();
             pointsLogDTO.setPoints(point);
+            // 志愿者增加爱心时长
+            Result result = this.calculationKindnessTime(actInfoDTO, dto.getId());
+            if (!result.success()) {
+                return result;
+            }
 
         //拒绝加积分
         } else if (ActStateConstant.ACT_USER_RELATION_STATUS_POINTREJECT.equals(dto.getStatus())) {
@@ -171,7 +173,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         //增加积分记录
         actUserPointsLogService.save(pointsLogDTO);
         // 更新用户状态
-         return userInfoHandle(dto,pointsLogsEntity);
+        return userInfoHandle(dto,pointsLogsEntity);
 
     }
 
@@ -277,4 +279,34 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
         return new Result().ok("打卡成功");
     }
 
+    /**
+     *
+     * 确认积分时志愿者增加爱心时长
+     *
+     * @params [actInfoDTO, actUserId]
+     * @return Result
+     * @author liuchuang
+     * @since 2020/2/7 17:06
+     */
+    private Result calculationKindnessTime(ActInfoDTO actInfoDTO, String actUserId) {
+        ActUserRelationDTO actUserRelationDto = actUserRelationService.get(actUserId);
+        if (null != actUserRelationDto) {
+            try {
+                // 计算爱心时长（单位：小时，保留两位小数）
+                DecimalFormat df = new DecimalFormat("0.00");
+                String kindnessTime = df.format((float) actInfoDTO.getActEndTime().getTime() / actInfoDTO.getActStartTime().getTime());
+
+                EpdcVolunteerKindnessTimeFormDTO formDto = new EpdcVolunteerKindnessTimeFormDTO();
+                formDto.setKindnessTime(Float.valueOf(kindnessTime));
+                formDto.setUserId(actUserRelationDto.getUserId());
+                return userInfoFeignClient.addKindnessTime(formDto);
+            } catch (Exception e) {
+                e.printStackTrace();
+                return new Result().error();
+            }
+        }
+
+        return new Result();
+    }
+
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/UserInfoFeignClient.java

@@ -5,6 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.modules.feign.fallback.UserInfoFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
@@ -66,4 +67,16 @@ public interface UserInfoFeignClient {
      **/
     @PostMapping(value = "app-user/user/handleUserPoints", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<UserDTO> handleUserPoints(EpdcUserPointsFormDTO formDTO);
+
+    /**
+     *
+     * 志愿者增加参与活动爱心时长
+     *
+     * @params [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2020/2/7 18:16
+     */
+    @PostMapping(value = "app-user/volunteerinfo/addKindnessTime", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result addKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/UserInfoFeignClientFallback.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.modules.feign.UserInfoFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -39,4 +40,9 @@ public class UserInfoFeignClientFallback implements UserInfoFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "handleUserPoints", formDTO);
     }
 
+    @Override
+    public Result addKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "addKindnessTime", formDto);
+    }
+
 }

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

@@ -245,7 +245,7 @@
         </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}
-            || actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}
+            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-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java

@@ -0,0 +1,27 @@
+package com.elink.esua.epdc.dto.epdc.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 增加志愿者爱心时长Form DTO
+ *
+ * @Author：liuchuang
+ * @Date：2020/2/7 18:29
+ */
+@Data
+public class EpdcVolunteerKindnessTimeFormDTO implements Serializable {
+    private static final long serialVersionUID = 6680590022205970530L;
+
+    /**
+     * 爱心时长
+     */
+    private Float kindnessTime;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+}

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/VolunteerInfoController.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 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.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.excel.VolunteerInfoExcel;
 import com.elink.esua.epdc.service.UserTagService;
@@ -166,4 +167,18 @@ public class VolunteerInfoController {
         return volunteerInfoService.getVolunteerInfoDTOByUserId(userId);
     }
 
+    /**
+     *
+     * 增加志愿者爱心时长
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2020/2/7 18:40
+     */
+    @PostMapping("addKindnessTime")
+    public Result addKindnessTime(@RequestBody EpdcVolunteerKindnessTimeFormDTO formDto) {
+        return volunteerInfoService.modifyVolunteerKindnessTime(formDto);
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
@@ -116,4 +117,15 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
      * @Date 2020/2/6 12:25
      **/
     VolunteerInfoDTO selectOneVolunteerInfoDTO(String userId);
+
+    /**
+     *
+     * 增加志愿者爱心时长
+     *
+     * @params [formDto]
+     * @return void
+     * @author liuchuang
+     * @since 2020/2/7 18:34
+     */
+    void updateVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
@@ -192,4 +193,15 @@ public interface VolunteerInfoService extends BaseService<VolunteerInfoEntity> {
      * @Date 2020/2/7 10:36
      **/
     Result volunteerInfoCheck(VolunteerInfoDTO dto);
+
+    /**
+     *
+     * 增加志愿者爱心时长
+     *
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author liuchuang
+     * @since 2020/2/7 18:37
+     */
+    Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java

@@ -34,6 +34,7 @@ import com.elink.esua.epdc.dto.UserTagDTO;
 import com.elink.esua.epdc.dto.VolunteerInfoDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
+import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO;
 import com.elink.esua.epdc.entity.VolunteerInfoEntity;
@@ -331,4 +332,11 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         return new Result();
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto) {
+        baseDao.updateVolunteerKindnessTime(formDto);
+        return new Result();
+    }
+
 }

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

@@ -194,4 +194,13 @@
         where m.DEL_FLAG='0'
         and m.USER_ID=#{userId}
     </select>
+
+    <update id="updateVolunteerKindnessTime">
+        UPDATE epdc_volunteer_info
+        SET KINDNESS_TIME = ( KINDNESS_TIME + #{kindnessTime} ),
+        PARTICIPATION_NUM = ( PARTICIPATION_NUM + 1 )
+        WHERE
+            USER_ID = #{userId}
+            AND DEL_FLAG = '0'
+    </update>
 </mapper>