Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-07-11 d7d9b601b2e4fdb663375993e2cfbdbd363df421

 java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml

@@ -3,7 +3,7 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="purchaseApplyServiceDaoImpl">
    <resultMap type="com.java110.dto.purchaseApply.PurchaseApplyDto" id="applyMap">
    <resultMap type="com.java110.dto.purchase.PurchaseApplyDto" id="applyMap">
        <id column="applyOrderId" property="applyOrderId"/>
        <result column="description" property="description"/>
        <result column="resOrderType" property="resOrderType"/>
@@ -63,7 +63,7 @@
    <!-- 保存采购明细表-->
    <insert id="savePurchaseApplyDetailInfo" parameterType="List">
        insert into purchase_apply_detail
        (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark,original_stock)
        (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark,original_stock,times_id,consult_price)
        values
        <foreach collection="list" item="item" index="index" separator=",">
            (
@@ -79,7 +79,9 @@
            #{item.price},
            #{item.purchaseQuantity},
            #{item.purchaseRemark},
            #{item.originalStock}
            #{item.originalStock},
            #{item.timesId},
            #{item.consultPrice}
            )
        </foreach>
    </insert>
@@ -324,14 +326,21 @@
        p.id,
        p.apply_order_id applyOrderId,
        p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price
        purchasePrice,p.original_stock originalStock,
        purchasePrice,p.original_stock originalStock,p.consult_price consultPrice,p.times_id timesId,
        r.res_name resName,r.res_code resCode,
        r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName
        r.price,r.price standardPrice,rstime.stock,rst.name rstName,rst1.name parentRstName,rss.spec_name specName,rs.supplier_name supplierName,
        td1.name unitCodeName,
        td2.name miniUnitCodeName
        from
        purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
        purchase_apply_detail p
        inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
        left join t_dict td1 on r.unit_code = td1.status_cd and td1.table_name = 'resource_store' and td1.table_columns = 'unit_code'
        left join t_dict td2 on r.mini_unit_code = td2.status_cd and td2.table_name = 'resource_store' and td2.table_columns = 'unit_code'
        LEFT JOIN resource_supplier rs on p.rs_id=rs.rs_id
        LEFT JOIN resource_store_type rst on r.rst_id=rst.rst_id
        LEFT JOIN resource_store_type rst1 on r.parent_rst_id=rst1.rst_id
        LEFT JOIN resource_store_specification rss on r.rss_id=rss.rss_id
        left join resource_store_times rstime on p.times_id = rstime.times_id and rstime.status_cd = '0'
        where 1=1
        and p.status_cd = '0'
        <if test="applyOrderIds !=null">
@@ -407,6 +416,16 @@
        <if test="applyOrderId !=null and applyOrderId != ''">
            and t.apply_order_id= #{applyOrderId}
        </if>
        <if test="applyOrderIds !=null ">
            and t.apply_order_id in
            <foreach open="(" close=")"
                     separator="," collection="applyOrderIds" item="item">
                #{item}
            </foreach>
        </if>
        <if test="userName !=null and userName != ''">
            and t.user_name like concat('%',#{userName},'%')
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
@@ -451,9 +470,9 @@

    <!--查询下级用户id-->
    <select id="getActRuTaskUserId" parameterType="Map" resultType="Map">
        SELECT ASSIGNEE_ taskUserId FROM act_ru_task t
        LEFT JOIN act_hi_procinst ahp on t.PROC_INST_ID_=ahp.ID_
        LEFT JOIN act_ru_execution are on t.EXECUTION_ID_=are.ID_
        SELECT ASSIGNEE_ taskUserId FROM ACT_RU_TASK t
        LEFT JOIN ACT_HI_PROCINST ahp on t.PROC_INST_ID_=ahp.ID_
        LEFT JOIN ACT_RU_EXECUTION are on t.EXECUTION_ID_=are.ID_
        where 1 = 1
        <if test="actRuTaskId !=null and actRuTaskId != ''">
            and ahp.ID_ = #{actRuTaskId}
@@ -465,4 +484,26 @@
            and ahp.BUSINESS_KEY_ = #{businessKey}
        </if>
    </select>

    <!--获得获取流程任务id-->
    <select id="getActRuTaskId" parameterType="Map" resultType="Map">
        SELECT art.ID_ actRuTaskId FROM ACT_RU_EXECUTION are
        LEFT JOIN ACT_RU_TASK art ON are.PROC_INST_ID_=art.PROC_INST_ID_
        where 1 = 1
        <if test="businessKey !=null and businessKey != ''">
            and are.BUSINESS_KEY_ = #{businessKey}
        </if>
    </select>

    <!-- 修改流程任务信息 -->
    <update id="updateActRuTaskById" parameterType="Map">
        update ACT_RU_TASK t set SUSPENSION_STATE_=1
        <if test="assigneeUser != null and assigneeUser != ''">
            ,t.ASSIGNEE_ = #{assigneeUser}
        </if>
        where 1=1
        <if test="actRuTaskId !=null and actRuTaskId != ''">
            and t.ID_= #{actRuTaskId}
        </if>
    </update>
</mapper>