From 321d07a53833dc50246ca274a04c31a8066f3575 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期一, 04 十二月 2023 17:46:48 +0800
Subject: [PATCH] 重大阳性
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java | 8 ++++
ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml | 6 ++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java | 91 ++++++++++++++++++++++++++-------------------
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java | 8 +++
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 4 ++
5 files changed, 77 insertions(+), 40 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java
index a549a1a..7be63de 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjBigPositiveController.java
@@ -1,8 +1,13 @@
package com.ltkj.web.controller.system;
+import java.util.Arrays;
import java.util.List;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.hosp.domain.TjOrderDetail;
+import com.ltkj.hosp.service.ITjOrderDetailService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -34,6 +39,9 @@
@Autowired
private ITjBigPositiveService tjBigPositiveService;
+ @Resource
+ private ITjOrderDetailService detailService;
+
/**
* 鏌ヨ閲嶅ぇ闃虫�ц褰曞垪琛�
*/
@@ -45,48 +53,55 @@
}
/**
- * 瀵煎嚭閲嶅ぇ闃虫�ц褰曞垪琛�
+ * 鏂板/绉婚櫎 閲嶅ぇ闃虫�ц褰� 鍒ゆ柇flag
*/
- @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, TjBigPositive tjBigPositive) {
- List<TjBigPositive> list = tjBigPositiveService.selectTjBigPositiveList(tjBigPositive);
- ExcelUtil<TjBigPositive> util = new ExcelUtil<TjBigPositive>(TjBigPositive.class);
- util.exportExcel(response, list, "閲嶅ぇ闃虫�ц褰曟暟鎹�");
- }
-
- /**
- * 鑾峰彇閲嶅ぇ闃虫�ц褰曡缁嗕俊鎭�
- */
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(tjBigPositiveService.selectTjBigPositiveById(id));
- }
-
- /**
- * 鏂板閲嶅ぇ闃虫�ц褰�
- */
- @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TjBigPositive tjBigPositive) {
- return toAjax(tjBigPositiveService.insertTjBigPositive(tjBigPositive));
+ if ("1".equals(tjBigPositive.getFlag())){
+ LambdaQueryWrapper<TjBigPositive> wq=new LambdaQueryWrapper<>();
+ wq.eq(TjBigPositive::getTjNumber,tjBigPositive.getTjNumber());
+ wq.eq(TjBigPositive::getProParentId,tjBigPositive.getProParentId());
+ wq.eq(TjBigPositive::getProId,tjBigPositive.getProId());
+ final List<TjBigPositive> list = tjBigPositiveService.list(wq);
+ if (list==null||list.size()==0){
+ tjBigPositiveService.save(tjBigPositive);
+ //鏇存敼detail琛ㄧ姸鎬�
+ LambdaQueryWrapper<TjOrderDetail> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjOrderDetail::getProId,tjBigPositive.getProId());
+ wqq.eq(TjOrderDetail::getOrderId,tjBigPositive.getOrderId());
+ wqq.last("limit 1");
+ TjOrderDetail tjOrderDetails = detailService.getOne(wqq);
+ if (tjOrderDetails!=null){
+ tjOrderDetails.setIsPositive(Long.valueOf(1));
+ detailService.updateById(tjOrderDetails);
+ return AjaxResult.success("娣诲姞鎴愬姛");
+ }
+ return AjaxResult.error("鍑洪敊浜嗭紝璇疯仈绯诲伐浣滀汉鍛�");
+ }else {
+ tjBigPositiveService.updateById(tjBigPositive);
+ return AjaxResult.success("娣诲姞鎴愬姛");
+ }
+ }else if ("0".equals(tjBigPositive.getFlag())){
+ LambdaQueryWrapper<TjBigPositive> wq11=new LambdaQueryWrapper<>();
+ wq11.eq(TjBigPositive::getTjNumber,tjBigPositive.getTjNumber());
+ wq11.eq(TjBigPositive::getProParentId,tjBigPositive.getProParentId());
+ wq11.eq(TjBigPositive::getProId,tjBigPositive.getProId());
+ tjBigPositiveService.remove(wq11);
+ //鏇存敼detail琛ㄧ姸鎬�
+ LambdaQueryWrapper<TjOrderDetail> wqq=new LambdaQueryWrapper<>();
+ wqq.eq(TjOrderDetail::getProId,tjBigPositive.getProId());
+ wqq.eq(TjOrderDetail::getOrderId,tjBigPositive.getOrderId());
+ TjOrderDetail tjOrderDetails = detailService.getOne(wqq);
+ if (tjOrderDetails!=null){
+ tjOrderDetails.setIsPositive(Long.valueOf(0));
+ detailService.updateById(tjOrderDetails);
+ return AjaxResult.success("鍒犻櫎鎴愬姛");
+ }
+ return AjaxResult.error("鍑洪敊浜嗭紝璇疯仈绯诲伐浣滀汉鍛�");
+
+ }
+ return AjaxResult.error("鍑洪敊浜嗭紝璇疯仈绯诲伐浣滀汉鍛�");
}
- /**
- * 淇敼閲嶅ぇ闃虫�ц褰�
- */
- @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody TjBigPositive tjBigPositive) {
- return toAjax(tjBigPositiveService.updateTjBigPositive(tjBigPositive));
- }
- /**
- * 鍒犻櫎閲嶅ぇ闃虫�ц褰�
- */
- @Log(title = "閲嶅ぇ闃虫�ц褰�", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids) {
- return toAjax(tjBigPositiveService.deleteTjBigPositiveByIds(ids));
- }
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java
index 798d0e3..d6a7b1f 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjBigPositive.java
@@ -1,6 +1,7 @@
package com.ltkj.hosp.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+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;
@@ -39,6 +40,7 @@
* 瀹㈡埛id
*/
@Excel(name = "瀹㈡埛id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long cusId;
/**
@@ -51,12 +53,14 @@
* 椤圭洰鐖堕」
*/
@Excel(name = "椤圭洰鐖堕」")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long proParentId;
/**
* 椤圭洰瀛愰」
*/
@Excel(name = "椤圭洰瀛愰」")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long proId;
/**
@@ -77,5 +81,7 @@
@Excel(name = "绛夌骇")
private String level;
-
+ @TableField(exist = false)
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long orderId;
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
index 33ed2b9..7a20d1c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderDetail.java
@@ -194,6 +194,14 @@
@ApiModelProperty(value = "璇ラ」鐩殑鐥呯闆嗗悎")
private List<TjRules> rulesList;
+ /**
+ * 鏄惁閲嶅ぇ闃虫��
+ */
+ @Excel(name = "鏄惁閲嶅ぇ闃虫��")
+ @ApiModelProperty(value = "鏄惁閲嶅ぇ闃虫��")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private Long isPositive;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
index 3bfe6f8..7bda129 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
@@ -108,6 +108,10 @@
@ApiModelProperty(value = "鏄惁澶嶆")
private Integer isReturn;
+
+
+
+
@ApiModelProperty(value = "寤舵湡鎴鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date yqDeadline;
diff --git a/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
index 4570b3e..015eb72 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjOrderDetailMapper.xml
@@ -25,6 +25,7 @@
<result property="isSampling" column="is_sampling"/>
<result property="conclusion" column="conclusion"/>
<result property="advice" column="advice"/>
+ <result property="isPositive" column="is_positive"/>
</resultMap>
<sql id="selectTjOrderDetailVo">
@@ -46,7 +47,7 @@
is_return,
flowing_water_id,
is_sampling,
- conclusion,advice
+ conclusion,advice,is_positive
from tj_order_detail
</sql>
@@ -85,6 +86,7 @@
<if test="isSampling != null">is_sampling,</if>
<if test="conclusion != null">conclusion,</if>
<if test="advice != null">advice,</if>
+ <if test="isPositive != null">is_positive,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="orderDetailId != null">#{orderDetailId},</if>
@@ -105,6 +107,7 @@
<if test="isSampling != null">#{is_sampling},</if>
<if test="conclusion != null">#{conclusion},</if>
<if test="advice != null">#{advice},</if>
+ <if test="isPositive != null">#{is_positive},</if>
</trim>
</insert>
@@ -128,6 +131,7 @@
<if test="isSampling != null">is_sampling = #{isSampling},</if>
<if test="conclusion != null">conclusion = #{conclusion},</if>
<if test="advice != null">advice = #{advice},</if>
+ <if test="isPositive != null">is_positive = #{isPositive},</if>
</trim>
where order_detail_id = #{orderDetailId}
</update>
--
Gitblit v1.8.0