修改爱心时长字段类型

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

@@ -46,6 +46,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.util.*;
 
@@ -297,7 +298,8 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
                 String kindnessTime = df.format((float) actInfoDTO.getActEndTime().getTime() / actInfoDTO.getActStartTime().getTime());
 
                 EpdcVolunteerKindnessTimeFormDTO formDto = new EpdcVolunteerKindnessTimeFormDTO();
-                formDto.setKindnessTime(Float.valueOf(kindnessTime));
+                BigDecimal b = new BigDecimal(kindnessTime);
+                formDto.setKindnessTime(b);
                 formDto.setUserId(actUserRelationDto.getUserId());
                 return userInfoFeignClient.addKindnessTime(formDto);
             } catch (Exception e) {

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 
@@ -72,7 +73,7 @@ public class VolunteerInfoDTO implements Serializable {
     /**
      * 爱心时长(单位：分钟)
      */
-    private Integer kindnessTime;
+    private BigDecimal kindnessTime;
 
     /**
      * 参加活动次数

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcVolunteerKindnessTimeFormDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.form;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  *
@@ -18,7 +19,7 @@ public class EpdcVolunteerKindnessTimeFormDTO implements Serializable {
     /**
      * 爱心时长
      */
-    private Float kindnessTime;
+    private BigDecimal kindnessTime;
 
     /**
      * 用户ID

esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcVolunteerInfoResultDTO.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -47,7 +48,7 @@ public class EpdcVolunteerInfoResultDTO implements Serializable {
     /**
      * 爱心时长(单位：分钟)
      */
-    private Integer kindnessTime;
+    private BigDecimal kindnessTime;
 
     /**
      * 参加活动次数

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -71,7 +72,7 @@ public class VolunteerInfoEntity extends BaseEpdcEntity {
     /**
      * 爱心时长(单位：分钟)
      */
-	private Integer kindnessTime;
+	private BigDecimal kindnessTime;
 
     /**
      * 参加活动次数

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/VolunteerInfoExcel.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -53,7 +54,7 @@ public class VolunteerInfoExcel {
     private String identityNo;
 
     @Excel(name = "爱心时长(单位：分钟)")
-    private Integer kindnessTime;
+    private BigDecimal kindnessTime;
 
     @Excel(name = "参加活动次数")
     private Integer participationNum;

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

@@ -217,8 +217,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         volunteerEntity.setRegistTime(new Date());// 注册时间
         volunteerEntity.setAuditStatus("1");      // 审核状态 默认审核通过
         volunteerEntity.setAuditTime(new Date()); // 审核时间
-        volunteerEntity.setKindnessTime(0);       // 爱心时长(单位：分钟)
-        volunteerEntity.setParticipationNum(0);   // 参加活动次数
         String address = volunteerEntity.getRoad()
                 .concat(StringUtils.isNotBlank(volunteerEntity.getVillageName()) ? volunteerEntity.getVillageName() : "")
                 .concat(StringUtils.isNotBlank(volunteerEntity.getDwellingPlace()) ? volunteerEntity.getDwellingPlace() : "");