From 27e09a7b8549c5a84891c62b1625adbe81db04fc Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 21 十一月 2024 13:43:46 +0800
Subject: [PATCH] zjh20241121

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java |   42 ++++++++++++++++++++++++++++++++----------
 1 files changed, 32 insertions(+), 10 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 30aacc8..d83d19a 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
@@ -1,10 +1,7 @@
 package com.ltkj.web.controller.system;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -14,6 +11,7 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ltkj.common.core.domain.entity.SysDept;
 import com.ltkj.common.core.redis.RedisCache;
+import com.ltkj.common.utils.SecurityUtils;
 import com.ltkj.common.utils.bean.BeanUtils;
 import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
 import com.ltkj.hosp.domain.*;
@@ -67,6 +65,8 @@
     private TestMapper testMapper;
     @Resource
     private RedisCache redisCache;
+    @Autowired
+    private TjProjectXgjlService xgjlService;
 
 
     @GetMapping("/getTjHyBgList")
@@ -84,11 +84,11 @@
      */
     @GetMapping("/getDxList")
     @ApiOperation(value = "閫夋嫨浣撴椤圭洰閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
-    public AjaxResult getDxList(@RequestParam(required = false) String pname) {
-        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
+    public AjaxResult getDxList() {
+        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
         String config = configService.selectConfigByKey("tj_dxsxtj");
         if (null != config && config.equals("N")) {
-            tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
+            tjProjects = tjProjectService.getOpenDxTjProjectList();
         }
         if (tjProjects != null) {
             for (TjProject project : tjProjects) {
@@ -340,6 +340,7 @@
     @Log(title = "浣撴椤圭洰", businessType = BusinessType.UPDATE)
     @PutMapping
     @ApiOperation(value = "淇敼浣撴椤圭洰")
+    @Transactional
     public AjaxResult edit(@RequestBody @ApiParam(value = "浣撴椤圭洰瀵硅薄") TjProject tjProject) {
         if (tjProject.getProStatus() == 1) {
             LambdaQueryWrapper<TjPackageProject> wq1 = new LambdaQueryWrapper<>();
@@ -350,8 +351,20 @@
             }
         }
         tjProject.setProEngName(PinyinUtil.getFirstLetter(tjProject.getProName(),""));
+
+        TjProject ytjproject = tjProjectService.getById(tjProject.getProId());
+        Date date=new Date();
         if (tjProject.getProParentId() == 0) {
             if (tjProjectService.updateById(tjProject)) {
+                if(null !=ytjproject){
+                    if(ytjproject.getProPrice().compareTo(tjProject.getProPrice())!=0){
+                        TjProjectXgjl xgjl=new TjProjectXgjl();
+                        BeanUtils.copyBeanProp(xgjl,ytjproject);
+                        xgjl.setCreateTime(date);
+                        xgjl.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+                        xgjlService.save(xgjl);
+                    }
+                }
                 if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
                     if (null != tjProject.getSfxmId()) {
                         DictProSfxm proSfxm = new DictProSfxm();
@@ -395,6 +408,15 @@
             tjProject.setIsSampling(byId1.getIsSampling());
         }
         if (tjProjectService.updateById(tjProject)) {
+            if(null !=ytjproject){
+                if(ytjproject.getProPrice().compareTo(tjProject.getProPrice())!=0){
+                    TjProjectXgjl xgjl=new TjProjectXgjl();
+                    BeanUtils.copyBeanProp(xgjl,ytjproject);
+                    xgjl.setCreateTime(date);
+                    xgjl.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
+                    xgjlService.save(xgjl);
+                }
+            }
             if (dictProSfxmService.deletedProSfxm(tjProject.getProId())) {
                 if (null != tjProject.getSfxmId()) {
                     DictProSfxm proSfxm = new DictProSfxm();
@@ -545,11 +567,11 @@
      */
     @GetMapping("/getProParentIdDxList")
     @ApiOperation(value = "閫夋嫨浣撴椤圭洰(鎵�鏈夋湇椤圭洰)閫夊崟椤规椂璋冪敤鐨勬帴鍙�")
-    public AjaxResult getProParentIdDxList(@RequestParam(required = false) String pname) {
-        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList(pname);
+    public AjaxResult getProParentIdDxList() {
+        List<TjProject> tjProjects = tjProjectService.getDxTjProjectList();
         String config = configService.selectConfigByKey("tj_dxsxtj");
         if (null != config && config.equals("N")) {
-            tjProjects = tjProjectService.getOpenDxTjProjectList(pname);
+            tjProjects = tjProjectService.getOpenDxTjProjectList();
         }
         String key = configService.selectConfigByKey("is_open_sfxm");
         Map<String, Object> map = new HashMap<>();

--
Gitblit v1.8.0