平潭普耗相关修改,汇总统计修改

test
anthonywj 2 years ago
parent fd31e5a224
commit 8f3f7abf94

@ -46,7 +46,7 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ
@Override @Override
public BasicProductCategory selectBasicHospTypeEntity() { public BasicProductCategory selectBasicHospTypeEntity() {
QueryWrapper<BasicProductCategory> Wrapper = new QueryWrapper<>(); QueryWrapper<BasicProductCategory> Wrapper = new QueryWrapper<>();
Wrapper.eq("code",10000); Wrapper.eq("code",10000).last("limit 1");
return basicProductCategoryMapper.selectOne(Wrapper); return basicProductCategoryMapper.selectOne(Wrapper);
} }
@ -179,7 +179,7 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ
@Override @Override
public BasicProductCategory checkCode(String parentCode) { public BasicProductCategory checkCode(String parentCode) {
return basicProductCategoryMapper.selectOne(new QueryWrapper<BasicProductCategory>().eq("code",parentCode)); return basicProductCategoryMapper.selectOne(new QueryWrapper<BasicProductCategory>().eq("code",parentCode).last("limit 1"));
} }
@Override @Override

@ -31,7 +31,7 @@ public class BasicBusTypeChangeServiceImpl extends ServiceImpl<BasicBusTypeChang
@Override @Override
public BasicBusTypeChangeEntity selectByOriginAction(String action) { public BasicBusTypeChangeEntity selectByOriginAction(String action) {
return basicBusTypeChangeDao.selectOne(new QueryWrapper<BasicBusTypeChangeEntity>().eq("originAction", action)); return basicBusTypeChangeDao.selectOne(new QueryWrapper<BasicBusTypeChangeEntity>().eq("originAction", action).last("limit 1"));
} }
@Override @Override

@ -78,7 +78,7 @@ public class BasicBusTypePreServiceImpl extends ServiceImpl<BasicBusTypePreDao,
@Override @Override
public BasicBusTypePreEntity findByOriginAction(String originAction) { public BasicBusTypePreEntity findByOriginAction(String originAction) {
return basicBusTypePreDao.selectOne(new QueryWrapper<BasicBusTypePreEntity>().eq("originAction", originAction)); return basicBusTypePreDao.selectOne(new QueryWrapper<BasicBusTypePreEntity>().eq("originAction", originAction).last("limit 1"));
} }
@Override @Override

@ -130,7 +130,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
@Override @Override
public BasicBussinessTypeEntity findByAction(String action) { public BasicBussinessTypeEntity findByAction(String action) {
if (StrUtil.isNotBlank(action)) { if (StrUtil.isNotBlank(action)) {
return basicBussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().eq("action", action)); return basicBussinessTypeDao.selectOne(new QueryWrapper<BasicBussinessTypeEntity>().eq("action", action).last("limit 1"));
} }
return null; return null;
} }

@ -158,7 +158,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
if (StrUtil.isNotEmpty(bindRlFk)) { if (StrUtil.isNotEmpty(bindRlFk)) {
ew.eq("bindRlFk", bindRlFk); ew.eq("bindRlFk", bindRlFk);
} }
IoOrderDetailBizEntity ioOrderDetailBizEntity = ioOrderDetailBizDao.selectOne(ew); IoOrderDetailBizEntity ioOrderDetailBizEntity = ioOrderDetailBizDao.selectOne(ew.last("limit 1"));
return ioOrderDetailBizEntity; return ioOrderDetailBizEntity;
} }

@ -50,7 +50,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
.eq("orderIdFk", orderId).eq("bindRlFk", relId) .eq("orderIdFk", orderId).eq("bindRlFk", relId)
.eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo) .eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo)
.isNull(StrUtil.isEmpty(bacthNo), "batchNo") .isNull(StrUtil.isEmpty(bacthNo), "batchNo")
.eq(price != null, "price", price) .eq(price != null, "price", price).last("limit 1")
); );
} }

@ -33,7 +33,7 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
@Override @Override
public IoOrderDetailResultEntity findByUnique(String orderId, Long relId, String bacthNo) { public IoOrderDetailResultEntity findByUnique(String orderId, Long relId, String bacthNo) {
return orderDetailResultDao.selectOne(new QueryWrapper<IoOrderDetailResultEntity>().eq("orderIdFk", orderId).eq("bindRlFk", relId).eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo) return orderDetailResultDao.selectOne(new QueryWrapper<IoOrderDetailResultEntity>().eq("orderIdFk", orderId).eq("bindRlFk", relId).eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo)
.isNull(StrUtil.isEmpty(bacthNo), "batchNo")); .isNull(StrUtil.isEmpty(bacthNo), "batchNo").last("limit 1"));
} }
@Override @Override

