From 2c785c3d4513daea9deb5c7edbb17a9f17111d25 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 21 二月 2025 17:49:03 +0800
Subject: [PATCH] zjh20250221
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
index da2382a..9bff1d4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java
@@ -7,10 +7,16 @@
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.TjCustomer;
import com.ltkj.hosp.domain.TjOrder;
+import com.ltkj.hosp.domain.TjOrderRemark;
import com.ltkj.hosp.service.ITjOrderDetailService;
+import com.ltkj.hosp.service.ITjOrderRemarkService;
import com.ltkj.hosp.service.ITjOrderService;
+import com.sun.javafx.tk.TKClipboard;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.core.controller.BaseController;
import com.ltkj.common.core.domain.AjaxResult;
@@ -28,6 +34,7 @@
*/
@RestController
@RequestMapping("/hosp/inspection")
+@Api(tags = "寮冩璁板綍鎺ュ彛")
public class TjDiscardInspectionController extends BaseController {
@Autowired
private ITjDiscardInspectionService tjDiscardInspectionService;
@@ -36,6 +43,8 @@
private ITjOrderService tjOrderService;
@Resource
private ITjOrderDetailService tjOrderDetailService;
+ @Resource
+ private ITjOrderRemarkService remarkService;
/**
* 鏌ヨ寮冩鍒楄〃
@@ -44,11 +53,11 @@
public TableDataInfo list(TjDiscardInspection tjDiscardInspection) {
startPage();
List<TjDiscardInspection> list = tjDiscardInspectionService.selectTjDiscardInspectionList(tjDiscardInspection);
- if (null != list && list.size() > 0) {
- for (TjDiscardInspection discardInspection : list) {
- discardInspection.setCusName(MatchUtils.hideCusName(discardInspection.getCusName()));
- }
- }
+// if (null != list && list.size() > 0) {
+// for (TjDiscardInspection discardInspection : list) {
+// discardInspection.setCusName(MatchUtils.hideCusName(discardInspection.getCusName()));
+// }
+// }
return getDataTable(list);
}
@@ -99,4 +108,22 @@
}
return success("鎾ゅ洖鎴愬姛");
}
+
+
+ @GetMapping("/csqijianhuifujiekou")
+ @ApiOperation(value = "鍒濆椤甸潰寮冩鎭㈠鎺ュ彛")
+ @Transactional
+ public AjaxResult chushenyemianqijianjiekou(@RequestParam String tjNUm, @RequestParam String proId) {
+ TjOrder order = tjOrderService.getOrderByTjNum(tjNUm);
+ if(null !=order && null !=order.getReportTime()){
+ return AjaxResult.error("璇ヤ汉鍛樻姤鍛婂凡鐢熸垚,涓嶅彲鎭㈠!");
+ }
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, tjNUm);
+ wq.eq(TjOrderRemark::getProId, proId);
+ TjOrderRemark remark = remarkService.getOne(wq);
+ remark.setType(0);
+ remarkService.updateById(remark);
+ return AjaxResult.success("鎿嶄綔鎴愬姛!");
+ }
}
--
Gitblit v1.8.0