处理BUG
This commit is contained in:
parent
ad6dad7ec5
commit
db0cdebc9d
|
@ -2,6 +2,7 @@ package com.sqx.modules.artificer.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.IdType;
|
import com.baomidou.mybatisplus.annotation.IdType;
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
|
@ -52,6 +53,18 @@ public class Agency implements Serializable {
|
||||||
*/
|
*/
|
||||||
private Long userId;
|
private Long userId;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty("正面照")
|
||||||
|
private String front;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty("反面照")
|
||||||
|
private String back;
|
||||||
|
|
||||||
|
|
||||||
|
@ApiModelProperty("资格证书")
|
||||||
|
private String certification;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 时间
|
* 时间
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -116,9 +116,13 @@ public class AppArtificerIntegralServiceImpl implements AppArtificerIntegralServ
|
||||||
// Map<String,Object> jfMap = getJifenList(artificerId, startDate, endDate);
|
// Map<String,Object> jfMap = getJifenList(artificerId, startDate, endDate);
|
||||||
// String zxjf = jfMap.get("zxscjf").toString();
|
// String zxjf = jfMap.get("zxscjf").toString();
|
||||||
// BigDecimal b = new BigDecimal(zxjf);
|
// BigDecimal b = new BigDecimal(zxjf);
|
||||||
//当前周在线积分数
|
|
||||||
ArtificerIntegralStatistics zxjfStatistics =artificerIntegralStatisticsService.getIntegralStatistics(artificerId,startDate,todayEndIncome,1);
|
List<Orders> zxscList = ordersDao.getZxscList(artificerId,startDate,endDate);
|
||||||
BigDecimal b = zxjfStatistics.getIntegral();
|
BigDecimal b = BigDecimal.ZERO;
|
||||||
|
for (Orders par:zxscList) {
|
||||||
|
BigDecimal jf = new BigDecimal(par.getJifen());
|
||||||
|
b = b.add(jf);
|
||||||
|
}
|
||||||
|
|
||||||
//总积分
|
//总积分
|
||||||
// String sumJf = jfMap.get("sumJf").toString();
|
// String sumJf = jfMap.get("sumJf").toString();
|
||||||
|
|
Loading…
Reference in New Issue