yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改开始服务指令接口 

修改结束服务指令接口
修改上传服务指令照片接口
修改上传服务指令视频接口
This commit is contained in:
yangjun 2026-01-20 16:52:22 +08:00
parent 39f0c4f07b
commit 4c68617fcd
6 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nursing-unit-api/src/main/java/com/nu/modules/pad/directiveorder/api/ServiceOrderApi.java
View File

@ -52,16 +52,16 @@ public class ServiceOrderApi {
@ApiOperation(value="服务指令工单-开始服务", notes="服务指令工单-开始服务") @ApiOperation(value="服务指令工单-开始服务", notes="服务指令工单-开始服务")
@AutoLog(value = "服务指令工单-开始服务",clientType="app", operateType = 2) @AutoLog(value = "服务指令工单-开始服务",clientType="app", operateType = 2)
@PostMapping(value = "/startOrder") @PostMapping(value = "/startOrder")
public Result<String> startOrder(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { public Result<String> startOrder(@RequestBody DirectiveOrderEntity directiveOrderEntity) {
Map<String, Object> result = directiveOrderApi.startOrder(directiveOrderSubEntity); Map<String, Object> result = directiveOrderApi.startOrder(directiveOrderEntity);
return Result.OK("操作成功！"); return Result.OK("操作成功！");
} }
@ApiOperation(value="服务指令工单-结束服务", notes="服务指令工单-结束服务") @ApiOperation(value="服务指令工单-结束服务", notes="服务指令工单-结束服务")
@AutoLog(value = "服务指令工单-结束服务",clientType="app", operateType = 2) @AutoLog(value = "服务指令工单-结束服务",clientType="app", operateType = 2)
@PostMapping(value = "/endOrder") @PostMapping(value = "/endOrder")
public Result<String> endOrder(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { public Result<String> endOrder(@RequestBody DirectiveOrderEntity directiveOrderEntity) {
Map<String, Object> result = directiveOrderApi.endOrder(directiveOrderSubEntity); Map<String, Object> result = directiveOrderApi.endOrder(directiveOrderEntity);
return Result.OK("操作成功！"); return Result.OK("操作成功！");
} }
@ -69,16 +69,16 @@ public class ServiceOrderApi {
@ApiOperation(value="服务指令工单-上传mp4", notes="服务指令工单-上传mp4") @ApiOperation(value="服务指令工单-上传mp4", notes="服务指令工单-上传mp4")
@AutoLog(value = "服务指令工单-上传mp4",clientType="app", operateType = 2) @AutoLog(value = "服务指令工单-上传mp4",clientType="app", operateType = 2)
@PostMapping(value = "/editSubMp4") @PostMapping(value = "/editSubMp4")
public Result<String> editSubMp4(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { public Result<String> editSubMp4(@RequestBody DirectiveOrderEntity directiveOrderEntity) {
Map<String, Object> result = directiveOrderApi.editSubMp4(directiveOrderSubEntity); Map<String, Object> result = directiveOrderApi.editSubMp4(directiveOrderEntity);
return Result.OK("操作成功！"); return Result.OK("操作成功！");
} }
@ApiOperation(value="服务指令工单-上传照片", notes="服务指令工单-上传照片") @ApiOperation(value="服务指令工单-上传照片", notes="服务指令工单-上传照片")
@AutoLog(value = "服务指令工单-上传照片",clientType="app", operateType = 2) @AutoLog(value = "服务指令工单-上传照片",clientType="app", operateType = 2)
@PostMapping(value = "/editSubPicPath") @PostMapping(value = "/editSubPicPath")
public Result<String> editSubPicPath(@RequestBody DirectiveOrderSubEntity directiveOrderSubEntity) { public Result<String> editSubPicPath(@RequestBody DirectiveOrderEntity directiveOrderEntity) {
Map<String, Object> result = directiveOrderApi.editSubPicPath(directiveOrderSubEntity); Map<String, Object> result = directiveOrderApi.editSubPicPath(directiveOrderEntity);
return Result.OK("操作成功！"); return Result.OK("操作成功！");
} }

3
nursing-unit-common/src/main/java/com/nu/entity/DirectiveOrderEntity.java
View File

@ -149,4 +149,7 @@ public class DirectiveOrderEntity implements Serializable {
// 历史成功hisOk 历史失败hisFaild 正在执行current 待执行future // 历史成功hisOk 历史失败hisFaild 正在执行current 待执行future
private String executeStatus; private String executeStatus;
private String manuallyPicPath;
private String manuallyMp4Path;
} }

6
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
View File

@ -1461,7 +1461,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
String departName = deptInfo.getString("name"); String departName = deptInfo.getString("name");
QueryWrapper<NuInvoicingCgdMain> queryWrapper = new QueryWrapper<>(); QueryWrapper<NuInvoicingCgdMain> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("gys_id",cgdMainEntityDto.getGysId()); 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"); queryWrapper.orderByDesc("create_time");
Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize); Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
List<NuInvoicingCgdMain> list = baseMapper.selectList(page,queryWrapper); List<NuInvoicingCgdMain> list = baseMapper.selectList(page,queryWrapper);

8
nursing-unit-services/nu-services-api/nu-services-local-api/src/main/java/com/nu/modules/order/api/IDirectiveOrderApi.java
View File

@ -33,13 +33,13 @@ public interface IDirectiveOrderApi {
List<DirectiveOrderSubEntity> queryOrderInfoList(DirectiveOrderSubEntity directiveOrderSubEntity, HttpServletRequest req); List<DirectiveOrderSubEntity> queryOrderInfoList(DirectiveOrderSubEntity directiveOrderSubEntity, HttpServletRequest req);
Map<String, Object> editSubMp4(DirectiveOrderSubEntity directiveOrderSubEntity); Map<String, Object> editSubMp4(DirectiveOrderEntity directiveOrderEntity);
Map<String, Object> editSubPicPath(DirectiveOrderSubEntity directiveOrderSubEntity); Map<String, Object> editSubPicPath(DirectiveOrderEntity directiveOrderEntity);
Map<String, Object> startOrder(DirectiveOrderSubEntity directiveOrderSubEntity); Map<String, Object> startOrder(DirectiveOrderEntity directiveOrderEntity);
Map<String, Object> endOrder(DirectiveOrderSubEntity directiveOrderSubEntity); Map<String, Object> endOrder(DirectiveOrderEntity directiveOrderEntity);
IPage<DirectiveOrderEntity> queryWorkOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req); IPage<DirectiveOrderEntity> queryWorkOrderList(Integer pageNo, Integer pageSize, DirectiveOrderEntity directiveOrderEntity, HttpServletRequest req);

3
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/entity/DirectiveOrder.java
View File

@ -151,6 +151,9 @@ public class DirectiveOrder implements Serializable {
/**实际执行人名称（多个）； 主要执行人+协助人*/ /**实际执行人名称（多个）； 主要执行人+协助人*/
private String optNames; private String optNames;
private String manuallyPicPath;
private String manuallyMp4Path;
/**接单上限*/ /**接单上限*/
@TableField(exist = false) @TableField(exist = false)
private Integer orderCap; private Integer orderCap;

71
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderPadServiceImpl.java
View File

@ -116,54 +116,41 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
} }
@Override @Override
public Map<String, Object> startOrder(DirectiveOrderSubEntity directiveOrderSubEntity) { public Map<String, Object> startOrder(DirectiveOrderEntity directiveOrderEntity) {
DirectiveOrderSub directiveOrderSub = directiveOrderSubMapper.selectById(directiveOrderSubEntity.getId()); DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderEntity.getId());
DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderSub.getMainId()); directiveOrder.setIzStart("Y");
directiveOrderSub.setIzStart("Y"); directiveOrder.setBeginTime(new Date());
directiveOrderSub.setBeginTime(new Date()); baseMapper.updateById(directiveOrder);
directiveOrderSubMapper.updateById(directiveOrderSub);
QueryWrapper<DirectiveOrderSub> queryWrapper = new QueryWrapper<>();
List<DirectiveOrderSub> list = directiveOrderSubMapper.selectList(queryWrapper);
if (!StringUtils.equals("Y", directiveOrder.getIzStart())) {
directiveOrder.setIzStart("Y");
directiveOrder.setBeginTime(new Date());
baseMapper.updateById(directiveOrder);
}
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("success", true); map.put("success", true);
map.put("message", "操作成功"); map.put("message", "操作成功");
map.put("directiveOrder", directiveOrder); map.put("directiveOrder", directiveOrder);
map.put("directiveOrderSub", directiveOrderSub); map.put("directiveOrderSub", list);
return map; return map;
} }
@Override @Override
public Map<String, Object> endOrder(DirectiveOrderSubEntity directiveOrderSubEntity) { public Map<String, Object> endOrder(DirectiveOrderEntity directiveOrderEntity) {
DirectiveOrderSub directiveOrderSub = directiveOrderSubMapper.selectById(directiveOrderSubEntity.getId()); DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderEntity.getId());
DirectiveOrder directiveOrder = baseMapper.selectById(directiveOrderSub.getMainId()); directiveOrder.setIzFinish("Y");
directiveOrderSub.setIzFinish("Y"); directiveOrder.setFinishTime(new Date());
directiveOrderSub.setFinishTime(new Date()); DirectiveOrder directivePrice = baseMapper.getDirectivePrice(directiveOrder.getDirectiveId());//获取服务指令价格
DirectiveOrder directivePriceSub = baseMapper.getDirectivePrice(directiveOrderSub.getDirectiveId());//获取服务指令价格 directiveOrder.setTollPrice(directivePrice.getTollPrice());
directiveOrderSub.setTollPrice(directivePriceSub.getTollPrice()); directiveOrder.setComPrice(directivePrice.getComPrice());
directiveOrderSub.setComPrice(directivePriceSub.getComPrice()); baseMapper.updateById(directiveOrder);
directiveOrderSubMapper.updateById(directiveOrderSub);
List<DirectiveOrderSub> list = directiveOrderSubMapper.selectList(new QueryWrapper<DirectiveOrderSub>().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);
}
List<DirectiveOrderSub> list = directiveOrderSubMapper.selectList(new QueryWrapper<DirectiveOrderSub>().eq("main_id", directiveOrder.getId()));
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("success", true); map.put("success", true);
map.put("message", "操作成功"); map.put("message", "操作成功");
map.put("directiveOrder", directiveOrder); map.put("directiveOrder", directiveOrder);
map.put("directiveOrderSub", directiveOrderSub); map.put("directiveOrderSub", list);
return map; return map;
} }
@ -221,11 +208,11 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
} }
@Override @Override
public Map<String, Object> editSubMp4(DirectiveOrderSubEntity directiveOrderSubEntity) { public Map<String, Object> editSubMp4(DirectiveOrderEntity directiveOrderEntity) {
DirectiveOrderSub directiveOrderSub = new DirectiveOrderSub(); DirectiveOrder directiveOrder = new DirectiveOrder();
directiveOrderSub.setId(directiveOrderSubEntity.getId()); directiveOrder.setId(directiveOrderEntity.getId());
directiveOrderSub.setManuallyMp4Path(directiveOrderSubEntity.getManuallyMp4Path()); directiveOrder.setManuallyMp4Path(directiveOrder.getManuallyMp4Path());
directiveOrderSubMapper.updateById(directiveOrderSub); directiveOrderService.updateById(directiveOrder);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("success", true); map.put("success", true);
map.put("message", "操作成功"); map.put("message", "操作成功");
@ -233,11 +220,11 @@ public class DirectiveOrderPadServiceImpl extends ServiceImpl<DirectiveOrderMapp
} }
@Override @Override
public Map<String, Object> editSubPicPath(DirectiveOrderSubEntity directiveOrderSubEntity) { public Map<String, Object> editSubPicPath(DirectiveOrderEntity directiveOrderEntity) {
DirectiveOrderSub directiveOrderSub = new DirectiveOrderSub(); DirectiveOrder directiveOrder = new DirectiveOrder();
directiveOrderSub.setId(directiveOrderSubEntity.getId()); directiveOrder.setId(directiveOrderEntity.getId());
directiveOrderSub.setManuallyPicPath(directiveOrderSubEntity.getManuallyPicPath()); directiveOrder.setManuallyPicPath(directiveOrderEntity.getManuallyPicPath());
directiveOrderSubMapper.updateById(directiveOrderSub); directiveOrderService.updateById(directiveOrder);
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("success", true); map.put("success", true);
map.put("message", "操作成功"); map.put("message", "操作成功");