20250102-03

zhaowenxuan

2025-01-02 1d6c4e61ef5327d425989a2db2d113462e44c2f0

20250102-03

 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<>();

 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();
    }
}

 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>