yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:b8a41972fe83a41f3990aea837a87f34bfc83939
Branches Tags
yangjun:master
..
compare: yangjun:dd06f7a58b21292947074ce40fdec17250f7c2bf
Branches Tags
yangjun:master

No commits in common. "b8a41972fe83a41f3990aea837a87f34bfc83939" and "dd06f7a58b21292947074ce40fdec17250f7c2bf" have entirely different histories.
b8a41972fe ... dd06f7a58b

2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java
View File

@ -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()).last("limit 1")); ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", stringBuilder.toString()));
if(artificerTime==null){ if(artificerTime==null){
if(oldDate.equals(date)){ if(oldDate.equals(date)){
artificer.setTime(stringBuilder.toString()); artificer.setTime(stringBuilder.toString());

2
src/main/java/com/sqx/modules/bl/order/service/impl/UserPackageDetailServiceImpl.java
View File

@ -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 || type == 114 ){ }else if(type == 106){
list = baseMapper.findLcDetailUsedQuantity(userPackageDetail); list = baseMapper.findLcDetailUsedQuantity(userPackageDetail);
}else{ }else{
list = baseMapper.findDetailList(userPackageDetail); list = baseMapper.findDetailList(userPackageDetail);