From c2e5b3ab535b795275a64d9d18e08b25b4dbbef8 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期四, 07 十一月 2024 16:06:24 +0800
Subject: [PATCH] zjh20241107
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectXgjlMapper.java | 15 ++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProjectXgjlService.java | 9 +
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 30 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProjectXgjl.java | 294 ++++++++++++++++++++++++++++++++++++++++++
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectXgjlServiceImpl.java | 20 ++
6 files changed, 365 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
index f05f8cf..23495c5 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjFlowingWaterController.java
@@ -93,7 +93,7 @@
LambdaQueryWrapper<TjChargingStandard> wq3 = new LambdaQueryWrapper<>();
wq3.eq(TjChargingStandard::getTjNum, TjNumber);
List<TjChargingStandard> list = chargingStandardService.list(wq3);
- if (null != list && list.size() > 0) {
+ if (null != list && !list.isEmpty()) {
for (TjChargingStandard standard : list) {
TjProject project = projectService.getById(standard.getProId());
if (null != project && null != project.getProCheckType()) {
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();
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProjectXgjl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProjectXgjl.java
new file mode 100644
index 0000000..2a66ed9
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjProjectXgjl.java
@@ -0,0 +1,294 @@
+package com.ltkj.hosp.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ltkj.common.annotation.Excel;
+import com.ltkj.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 浣撴椤圭洰瀵硅薄 tj_project
+ *
+ * @author ltkj
+ * @date 2022-11-17
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "浣撴椤圭洰淇敼璁板綍琛�")
+public class TjProjectXgjl extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 涓婚敭
+ */
+ @ApiModelProperty(value = "涓婚敭id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long proId;
+
+ /**
+ * 鐖堕」鐩甶d
+ */
+ @Excel(name = "鐖堕」鐩甶d")
+ @ApiModelProperty(value = "鐖堕」鐩甶d")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long proParentId;
+
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ @Excel(name = "椤圭洰鍚嶇О")
+ @ApiModelProperty(value = "椤圭洰鍚嶇О")
+ private String proName;
+
+ /**
+ * 椤圭洰鑻辨枃鍚�
+ */
+ @Excel(name = "椤圭洰鑻辨枃鍚�")
+ @ApiModelProperty(value = "椤圭洰鑻辨枃鍚�")
+ private String proEngName;
+
+ /**
+ * 椤圭洰浠锋牸
+ */
+ @Excel(name = "椤圭洰浠锋牸")
+ @ApiModelProperty(value = "椤圭洰浠锋牸")
+ private BigDecimal proPrice;
+
+ /**
+ * 椤圭洰鍘熶环
+ */
+ @Excel(name = "椤圭洰鍘熶环")
+ @ApiModelProperty(value = "椤圭洰鍘熶环")
+ @TableField(exist = false)
+ private BigDecimal proOrdPrice;
+
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
+ private String proRemark;
+
+
+ /**
+ * 妫�鏌ョ被鍒�
+ */
+ @Excel(name = "妫�鏌ョ被鍒�")
+ @ApiModelProperty(value = "妫�鏌ョ被鍒�")
+ private String proCheckType;
+
+ /**
+ * 涓村簥鎰忎箟
+ */
+ @Excel(name = "涓村簥鎰忎箟")
+ @ApiModelProperty(value = "涓村簥鎰忎箟")
+ private String proMeaning;
+
+ /**
+ * 妫�鏌ユ柟寮�
+ */
+ @Excel(name = "妫�鏌ユ柟寮�")
+ @ApiModelProperty(value = "妫�鏌ユ柟寮� (鏀逛负鏄惁绌鸿吂 榛樿鍚�)")
+ private String proCheckMethod;
+
+ /**
+ * 鏄惁鐖剁骇 0涓虹埗1涓哄瓙
+ */
+ @ApiModelProperty(value = "鏄惁鐖剁骇 0涓虹埗1涓哄瓙")
+ @Excel(name = "鏄惁鐖剁骇 0涓虹埗1涓哄瓙",readConverterExp="0=鐖剁骇,1=瀛愮骇")
+ private Integer proStandard;
+
+ /**
+ * 椤圭洰绫诲瀷
+ */
+ @Excel(name = "椤圭洰绫诲瀷")
+ @ApiModelProperty(value = "椤圭洰绫诲瀷 (鏀逛负鎬у埆 鐢峰コ鍏ㄩ儴)")
+ private String proType;
+
+ /**
+ * 椤圭洰鐘舵��
+ */
+ @Excel(name = "椤圭洰鐘舵��",readConverterExp="0=姝ｅ父,1=鍋滅敤")
+ @ApiModelProperty(value = "椤圭洰鐘舵��")
+ private Integer proStatus;
+
+ /**
+ * 濂楅鏄惁鍚湁璇ラ」鐩�
+ */
+ @ApiModelProperty(value = "濂楅鏄惁鍚湁璇ラ」鐩�")
+ @TableField(exist = false)
+ private Integer ischeck;
+
+ /**
+ * 绉戝id
+ */
+ @Excel(name = "绉戝")
+ @ApiModelProperty(value = "绉戝id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long deptId;
+
+ /**
+ * 璁￠噺鍗曚綅
+ */
+ @Excel(name = "璁￠噺鍗曚綅")
+ @ApiModelProperty(value = "璁￠噺鍗曚綅")
+ private String proMetering;
+
+ @ApiModelProperty(value = "椤圭洰榛樿鍊�")
+ private String proDefault;
+
+ @ApiModelProperty(value = "椤圭洰鑼冨洿")
+ private String proScope;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏍囧織鍖哄垎濂楅鍜岄」鐩�")
+ private String flag;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浣撴椤圭洰闆嗗悎")
+ private List<TjProjectXgjl> tjProjectList;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "椤圭洰鏍囧噯鍙傝��")
+ private List<TjStandard> tjStandardList;
+
+ /**
+ * 鐖堕」鐩腑鐨勫瓙椤圭洰鍚嶇О瀛楃涓�
+ */
+ @ApiModelProperty(value = "澶」鐩腑鐨勫瓙椤圭洰鍚嶇О瀛楃涓�")
+ @TableField(exist = false)
+ private String allSonProName;
+
+
+ /**
+ * 璇ラ」鐩殑鏍囧噯
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璇ラ」鐩殑鏍囧噯")
+ private TjStandard standard;
+
+ /**
+ * 璇ラ」鐩殑寤鸿闆嗗悎
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璇ラ」鐩殑寤鸿闆嗗悎")
+ private List<TjAdvice> adviceList;
+
+ /**
+ * 璇ラ」鐩殑鑰楁潗闆嗗悎
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璇ラ」鐩殑鑰楁潗闆嗗悎")
+ private List<TjConsumables> consumablesList;
+
+ /**
+ * 璇ラ」鐩湪濂楅鍐呯幇浠�
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璇ラ」鐩湪濂楅鍐呯幇浠�")
+ private BigDecimal priceNow;
+
+ /**
+ * 璇ラ」鐩墍鍦ㄩ儴闂ㄥ悕绉�
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璇ラ」鐩墍鍦ㄩ儴闂ㄥ悕绉�")
+ private String deptName;
+
+
+ /**
+ * 鏀惰垂椤圭洰id
+ */
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏀惰垂椤圭洰id")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long sfxmId;
+
+
+ @ApiModelProperty(value = "缁撴灉绫诲瀷")
+ private String resultType;
+
+ @ApiModelProperty(value = "鏄惁閲囨牱0鏄�1鍚�")
+ private String isSampling;
+
+ @ApiModelProperty(value = "鏍囨湰绫诲瀷")
+ private String specimenType;
+
+ @ApiModelProperty(value = "妫�鏌ラ儴浣�")
+ private String checkBw;
+
+
+ @ApiModelProperty(value = "鎬у埆")
+ private String proSex;
+
+
+ @ApiModelProperty(value = "鏄惁绌鸿吂")
+ private String isEat;
+
+
+ @ApiModelProperty(value = "鏄惁鎵撴姤鍛�'Y/N'")
+ private String needReport;
+
+ @ApiModelProperty(value = "lis椤圭洰缂栫爜")
+ private String lisXmbm;
+
+ @ApiModelProperty(value = "lis椤圭洰鍚嶇О")
+ private String lisXmmc;
+
+ @ApiModelProperty(value = "his椤圭洰缂栫爜")
+ private String hisXmbm;
+
+ @ApiModelProperty(value = "his椤圭洰鍚嶇О")
+ private String hisXmmc;
+
+ @ApiModelProperty(value = "鏄惁缁勫悎璐圭敤")
+ private String sfzhfy;
+
+ @ApiModelProperty(value = "his鍗曚环")
+ private BigDecimal hisdj;
+
+ @ApiModelProperty(value = "鏁伴噺")
+ private Integer sl;
+
+ /**
+ * 瀛愰」鐩�
+ */
+ @TableField(exist = false)
+ private List<TjProjectXgjl> children = new ArrayList<TjProjectXgjl>();
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("proId", getProId())
+ .append("proParentId", getProParentId())
+ .append("proName", getProName())
+ .append("proEngName", getProEngName())
+ .append("proPrice", getProPrice())
+ .append("proRemark", getProRemark())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("deleted", getDeleted())
+ .append("proCheckType", getProCheckType())
+ .append("proMeaning", getProMeaning())
+ .append("proCheckMethod", getProCheckMethod())
+ .append("proStandard", getProStandard())
+ .append("proType", getProType())
+ .append("ischeck", getIscheck())
+ .toString();
+ }
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectXgjlMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectXgjlMapper.java
new file mode 100644
index 0000000..7fac48f
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectXgjlMapper.java
@@ -0,0 +1,15 @@
+package com.ltkj.hosp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ltkj.hosp.domain.TjProjectXgjl;
+import org.apache.ibatis.annotations.Insert;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+
+@Mapper
+public interface TjProjectXgjlMapper extends BaseMapper<TjProjectXgjl> {
+
+ @Insert("")
+ boolean saveTjptojectXgjl(@Param("proId") Long proId,@Param("nickName") String nickName);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProjectXgjlService.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProjectXgjlService.java
new file mode 100644
index 0000000..c0545db
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/TjProjectXgjlService.java
@@ -0,0 +1,9 @@
+package com.ltkj.hosp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ltkj.hosp.domain.TjProjectXgjl;
+
+public interface TjProjectXgjlService extends IService<TjProjectXgjl> {
+
+ boolean saveTjptojectXgjl(Long proId,String nickName);
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectXgjlServiceImpl.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectXgjlServiceImpl.java
new file mode 100644
index 0000000..b32df70
--- /dev/null
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjProjectXgjlServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ltkj.hosp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ltkj.hosp.domain.TjProjectXgjl;
+import com.ltkj.hosp.mapper.TjProjectXgjlMapper;
+import com.ltkj.hosp.service.TjProjectXgjlService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TjProjectXgjlServiceImpl extends ServiceImpl<TjProjectXgjlMapper, TjProjectXgjl> implements TjProjectXgjlService {
+
+ @Autowired
+ private TjProjectXgjlMapper mapperl;
+
+ @Override
+ public boolean saveTjptojectXgjl(Long proId,String nickName) {
+ return false;
+ }
+}
--
Gitblit v1.8.0