open_platform/ss-common-sales
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

产品管理

Browse Source
This commit is contained in:
fanzongzhe
2024-08-13 15:37:18 +08:00
parent e3bebdde1a
commit b1f1ff7321
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/yxt/sales/biz/smssalesbill/SmsSalesBillService.java
View File

@@ -136,6 +136,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
if (StringUtils.isNotBlank(query.getState())) { if (StringUtils.isNotBlank(query.getState())) {
qw.eq("s.state", query.getState()); qw.eq("s.state", query.getState());
} }
qw.orderByDesc("s.id");
String createStartTime = query.getStartDate(); String createStartTime = query.getStartDate();
String createEndTime = query.getEndDate(); String createEndTime = query.getEndDate();
qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')"). qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@@ -308,6 +309,7 @@ public class SmsSalesBillService extends MybatisBaseService<SmsSalesBillMapper,
List<SmsSalesBillDetailDetailsVo> goodsList = new ArrayList<>(); List<SmsSalesBillDetailDetailsVo> goodsList = new ArrayList<>();
SmsSalesBill entity = fetchBySid(sid); SmsSalesBill entity = fetchBySid(sid);
BeanUtil.copyProperties(entity, vo); BeanUtil.copyProperties(entity, vo);
vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
List<SmsSalesBillAccount> accounts = smsSalesBillAccountService.selByBillSid(sid); List<SmsSalesBillAccount> accounts = smsSalesBillAccountService.selByBillSid(sid);
if (null != accounts && !accounts.isEmpty()) { if (null != accounts && !accounts.isEmpty()) {
if (accounts.size() > 1) { if (accounts.size() > 1) {