diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java index b08d7dca..e4f7e9db 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingThdApi.java @@ -218,4 +218,25 @@ public class InvoicingThdApi { return Result.error("操作失败"); } } + + /** + * 退货-发起退货(临时接口,后续会删除) + * + * @param dto + * @return + */ + @ApiOperation(value = "退货-发起退货", notes = "退货-发起退货") + @AutoLog(value = "退货-发起退货", clientType = "app") + @PostMapping(value = "/requireTH") + public Result requireTH(@RequestBody InvoicingThdMainEntity dto) { + if (StringUtils.isBlank(dto.getNuId()) || StringUtils.isBlank(dto.getElderId())) { + return Result.error("缺少参数"); + } + boolean result = tuiHuoApi.requireTH(dto); + if (result) { + return Result.OK("操作成功"); + } else { + return Result.error("操作失败"); + } + } } diff --git a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java index 3cb6f69d..f9aee339 100644 --- a/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java +++ b/nursing-unit-invoicing/nu-invoicing-api/nu-invoicing-local-api/src/main/java/com/nu/modules/invoicing/api/ITuiHuoApi.java @@ -31,4 +31,6 @@ public interface ITuiHuoApi { boolean finishServe(InvoicingThdMainEntity dto); boolean transRead(InvoicingThdMainEntity dto); + + boolean requireTH(InvoicingThdMainEntity dto); } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index f8e589c4..93b53218 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -516,6 +516,7 @@ public class QingLingServiceImpl implements IQinglingApi { } @Override + @Transactional(rollbackFor = Exception.class) public boolean cancellation(InvoicingQldMainEntity dto) { //检测是否可以正常作废 if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1,3")) { @@ -724,6 +725,7 @@ public class QingLingServiceImpl implements IQinglingApi { } @Override + @Transactional(rollbackFor = Exception.class) public boolean orderReturn(InvoicingQldMainEntity dto) { //检测是否可以正常回退 if (!invoicingQldLogService.opeNodeJudgeCanStatus(dto.getQldNo(), "1,4")) { @@ -759,6 +761,7 @@ public class QingLingServiceImpl implements IQinglingApi { } @Override + @Transactional(rollbackFor = Exception.class) public Map outbound(InvoicingQldMainEntity dto) { Map map = new HashMap<>(); diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/NuInvoicingThdMainMapper.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/NuInvoicingThdMainMapper.java index b7c604d3..75e48f9b 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/NuInvoicingThdMainMapper.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/NuInvoicingThdMainMapper.java @@ -18,4 +18,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface NuInvoicingThdMainMapper extends BaseMapper { IPage thdList(Page page,@Param("dto") InvoicingThdMainEntity dto); + } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml index 6434d7e4..398b1af8 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/mapper/xml/NuInvoicingThdMainMapper.xml @@ -54,4 +54,5 @@ ) DESC, main.create_time DESC + diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java index 3623f1ea..12e8c3fb 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/thd/service/impl/ThdServiceImpl.java @@ -96,8 +96,10 @@ public class ThdServiceImpl implements ITuiHuoApi { .collect(Collectors.collectingAndThen( Collectors.toList(), list -> { - int size = list.size(); - return size <= 2 ? list : list.subList(size - 2, size); + List r_ = Lists.newArrayList(); + r_.add(list.get(0)); + r_.add(list.get(list.size() - 1)); + return r_; } )) ) @@ -122,6 +124,7 @@ public class ThdServiceImpl implements ITuiHuoApi { } @Override + @Transactional(rollbackFor = Exception.class) public boolean startServe(InvoicingThdMainEntity dto) { //查询当前状态 QueryWrapper qw = new QueryWrapper<>(); @@ -449,6 +452,7 @@ public class ThdServiceImpl implements ITuiHuoApi { } @Override + @Transactional(rollbackFor = Exception.class) public boolean finishServe(InvoicingThdMainEntity dto) { //查询当前状态 QueryWrapper qw = new QueryWrapper<>(); @@ -489,4 +493,32 @@ public class ThdServiceImpl implements ITuiHuoApi { return thdMainMapper.updateById(data) > 0 ? true : false; } + @Override + @Transactional(rollbackFor = Exception.class) + public boolean requireTH(InvoicingThdMainEntity dto) { + LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String status = "0";//发起待执行 + + NuInvoicingThdMain main = new NuInvoicingThdMain(); + main.setStatus(status); + main.setFqBy(sysUser.getId());//发起人 + main.setFqTime(new Date());//发起时间 + main.setNuId(dto.getNuId());//护理单元ID + main.setElderId(dto.getElderId());//长者id + main.setIzRead("N");//是否已读 + thdMainMapper.insert(main); + + //插入日志 + NuInvoicingThdLog logData = new NuInvoicingThdLog(); + logData.setThdId(main.getId());//退货指令id + logData.setStatus(status);//操作状态 + logData.setOpeBy(sysUser.getId());//操作人 + logData.setOpeTime(new Date());//操作时间 + logData.setNuId(main.getNuId());//护理单元id + logData.setElderId(main.getElderId());//长者id + thdLogMapper.insert(logData); + + return true; + } + }