|
|
|
@ -170,11 +170,11 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
if (StringUtils.isNotBlank(query.getBillNo())) { |
|
|
|
qw.like("ab.billNo", query.getBillNo()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getInvoiceTitle())){ |
|
|
|
qw.like("ab.invoiceTitle",query.getInvoiceTitle()); |
|
|
|
if (StringUtils.isNotBlank(query.getInvoiceTitle())) { |
|
|
|
qw.like("ab.invoiceTitle", query.getInvoiceTitle()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(query.getInvoiceTypeKey())){ |
|
|
|
qw.eq("ab.invoiceTypeKey",query.getInvoiceTypeKey()); |
|
|
|
if (StringUtils.isNotBlank(query.getInvoiceTypeKey())) { |
|
|
|
qw.eq("ab.invoiceTypeKey", query.getInvoiceTypeKey()); |
|
|
|
} |
|
|
|
String createTimeStart = query.getCreateTimeStart(); |
|
|
|
String createTimeEnd = query.getCreateTimeEnd(); |
|
|
|
@ -186,6 +186,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
qw.apply(StringUtils.isNotEmpty(finishTimeStart), "date_format (ab.finishTime,'%Y-%m-%d') >= date_format('" + finishTimeStart + "','%Y-%m-%d')"). |
|
|
|
apply(StringUtils.isNotEmpty(finishTimeEnd), "date_format (ab.finishTime,'%Y-%m-%d') <= date_format('" + finishTimeEnd + "','%Y-%m-%d')" |
|
|
|
); |
|
|
|
qw.orderByDesc("ab.createTime"); |
|
|
|
IPage<AsBwinvoiceapply> page = PagerUtil.queryToPage(pq); |
|
|
|
IPage<AsBwinvoiceapplyVo> pagging = baseMapper.selectPageVo(page, qw); |
|
|
|
for (AsBwinvoiceapplyVo record : pagging.getRecords()) { |
|
|
|
@ -203,7 +204,8 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
return p; |
|
|
|
} |
|
|
|
|
|
|
|
public String saveOrUpdateDto(AsBwinvoiceapplyDto dto){ |
|
|
|
public ResultBean<String> saveOrUpdateDto(AsBwinvoiceapplyDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String dtoSid = dto.getSid(); |
|
|
|
List<AsBwinvoiceapplyFile> fileList = dto.getFileList(); |
|
|
|
List<AsBwinvoiceapplyDetailDto> asBwinvoiceapplyDetailList = dto.getAsBwinvoiceapplyDetailList(); |
|
|
|
@ -214,6 +216,13 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
dto.setUseOrgSid(useOrgSid); |
|
|
|
dto.setUseOrgName(organizationVo.getName()); |
|
|
|
if (StringUtils.isBlank(dtoSid)) { |
|
|
|
for (AsBwinvoiceapplyDetailDto asBwinvoiceapplyDetailDto : asBwinvoiceapplyDetailList) { |
|
|
|
String sourceBillSid = asBwinvoiceapplyDetailDto.getSourceBillSid(); |
|
|
|
int i = asBwinvoiceapplyDetailService.selBySourceBillSid(sourceBillSid); |
|
|
|
if (i > 0){ |
|
|
|
return rb.setMsg("维修单编号" + asBwinvoiceapplyDetailDto.getSourceBillNo() + "已存在"); |
|
|
|
} |
|
|
|
} |
|
|
|
//生成单据编号
|
|
|
|
String billNo = ""; |
|
|
|
String date = DateUtil.format(DateUtil.date(), "yyyyMM"); |
|
|
|
@ -238,7 +247,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
asBwinvoiceapplyDetailDto.setMainSid(sid); |
|
|
|
asBwinvoiceapplyDetailService.insertByDto(asBwinvoiceapplyDetailDto); |
|
|
|
} |
|
|
|
return sid; |
|
|
|
return rb.success().setData(sid); |
|
|
|
} |
|
|
|
this.updateByDto(dto); |
|
|
|
asAppendixService.delByLinkSid(dtoSid); |
|
|
|
@ -255,10 +264,10 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
asBwinvoiceapplyDetailDto.setMainSid(dtoSid); |
|
|
|
asBwinvoiceapplyDetailService.insertByDto(asBwinvoiceapplyDetailDto); |
|
|
|
} |
|
|
|
return dtoSid; |
|
|
|
return rb.success().setData(dtoSid); |
|
|
|
} |
|
|
|
|
|
|
|
public String insertByDto(AsBwinvoiceapplyDto dto){ |
|
|
|
public String insertByDto(AsBwinvoiceapplyDto dto) { |
|
|
|
AsBwinvoiceapply entity = new AsBwinvoiceapply(); |
|
|
|
BeanUtil.copyProperties(dto, entity, "id", "sid"); |
|
|
|
entity.setNodeState("待提交"); |
|
|
|
@ -266,7 +275,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
return entity.getSid(); |
|
|
|
} |
|
|
|
|
|
|
|
public void updateByDto(AsBwinvoiceapplyDto dto){ |
|
|
|
public void updateByDto(AsBwinvoiceapplyDto dto) { |
|
|
|
String dtoSid = dto.getSid(); |
|
|
|
if (StringUtils.isBlank(dtoSid)) { |
|
|
|
return; |
|
|
|
@ -276,7 +285,7 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
baseMapper.updateById(entity); |
|
|
|
} |
|
|
|
|
|
|
|
public AsBwinvoiceapplyDetailsVo fetchDetailsVoBySid(String sid){ |
|
|
|
public AsBwinvoiceapplyDetailsVo fetchDetailsVoBySid(String sid) { |
|
|
|
AsBwinvoiceapply entity = fetchBySid(sid); |
|
|
|
AsBwinvoiceapplyDetailsVo vo = new AsBwinvoiceapplyDetailsVo(); |
|
|
|
BeanUtil.copyProperties(entity, vo); |
|
|
|
@ -319,8 +328,11 @@ public class AsBwinvoiceapplyService extends MybatisBaseService<AsBwinvoiceapply |
|
|
|
if (r == 0) { |
|
|
|
return rb.setMsg("操作失败!提交的数据不一致"); |
|
|
|
} |
|
|
|
String businessSid = saveOrUpdateDto(dto); |
|
|
|
String businessSid = saveOrUpdateDto(dto).getData(); |
|
|
|
asBwinvoiceapply = fetchBySid(businessSid); |
|
|
|
if (asBwinvoiceapply == null){ |
|
|
|
return rb.setMsg(saveOrUpdateDto(dto).getMsg()); |
|
|
|
} |
|
|
|
//创建BusinessVariables实体对象
|
|
|
|
BusinessVariables bv = new BusinessVariables(); |
|
|
|
//流程中的参数赋值、若有网关，则赋值网关中判断的字段。
|
|
|
|
|
fanzongzhe0036
4 months ago