From a6297379c3d779c31cef80b0f30c22978d295b53 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Mon, 30 Nov 2020 19:00:09 +0800
Subject: [PATCH] 修改 部门不过
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java | 64 ++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
index e235466..26c9d2f 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderRecordController.java
@@ -7,8 +7,10 @@
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.utils.StringUtils;
+import com.kidgrow.oprationcenter.model.ProductOrderDetail;
import com.kidgrow.oprationcenter.model.ProductOrderRecord;
import com.kidgrow.oprationcenter.service.IBusinessRecordsService;
+import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderRecordService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.ProductOrderJoinDetail;
@@ -27,6 +29,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -47,6 +50,8 @@
public class ProductOrderRecordController extends BaseController {
@Autowired
private IProductOrderRecordService productOrderRecordService;
+ @Autowired
+ private IProductOrderDetailService productOrderDetailService;
@Autowired
private IBusinessRecordsService businessRecordsService;
@Autowired
@@ -108,6 +113,17 @@
return PageResult.<ProductOrderJoinDetail>builder().data(null).code(0).count(0L).build();
return productOrderRecordService.findAllDataList(params);
}
+ /**
+ * 查看报告
+ */
+ @ApiOperation(value = "查看报告")
+ @PostMapping("/pdfname/{diagnosticId}/{reportType}/{hospitalId}/{departId}")
+ public ResultBody getPdfPathForOperation(@PathVariable("diagnosticId") String diagnosticId,@PathVariable("reportType") Integer reportType,@PathVariable("hospitalId") Long hospitalId,@PathVariable("departId") Long departId) {
+ if (StringUtils.isBlank(diagnosticId)) {
+ return ResultBody.failed("请输入diagnosticId");
+ }
+ return productOrderRecordService.getPdfPathForOperation(diagnosticId,reportType,hospitalId,departId);
+ }
/**
* 列表
@@ -132,7 +148,7 @@
@ApiOperation(value = "查询")
@GetMapping("/biUserNowProduct")
public ResultBody biUserNowProduct(@RequestParam long hospitalId, Long departmentId) {
- return productOrderRecordService.biUserNowProduct(hospitalId,departmentId);
+ return productOrderDetailService.biUserNowProduct(hospitalId,departmentId);
}
/**
* 查询
@@ -212,16 +228,48 @@
* 删除
*/
@ApiOperation(value = "删除")
+ @Transactional(rollbackFor = Exception.class)
@DeleteMapping("/{id}")
public ResultBody delete(@PathVariable Long id) {
- boolean v = productOrderRecordService.removeById(id);
- if (v) {
- if (!businessRecordsService.recordBusinessData("删除订单明细:" + id, id.toString())) {
- //log.error(String.format("删除订单明细id为：{1}",id));
+ ProductOrderRecord productOrderRecord=productOrderRecordService.getById(id);
+ if (productOrderRecord != null) {
+ Map<String,Object> detailSelect=new HashMap<String,Object>();
+ detailSelect.put("pro_id",productOrderRecord.getProId());
+ detailSelect.put("order_id",productOrderRecord.getOrderId());
+ List<ProductOrderDetail> productOrderDetailList=productOrderDetailService.listByMap(detailSelect);
+ if (productOrderDetailList != null&&productOrderDetailList.size()>0) {
+ ProductOrderDetail productOrderDetail=productOrderDetailList.get(0);
+ if (productOrderDetail.getAilightCount() == productOrderRecord.getAilightCount()&&
+ productOrderDetail.getRecordCount()==productOrderRecord.getRecordCount()) {
+ //读片量和报告量都没有改变 可以删除
+ //删记录
+ boolean isdel= productOrderRecordService.removeById(id);
+ //删套餐
+ boolean isdelDetail=productOrderDetailService.removeById(productOrderDetail.getId());
+ //写记录
+ boolean record=businessRecordsService.recordBusinessData("删除订单明细:" + id, id.toString());
+ log.info(String.format("删除订单明细id为：{1}",id));
+ if (isdelDetail&&isdel) {
+ return ResultBody.ok().msg("套餐删除成功!");
+ }
+ else
+ {
+ return ResultBody.failed().msg("当前套餐删除失败!");
+ }
+ }
+ else
+ {
+ return ResultBody.failed().msg("当前套餐已经使用,无法删除!");
+ }
}
- return ResultBody.ok().msg("删除成功");
- } else {
- return ResultBody.failed().msg("删除失败");
+ else
+ {
+ return ResultBody.failed().msg("无相关套餐记录!");
+ }
+ }
+ else
+ {
+ return ResultBody.failed().msg("不存在该条记录!");
}
}
--
Gitblit v1.8.0