修改bug
This commit is contained in:
parent
478a08160e
commit
2c70f6775c
|
@ -364,7 +364,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
|
||||||
}else{
|
}else{
|
||||||
stringBuilder.append(minuteInt);
|
stringBuilder.append(minuteInt);
|
||||||
}
|
}
|
||||||
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()));
|
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()).last("limit 1"));
|
||||||
if(artificerTime==null){
|
if(artificerTime==null){
|
||||||
if(oldDate.equals(date)){
|
if(oldDate.equals(date)){
|
||||||
artificer.setTime(stringBuilder.toString());
|
artificer.setTime(stringBuilder.toString());
|
||||||
|
|
|
@ -51,7 +51,7 @@ public class UserPackageDetailServiceImpl extends ServiceImpl<UserPackageDetailD
|
||||||
List<UserPackageDetail> list = Lists.newArrayList();
|
List<UserPackageDetail> list = Lists.newArrayList();
|
||||||
if(type == 105){
|
if(type == 105){
|
||||||
list = baseMapper.findDetailUsedQuantity(userPackageDetail);
|
list = baseMapper.findDetailUsedQuantity(userPackageDetail);
|
||||||
}else if(type == 106){
|
}else if(type == 106 || type == 114 ){
|
||||||
list = baseMapper.findLcDetailUsedQuantity(userPackageDetail);
|
list = baseMapper.findLcDetailUsedQuantity(userPackageDetail);
|
||||||
}else{
|
}else{
|
||||||
list = baseMapper.findDetailList(userPackageDetail);
|
list = baseMapper.findDetailList(userPackageDetail);
|
||||||
|
|
Loading…
Reference in New Issue