From 4c68617fcd79f78499ecf568bec8879c0fa8f846 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Tue, 20 Jan 2026 16:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=80=E5=A7=8B=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8C=87=E4=BB=A4=E6=8E=A5=E5=8F=A3=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E7=BB=93=E6=9D=9F=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E7=85=A7=E7=89=87=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=20=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8C=87=E4=BB=A4=E8=A7=86=E9=A2=91=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../directiveorder/api/ServiceOrderApi.java | 16 ++--- .../com/nu/entity/DirectiveOrderEntity.java | 3 + .../impl/NuInvoicingCgdMainServiceImpl.java | 6 +- .../modules/order/api/IDirectiveOrderApi.java | 8 +-- .../biz/order/entity/DirectiveOrder.java | 3 + .../impl/DirectiveOrderPadServiceImpl.java | 71 ++++++++----------- 6 files changed, 52 insertions(+), 55 deletions(-) diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java index 6a13a7df..2006535e 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java @@ -52,16 +52,16 @@ public class ServiceOrderApi { @ApiOperation(value="服务指令工单-开始服务", notes="服务指令工单-开始服务") @AutoLog(value = "服务指令工单-开始服务",clientType="app", operateType = 2) @PostMapping(value = "/startOrder") - public Result startOrder(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map result = directiveOrderApi.startOrder(directiveOrderSubEntity); + public Result startOrder(@RequestBody DirectiveOrderEntity directiveOrderEntity) { + Map result = directiveOrderApi.startOrder(directiveOrderEntity); return Result.OK("操作成功！"); } @ApiOperation(value="服务指令工单-结束服务", notes="服务指令工单-结束服务") @AutoLog(value = "服务指令工单-结束服务",clientType="app", operateType = 2) @PostMapping(value = "/endOrder") - public Result endOrder(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map result = directiveOrderApi.endOrder(directiveOrderSubEntity); + public Result endOrder(@RequestBody DirectiveOrderEntity directiveOrderEntity) { + Map result = directiveOrderApi.endOrder(directiveOrderEntity); return Result.OK("操作成功！"); } @@ -69,16 +69,16 @@ public class ServiceOrderApi { @ApiOperation(value="服务指令工单-上传mp4", notes="服务指令工单-上传mp4") @AutoLog(value = "服务指令工单-上传mp4",clientType="app", operateType = 2) @PostMapping(value = "/editSubMp4") - public Result editSubMp4(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map result = directiveOrderApi.editSubMp4(directiveOrderSubEntity); + public Result editSubMp4(@RequestBody DirectiveOrderEntity directiveOrderEntity) { + Map result = directiveOrderApi.editSubMp4(directiveOrderEntity); return Result.OK("操作成功！"); } @ApiOperation(value="服务指令工单-上传照片", notes="服务指令工单-上传照片") @AutoLog(value = "服务指令工单-上传照片",clientType="app", operateType = 2) @PostMapping(value = "/editSubPicPath") - public Result editSubPicPath(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { - Map result = directiveOrderApi.editSubPicPath(directiveOrderSubEntity); + public Result editSubPicPath(@RequestBody DirectiveOrderEntity directiveOrderEntity) { + Map result = directiveOrderApi.editSubPicPath(directiveOrderEntity); return Result.OK("操作成功！"); } diff --git a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java index 8d2c6a01..1bc292a8 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java @@ -149,4 +149,7 @@ public class DirectiveOrderEntity implements Serializable { // 历史成功hisOk 历史失败hisFaild 正在执行current 待执行future private String executeStatus; + + private String manuallyPicPath; + private String manuallyMp4Path; } diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 06f7f09d..02f66733 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -1461,7 +1461,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("gys_id",cgdMainEntityDto.getGysId()); - queryWrapper.ne("cgd_type","9"); + if(StringUtils.isNotBlank(cgdMainEntityDto.getCgdType())){ + queryWrapper.eq("cgd_type",cgdMainEntityDto.getCgdType()); + }else{ + queryWrapper.ne("cgd_type","9"); + } queryWrapper.orderByDesc("create_time"); Page page = new Page<>(pageNo, pageSize); List list = baseMapper.selectList(page,queryWrapper); diff --git a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java index 7ca6df4c..dc888f95 100644 --- a/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java +++ b/nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java @@ -33,13 +33,13 @@ public interface IDirectiveOrderApi { List queryOrderInfoList(DirectiveOrderSubEntity directiveOrderSubEntity, HttpServletRequest req); - Map editSubMp4(DirectiveOrderSubEntity directiveOrderSubEntity); + Map editSubMp4(DirectiveOrderEntity directiveOrderEntity); - Map editSubPicPath(DirectiveOrderSubEntity directiveOrderSubEntity); + Map editSubPicPath(DirectiveOrderEntity directiveOrderEntity); - Map startOrder(DirectiveOrderSubEntity directiveOrderSubEntity); + Map startOrder(DirectiveOrderEntity directiveOrderEntity); - Map endOrder(DirectiveOrderSubEntity directiveOrderSubEntity); + Map endOrder(DirectiveOrderEntity directiveOrderEntity); IPage queryWorkOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java index eb560f68..c676f032 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java @@ -151,6 +151,9 @@ public class DirectiveOrder implements Serializable { /**实际执行人名称（多个）； 主要执行人+协助人*/ private String optNames; + private String manuallyPicPath; + private String manuallyMp4Path; + /**接单上限*/ @TableField(exist = false) private Integer orderCap; diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java index ddf9fcc5..e88c751b 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java @@ -116,54 +116,41 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl startOrder(DirectiveOrderSubEntity directiveOrderSubEntity) { - DirectiveOrderSub directiveOrderSub = directiveOrderSubMapper.selectById(directiveOrderSubEntity.getId()); - DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderSub.getMainId()); - directiveOrderSub.setIzStart("Y"); - directiveOrderSub.setBeginTime(new Date()); - directiveOrderSubMapper.updateById(directiveOrderSub); + public Map startOrder(DirectiveOrderEntity directiveOrderEntity) { + DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderEntity.getId()); + directiveOrder.setIzStart("Y"); + directiveOrder.setBeginTime(new Date()); + baseMapper.updateById(directiveOrder); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + List list = directiveOrderSubMapper.selectList(queryWrapper); - if (!StringUtils.equals("Y", directiveOrder.getIzStart())) { - directiveOrder.setIzStart("Y"); - directiveOrder.setBeginTime(new Date()); - baseMapper.updateById(directiveOrder); - } Map map = new HashMap<>(); map.put("success", true); map.put("message", "操作成功"); map.put("directiveOrder", directiveOrder); - map.put("directiveOrderSub", directiveOrderSub); + map.put("directiveOrderSub", list); return map; } @Override - public Map endOrder(DirectiveOrderSubEntity directiveOrderSubEntity) { - DirectiveOrderSub directiveOrderSub = directiveOrderSubMapper.selectById(directiveOrderSubEntity.getId()); - DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderSub.getMainId()); - directiveOrderSub.setIzFinish("Y"); - directiveOrderSub.setFinishTime(new Date()); - DirectiveOrder directivePriceSub = baseMapper.getDirectivePrice(directiveOrderSub.getDirectiveId());//获取服务指令价格 - directiveOrderSub.setTollPrice(directivePriceSub.getTollPrice()); - directiveOrderSub.setComPrice(directivePriceSub.getComPrice()); - directiveOrderSubMapper.updateById(directiveOrderSub); - - List list = directiveOrderSubMapper.selectList(new QueryWrapper().eq("main_id", directiveOrder.getId()).ne("iz_finish", "Y")); - if (list.size() == 0) { - directiveOrder.setIzFinish("Y"); - directiveOrder.setFinishTime(new Date()); - DirectiveOrder directivePrice = baseMapper.getDirectivePrice(directiveOrder.getDirectiveId());//获取服务指令价格 - directiveOrder.setTollPrice(directivePrice.getTollPrice()); - directiveOrder.setComPrice(directivePrice.getComPrice()); - baseMapper.updateById(directiveOrder); - } + public Map endOrder(DirectiveOrderEntity directiveOrderEntity) { + DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderEntity.getId()); + directiveOrder.setIzFinish("Y"); + directiveOrder.setFinishTime(new Date()); + DirectiveOrder directivePrice = baseMapper.getDirectivePrice(directiveOrder.getDirectiveId());//获取服务指令价格 + directiveOrder.setTollPrice(directivePrice.getTollPrice()); + directiveOrder.setComPrice(directivePrice.getComPrice()); + baseMapper.updateById(directiveOrder); + List list = directiveOrderSubMapper.selectList(new QueryWrapper().eq("main_id", directiveOrder.getId())); Map map = new HashMap<>(); map.put("success", true); map.put("message", "操作成功"); map.put("directiveOrder", directiveOrder); - map.put("directiveOrderSub", directiveOrderSub); + map.put("directiveOrderSub", list); return map; } @@ -221,11 +208,11 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl editSubMp4(DirectiveOrderSubEntity directiveOrderSubEntity) { - DirectiveOrderSub directiveOrderSub = new DirectiveOrderSub(); - directiveOrderSub.setId(directiveOrderSubEntity.getId()); - directiveOrderSub.setManuallyMp4Path(directiveOrderSubEntity.getManuallyMp4Path()); - directiveOrderSubMapper.updateById(directiveOrderSub); + public Map editSubMp4(DirectiveOrderEntity directiveOrderEntity) { + DirectiveOrder directiveOrder = new DirectiveOrder(); + directiveOrder.setId(directiveOrderEntity.getId()); + directiveOrder.setManuallyMp4Path(directiveOrder.getManuallyMp4Path()); + directiveOrderService.updateById(directiveOrder); Map map = new HashMap<>(); map.put("success", true); map.put("message", "操作成功"); @@ -233,11 +220,11 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl editSubPicPath(DirectiveOrderSubEntity directiveOrderSubEntity) { - DirectiveOrderSub directiveOrderSub = new DirectiveOrderSub(); - directiveOrderSub.setId(directiveOrderSubEntity.getId()); - directiveOrderSub.setManuallyPicPath(directiveOrderSubEntity.getManuallyPicPath()); - directiveOrderSubMapper.updateById(directiveOrderSub); + public Map editSubPicPath(DirectiveOrderEntity directiveOrderEntity) { + DirectiveOrder directiveOrder = new DirectiveOrder(); + directiveOrder.setId(directiveOrderEntity.getId()); + directiveOrder.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath()); + directiveOrderService.updateById(directiveOrder); Map map = new HashMap<>(); map.put("success", true); map.put("message", "操作成功");