From cc74c69a0b48dce77cec5674fa42bee768bb28d7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 07 三月 2025 10:59:28 +0800
Subject: [PATCH] zjh20250307
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java | 102 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 87 insertions(+), 15 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 710dacd..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
@@ -2,19 +2,29 @@
import java.util.List;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
import com.ltkj.hosp.domain.TjDiscardInspection;
import com.ltkj.hosp.service.ITjDiscardInspectionService;
import com.ltkj.common.core.page.TableDataInfo;
+
+import javax.annotation.Resource;
/**
* 寮冩Controller
@@ -24,34 +34,96 @@
*/
@RestController
@RequestMapping("/hosp/inspection")
+@Api(tags = "寮冩璁板綍鎺ュ彛")
public class TjDiscardInspectionController extends BaseController {
@Autowired
private ITjDiscardInspectionService tjDiscardInspectionService;
-/**
- * 鏌ヨ寮冩鍒楄〃
- */
-@PreAuthorize("@ss.hasPermi('hosp:inspection:list')")
-@GetMapping("/list")
+ @Resource
+ private ITjOrderService tjOrderService;
+ @Resource
+ private ITjOrderDetailService tjOrderDetailService;
+ @Resource
+ private ITjOrderRemarkService remarkService;
+
+ /**
+ * 鏌ヨ寮冩鍒楄〃
+ */
+ @GetMapping("/list")
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);
}
/**
* 鑾峰彇寮冩璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('hosp:inspection:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return success(tjDiscardInspectionService.selectTjDiscardInspectionById(id));
}
+ /**
+ * 鎭㈠寮冩
+ */
+ @PostMapping("/recall")
+ public AjaxResult recall(@RequestBody List<TjDiscardInspection> tjDiscardInspection) {
+ for (TjDiscardInspection discardInspection : tjDiscardInspection) {
+ //鍒ゆ柇鏄惁瀹℃牳
+ LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrder::getTjNumber,discardInspection.getTjNum());
+ final TjOrder one = tjOrderService.getOne(wq);
+
+ if (one==null){
+ return error("鏃犺浣撴鍙�");
+ }
+
+ if (one.getStatus()==301){
+ return error("鍒濆宸查�氳繃锛屼笉鍙挙鍥�");
+ }else if (one.getStatus()==401){
+ return error("鎬绘宸查�氳繃锛屼笉鍙挙鍥�");
+ }else if (one.getStatus()==402){
+ return error("鎶ュ憡宸插彂甯冿紝涓嶅彲鎾ゅ洖");
+ }
+ if (one.getHeshouStatus()==1){
+ return error("鎶ュ憡宸叉牳鏀讹紝涓嶅彲鎾ゅ洖");
+ }
+ if (one.getCheckStatus()==1){
+ return error("鎬绘宸插鏍革紝涓嶅彲鎾ゅ洖");
+ }
+ //鍒犻櫎寮冩璁板綍
+ final boolean b = tjDiscardInspectionService.removeById(discardInspection.getId());
+ if(b){
+ //灏嗙绂荤姸鎬佹敼鍥炲凡绛惧埌
+ one.setStatus(201);
+ tjOrderService.updateById(one);
+ }
+ }
+ 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