@ -151,7 +151,7 @@ public class IoOrderServiceImpl implements IoOrderService {
@Override @Override
public IoOrderEntity findByBillNo(String billNO) { public IoOrderEntity findByBillNo(String billNO) {
return orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNO)); return orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNO).last("limit 1"));
} }
@Override @Override

@ -197,6 +197,7 @@ public class IoStatMonthServiceImpl implements IoStatMonthService {
IoStatMonthEntity statData = new IoStatMonthEntity(); IoStatMonthEntity statData = new IoStatMonthEntity();
statData.setYear(lastMonth.year()); statData.setYear(lastMonth.year());
statData.setInvCode(orderDetailResultEntity.getInvCode());
statData.setDeptCode(orderDetailResultEntity.getDeptCode()); statData.setDeptCode(orderDetailResultEntity.getDeptCode());
statData.setQuarter(lastMonth.quarter()); statData.setQuarter(lastMonth.quarter());
statData.setMonth(lastMonth.monthBaseOne()); statData.setMonth(lastMonth.monthBaseOne());

@ -196,6 +196,7 @@ public class IoStatQuarterServiceImpl implements IoStatQuarterService {
//未存在于集合中,构造新数据 //未存在于集合中,构造新数据
IoStatQuarterEntity statData = new IoStatQuarterEntity(); IoStatQuarterEntity statData = new IoStatQuarterEntity();
statData.setInvCode(orderDetailResultEntity.getInvCode());
statData.setDeptCode(orderDetailResultEntity.getDeptCode()); statData.setDeptCode(orderDetailResultEntity.getDeptCode());
statData.setYear(yesterday.year()); statData.setYear(yesterday.year());
statData.setQuarter(yesterday.quarter()); statData.setQuarter(yesterday.quarter());

@ -190,6 +190,7 @@ public class IoStatYearServiceImpl implements IoStatYearService {
//未在于集合中,构造新数据 //未在于集合中,构造新数据
IoStatYearEntity statData = new IoStatYearEntity(); IoStatYearEntity statData = new IoStatYearEntity();
statData.setYear(yesterday.year()); statData.setYear(yesterday.year());
statData.setInvCode(orderDetailResultEntity.getInvCode());
statData.setDeptCode(orderDetailResultEntity.getDeptCode()); statData.setDeptCode(orderDetailResultEntity.getDeptCode());
statData.setRelIdFk(String.valueOf(orderDetailResultEntity.getBindRlFk())); statData.setRelIdFk(String.valueOf(orderDetailResultEntity.getBindRlFk()));
statData.setNameCode(orderDetailResultEntity.getNameCode()); statData.setNameCode(orderDetailResultEntity.getNameCode());

@ -39,14 +39,14 @@ public class InvPreinProductServiceImpl implements InvPreinProductService {
public InvPreinProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode, BigDecimal price) { public InvPreinProductEntity selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode, BigDecimal price) {
return invPreinProductDao.selectOne(new QueryWrapper<InvPreinProductEntity>().eq("relIdFk", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) return invPreinProductDao.selectOne(new QueryWrapper<InvPreinProductEntity>().eq("relIdFk", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
.isNull(StrUtil.isEmpty(batchNo), "batchNo").eq("supId", supId).eq("deptCode", deptCode).eq("invCode", invCode) .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq("supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)
.eq(price != null, "price", price).isNull(price == null, "price")); .eq(price != null, "price", price).isNull(price == null, "price").last("limit 1"));
} }
@Override @Override
public InvPreinProductEntity selectByUnique(Long relId, String batchNo, String supId) { public InvPreinProductEntity selectByUnique(Long relId, String batchNo, String supId) {
return invPreinProductDao.selectOne(new QueryWrapper<InvPreinProductEntity>().eq("relIdFk", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) return invPreinProductDao.selectOne(new QueryWrapper<InvPreinProductEntity>().eq("relIdFk", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo)
.isNull(StrUtil.isEmpty(batchNo), "batchNo").eq("supId", supId)); .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq("supId", supId).last("limit 1"));
} }

@ -50,7 +50,7 @@ public class InvProductService extends ServiceImpl<InvProductDao, InvProductEnti
.eq("supId", supId) .eq("supId", supId)
.eq("deptCode", deptCode) .eq("deptCode", deptCode)
.eq("invCode", invCode) .eq("invCode", invCode)
.eq(price != null, "price", price).isNull(price == null, "price") .eq(price != null, "price", price).isNull(price == null, "price").last("limit 1")
); );
} }

Loading…
Cancel
Save