From 0892d843cd394f383ff50f480f7f22f2ec3829bc Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 27 六月 2025 20:24:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java |  203 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 203 insertions(+), 0 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index df245be..f1b3506 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -72,6 +72,8 @@
     private RedisCache redisCache;
     @Autowired
     private TjProjectXgjlService xgjlService;
+    @Autowired
+    private TjBzProService bzProService;
 
 
     @GetMapping("/getTjHyBgList")
@@ -662,4 +664,205 @@
             throw new RuntimeException(e);
         }
     }
+
+
+    @GetMapping("/getProListByBblx")
+    @ApiOperation(value = "鏌ヨ鏍囨湰瀵瑰簲椤圭洰鎴栨湭瀵瑰簲鏍囨湰鐨勯」鐩�")
+    public AjaxResult getProListByBblx(@ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false) String bblx) {
+        try {
+            List<TjProject> projectList =tjProjectService.getProListByBblx(bblx);
+            return AjaxResult.success(projectList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/delProByBblx")
+    @ApiOperation(value = "鍒犻櫎椤圭洰瀵瑰簲鏍囨湰")
+    @Transactional
+    public AjaxResult delProByBblx(@ApiParam(value = "椤圭洰ID")@RequestParam(required = false) String proId) {
+        try {
+            TjProject tjProject = tjProjectService.getById(proId);
+            tjProject.setSpecimenType(null);
+            tjProjectService.updateById(tjProject);
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    @PostMapping("/updateProByBblx")
+    @ApiOperation(value = "淇敼鎵�閫夐」鐩殑鏍囨湰绫诲瀷")
+    @Transactional
+    public AjaxResult updateProByBblx(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+                                      @ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false)String bblx) {
+        try {
+            if(null !=  proIds && !proIds.isEmpty()){
+                for (String proId : proIds) {
+                    TjProject tjProject = tjProjectService.getById(proId);
+                    tjProject.setSpecimenType(bblx);
+                    tjProjectService.updateById(tjProject);
+                }
+            }
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+
+
+
+
+    @GetMapping("/getProListByBwwh")
+    @ApiOperation(value = "鏌ヨ閮ㄤ綅瀵瑰簲椤圭洰鎴栨湭瀵瑰簲閮ㄤ綅鐨勯」鐩�")
+    public AjaxResult getProListByBwwh(@ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false) String bw) {
+        try {
+            List<TjProject> projectList =tjProjectService.getProListByBwwh(bw);
+            return AjaxResult.success(projectList);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/delProByBbwwh")
+    @ApiOperation(value = "鍒犻櫎椤圭洰瀵瑰簲閮ㄤ綅")
+    @Transactional
+    public AjaxResult delProByBbwwh(@ApiParam(value = "椤圭洰ID")@RequestParam(required = false) String proId) {
+        try {
+            TjProject tjProject = tjProjectService.getById(proId);
+            tjProject.setCheckBw(null);
+            tjProjectService.updateById(tjProject);
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @PostMapping("/updateProByBwwh")
+    @ApiOperation(value = "淇敼鎵�閫夐」鐩殑閮ㄤ綅")
+    @Transactional
+    public AjaxResult updateProByBwwh(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+                                      @ApiParam(value = "鏍囨湰绫诲瀷")@RequestParam(required = false)String bw) {
+        try {
+            if(null !=  proIds && !proIds.isEmpty()){
+                for (String proId : proIds) {
+                    TjProject tjProject = tjProjectService.getById(proId);
+                    tjProject.setCheckBw(bw);
+                    tjProjectService.updateById(tjProject);
+                }
+            }
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+//    @PostMapping("/addOrupdateProByBz")
+//    @ApiOperation(value = "鏂板鎴栦慨鏀规墍閫夐」鐩殑瀵瑰簲鐥呯淇℃伅")
+//    @Transactional
+//    public AjaxResult addOrupdateProByBz(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+//                                         @ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+//        try {
+//            if(null !=  proIds && !proIds.isEmpty()){
+//                bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz));
+//                for (String proId : proIds) {
+//                    TjBzPro bzPro=new TjBzPro();
+//                    bzPro.setBzId(Long.valueOf(bz));
+//                    bzPro.setProId(Long.valueOf(proId));
+//                    bzProService.save(bzPro);
+//                }
+//            }
+//            return AjaxResult.success();
+//        } catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
+//
+//
+//    @GetMapping("/getProByBz")
+//    @ApiOperation(value = "鏌ヨ鐥呯瀵瑰簲椤圭洰")
+//    public AjaxResult getProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+//        try {
+//            List<TjBzPro> list = bzProService.list(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId, bz));
+//            return AjaxResult.success(list);
+//        } catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
+//
+//
+//    @DeleteMapping("/delProByBz")
+//    @ApiOperation(value = "鍒犻櫎鐥呯瀵瑰簲椤圭洰")
+//    public AjaxResult delProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz,
+//                                 @ApiParam(value = "椤圭洰ID")@RequestParam(required = false)String proId) {
+//        try {
+//            bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz).eq(TjBzPro::getProId,proId));
+//            return AjaxResult.success();
+//        } catch (Exception e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
+
+
+
+    @PostMapping("/addOrupdateProByBz")
+    @ApiOperation(value = "鏂板鎴栦慨鏀规墍閫夐」鐩殑瀵瑰簲鐥呯淇℃伅")
+    @Transactional
+    public AjaxResult addOrupdateProByBz(@ApiParam(value = "椤圭洰ID闆嗗悎")@RequestParam(required = false) List<String> proIds,
+                                         @ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+        try {
+            if(null !=  proIds && !proIds.isEmpty()){
+                bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz));
+                for (String proId : proIds) {
+                    TjBzPro bzPro=new TjBzPro();
+                    bzPro.setBzId(Long.valueOf(bz));
+                    bzPro.setProId(Long.valueOf(proId));
+                    bzProService.save(bzPro);
+                }
+            }
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @GetMapping("/getProByBz")
+    @ApiOperation(value = "鏌ヨ鐥呯瀵瑰簲椤圭洰")
+    public AjaxResult getProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz) {
+        try {
+            LambdaQueryWrapper<TjBzPro> tjBzProLambdaQueryWrapper = new LambdaQueryWrapper<>(TjBzPro.class);
+            if(StringUtil.isNotBlank(bz)){
+                tjBzProLambdaQueryWrapper.eq(TjBzPro::getBzId, bz);
+                List<TjBzPro> list = bzProService.list(tjBzProLambdaQueryWrapper);
+                for (TjBzPro bzPro : list) {
+                    TjProject tjProject = tjProjectService.getById(bzPro.getProId());
+                    if(null != tjProject)bzPro.setProName(tjProject.getProName());
+                }
+                return AjaxResult.success(list);
+            }else {
+                List<TjProject> list = tjProjectService.selectTjProjectListByBz();
+                return AjaxResult.success(list);
+            }
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @DeleteMapping("/delProByBz")
+    @ApiOperation(value = "鍒犻櫎鐥呯瀵瑰簲椤圭洰")
+    public AjaxResult delProByBz(@ApiParam(value = "鐥呯ID")@RequestParam(required = false)String bz,
+                                 @ApiParam(value = "椤圭洰ID")@RequestParam(required = false)String proId) {
+        try {
+            bzProService.remove(new LambdaQueryWrapper<>(TjBzPro.class).eq(TjBzPro::getBzId,bz).eq(TjBzPro::getProId,proId));
+            return AjaxResult.success();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 }

--
Gitblit v1.8.0