From b8bf9a10ca1c65e94d75a2db5550e6263b582512 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 十二月 2024 15:01:41 +0800
Subject: [PATCH] 调整结果项目状态判断结论增加非空判断

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjDiscardInspectionController.java |   75 ++++++++++++++++++++++++++++++-------
 1 files changed, 60 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..9eaca30 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,23 @@
 
 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.service.ITjOrderDetailService;
+import com.ltkj.hosp.service.ITjOrderService;
 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.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
@@ -28,30 +32,71 @@
     @Autowired
     private ITjDiscardInspectionService tjDiscardInspectionService;
 
-/**
- * 鏌ヨ寮冩鍒楄〃
- */
-@PreAuthorize("@ss.hasPermi('hosp:inspection:list')")
-@GetMapping("/list")
+    @Resource
+    private ITjOrderService tjOrderService;
+    @Resource
+    private ITjOrderDetailService tjOrderDetailService;
+
+    /**
+     * 鏌ヨ寮冩鍒楄〃
+     */
+    @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("鎾ゅ洖鎴愬姛");
+    }
 }

--
Gitblit v1.8.0