Browse Source

修改预约单测试问题

master
fanzongzhe 6 months ago
parent
commit
1e348fee4c
  1. 6
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
  2. 1
      yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

6
yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java

@ -58,6 +58,7 @@ import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@ -413,6 +414,11 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
if (StringUtils.isNotBlank(bill.getCustomerOrg())) {
billDto.setCustomerOrg(bill.getCustomerOrg());
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String format = sdf.format(new Date());
billDto.setEntryTime(format);
billDto.setEstimatedFinishTime(format);
billDto.setIsSpecialSign("0");
if (!dto.getSitemVos().isEmpty()) {
List<SitemVo> sitemVos = new ArrayList<>();// 服务项目
for (AsbillSitemVo sitemVo : dto.getSitemVos()) {

1
yxt-as/src/main/java/com/yxt/anrui/as/biz/asserviceitem/AsServiceItemService.java

@ -270,6 +270,7 @@ public class AsServiceItemService extends MybatisBaseService<AsServiceItemMapper
qw.eq("a.isDelete", 0);
qw.eq("a.isEnable", 1);
qw.eq("a.state", 2);
qw.eq("a.useOrgSid", query.getUseOrgSid());
qw.orderByAsc("a.sortNo");
IPage<AsServiceItem> page = PagerUtil.queryToPage(pq);
IPage<AsServiceItemVo> pagging = baseMapper.selectPageVo(page, qw);

Loading…
Cancel
Save