From 246d78931aa779d0ea2ae6a262cd23494476e80b Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 10 六月 2025 15:58:53 +0800
Subject: [PATCH] zjh20250610

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

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index e826098..421a5bb 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -13,6 +13,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ltkj.common.annotation.RepeatSubmit;
 import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.common.core.domain.entity.SysDept;
 import com.ltkj.common.core.domain.entity.SysUser;
 import com.ltkj.common.core.redis.RedisCache;
 import com.ltkj.common.enums.DataSourceType;
@@ -354,6 +355,17 @@
         }
         return list;
     }
+
+
+    @PostMapping("/newaddOrderYcXmJyByTjh")
+    @ApiOperation(value = "鎬绘鍖荤敓椤甸潰鏂板寮傚父椤圭洰寤鸿(鍗曚釜)")
+    public AjaxResult newaddOrderYcXmJyByTjh(@RequestBody TjOrderYcxm ycxm) {
+
+        ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
+        ycxmService.saveOrUpdate(ycxm);
+        return AjaxResult.success();
+    }
+
 
 
     /**
@@ -2072,4 +2084,46 @@
         return detailService.updFcPro(json);
     }
 
+
+
+    @GetMapping("/zongjianyishengHuiFuyichangxiangmu")
+    @ApiOperation(value = "鎬绘鎭㈠寮傚父椤圭洰鎺ュ彛")
+    public AjaxResult zongjianyishengHuiFuyichangxiangmu(@RequestParam String tjNum) {
+
+        List<TjOrderYcxm> list = ycxmService.zongjianyishengHuiFuyichangxiangmu(tjNum);
+        return AjaxResult.success(list);
+    }
+
+
+    @GetMapping("/csymxmxzqtyybcjk")
+    @ApiOperation(value = "鍒濆椤甸潰椤圭洰閫夋嫨鍏朵粬鍘熷洜淇濆瓨鎺ュ彛")
+    @Transactional
+    public AjaxResult csymxmxzqtyybcjk(@RequestParam @ApiParam("浣撴鍙�") String tjNum,@RequestParam @ApiParam("椤圭洰ID") String proId,
+                                       @RequestParam @ApiParam("鍘熷洜") String yy) {
+
+        try {
+            String czydm = SecurityUtils.getUsername();
+            String czy = SecurityUtils.getLoginUser().getUser().getNickName();
+            TjProject tjProject = projectService.getById(proId);
+            if(null !=  tjProject){
+                SysDept dept = deptService.getById(tjProject.getDeptId());
+
+                LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+                wq.eq(TjOrderRemark::getTjNumber, tjNum);
+                wq.eq(TjOrderRemark::getProId, proId);
+                TjOrderRemark remark = orderRemarkService.getOne(wq);
+                remark.setType(1);
+                if (orderRemarkService.updateById(remark)) {
+                    orderRemarkService.csymxmxzqtyybcjk(tjNum,proId,yy,dept.getOrgType(),czy,czydm);
+                    return AjaxResult.success();
+                }
+            }
+        } catch (Exception ex) {
+            log.error(ex.getMessage());
+            throw new RuntimeException(ex);
+        }
+        return AjaxResult.error();
+    }
+
+
 }

--
Gitblit v1.8.0