From 1d6c4e61ef5327d425989a2db2d113462e44c2f0 Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期四, 02 一月 2025 17:57:08 +0800 Subject: [PATCH] 20250102-03 --- ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java | 12 ++++++++++++ ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml | 14 ++++++++++++++ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 2 +- 3 files changed, 27 insertions(+), 1 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index 7e7ccbb..bf2c9e8 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -2594,7 +2594,7 @@ QueryWrapper<TbTransition> wrapper = new QueryWrapper<>(); wrapper.select("parent_pro_id", "parent_pro_name", "sum(now_price) as ord_price") .eq("tj_num", tjNumber) - .groupBy("parent_pro_name"); + .groupBy("parent_pro_id"); List<TbTransition> list = transitionService.list(wrapper); List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList()); LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>(); diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java index 87afaa4..1f979f9 100644 --- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java +++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjSampling.java @@ -140,6 +140,16 @@ */ private String jxbz; + /** + * 鏄惁鏀粯 + */ + private Integer isPay; + + /** + * 鏄惁鎴愬姛鍙戝嚭鐢宠 + */ + private Integer isApply; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -160,6 +170,8 @@ .append("parentId", getParentId()) .append("jyxh", getJyxh()) .append("specimenTypeCode", getSpecimenTypeCode()) + .append("isPay", getIsPay()) + .append("isApply", getIsApply()) .toString(); } } diff --git a/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml b/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml index 4d5f10f..76813a6 100644 --- a/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml +++ b/ltkj-hosp/src/main/resources/mapper/hosp/TjSamplingMapper.xml @@ -28,6 +28,8 @@ <result property="jxbz" column="jxbz"/> <result property="createId" column="create_id"/> <result property="updateId" column="update_id"/> + <result property="isPay" column="is_pay"/> + <result property="isApply" column="is_apply"/> </resultMap> <sql id="selectTjSamplingVo"> @@ -145,6 +147,10 @@ </if> <if test="updateId != null">update_id, </if> + <if test="isPay != null">is_pay, + </if> + <if test="isApply != null">is_apply, + </if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id}, @@ -192,6 +198,10 @@ <if test="createId != null">#{createId}, </if> <if test="updateId != null">#{updateId}, + </if> + <if test="isPay != null">#{isPay}, + </if> + <if test="isApply != null">#{isApply}, </if> </trim> </insert> @@ -262,6 +272,10 @@ </if> <if test="updateId != null">update_id = #{updateId}, </if> + <if test="isPay != null">is_pay = #{isPay}, + </if> + <if test="isApply != null">is_apply = #{isApply}, + </if> </trim> where id = #{id} </update> -- Gitblit v1.8.0