From 67e390ca9b01ad09066d09de1df8d2730cdf4dc5 Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期三, 20 十一月 2024 14:43:32 +0800 Subject: [PATCH] zjh20241120 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 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 fe83d88..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") @@ -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(); -- Gitblit v1.8.0