diff --git a/src/main/java/com/sqx/modules/artificer/entity/Agency.java b/src/main/java/com/sqx/modules/artificer/entity/Agency.java index e4dd0af..5489efd 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Agency.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Agency.java @@ -2,6 +2,7 @@ package com.sqx.modules.artificer.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -52,6 +53,18 @@ public class Agency implements Serializable { */ private Long userId; + + @ApiModelProperty("正面照") + private String front; + + + @ApiModelProperty("反面照") + private String back; + + + @ApiModelProperty("资格证书") + private String certification; + /** * 时间 */ diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java index 379fbc8..dff4480 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/AppArtificerIntegralServiceImpl.java @@ -116,9 +116,13 @@ public class AppArtificerIntegralServiceImpl implements AppArtificerIntegralServ // Map jfMap = getJifenList(artificerId, startDate, endDate); // String zxjf = jfMap.get("zxscjf").toString(); // BigDecimal b = new BigDecimal(zxjf); - //当前周在线积分数 - ArtificerIntegralStatistics zxjfStatistics =artificerIntegralStatisticsService.getIntegralStatistics(artificerId,startDate,todayEndIncome,1); - BigDecimal b = zxjfStatistics.getIntegral(); + + List zxscList = ordersDao.getZxscList(artificerId,startDate,endDate); + BigDecimal b = BigDecimal.ZERO; + for (Orders par:zxscList) { + BigDecimal jf = new BigDecimal(par.getJifen()); + b = b.add(jf); + } //总积分 // String sumJf = jfMap.get("sumJf").toString();