Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 da026a34bcc97b2eb49607a3b02d94d8f683f997

 smartor/src/main/resources/mapper/smartor/PatMedOperationItemMapper.xml

@@ -6,6 +6,7 @@

    <resultMap type="com.smartor.domain.PatMedOperationItem" id="PatMedOperationItemResult">
            <result property="id" column="id"/>
            <result property="operationid" column="operationid"/>
            <result property="opid" column="opid"/>
            <result property="opcode" column="opcode"/>
            <result property="opdesc" column="opdesc"/>
@@ -29,14 +30,17 @@
    </resultMap>

    <sql id="selectPatMedOperationItemVo">
        select id, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid
        select id, operationid, opid, opcode, opdesc, main_flag, incitypecode, incitypedesc, oplevelcode, opleveldesc, opposition, del_flag, update_by, update_time, create_by, create_time, isupload, upload_time, orgid, pguid, guid, pid
        from pat_med_operation_item
    </sql>

    <select id="selectPatMedOperationItemList" parameterType="com.smartor.domain.PatMedOperationItem"
            resultMap="PatMedOperationItemResult">
        <include refid="selectPatMedOperationItemVo"/>
        <where>
        where 1=1
                        <if test="operationid != null ">
                            and operationid = #{operationid}
                        </if>
                        <if test="opid != null ">
                            and opid = #{opid}
                        </if>
@@ -82,7 +86,6 @@
                        <if test="pid != null ">
                            and pid = #{pid}
                        </if>
        </where>
    </select>

    <select id="selectPatMedOperationItemById" parameterType="Long"
@@ -95,6 +98,8 @@
        insert into pat_med_operation_item
        <trim prefix="(" suffix=")" suffixOverrides=",">
                    <if test="id != null">id,
                    </if>
                    <if test="operationid != null">operationid,
                    </if>
                    <if test="opid != null">opid,
                    </if>
@@ -139,6 +144,8 @@
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
                    <if test="id != null">#{id},
                    </if>
                    <if test="operationid != null">#{operationid},
                    </if>
                    <if test="opid != null">#{opid},
                    </if>
@@ -186,6 +193,9 @@
    <update id="updatePatMedOperationItem" parameterType="com.smartor.domain.PatMedOperationItem">
        update pat_med_operation_item
        <trim prefix="SET" suffixOverrides=",">
                    <if test="operationid != null">operationid =
                        #{operationid},
                    </if>
                    <if test="opid != null">opid =
                        #{opid},
                    </if>