Merge remote-tracking branch 'origin/master'

YYC

2023-07-07 8c3544c7ff6f6820d36e24af6d6e72b7e9cba75a

 igds-inout/src/main/resources/mapper/InoutCheckMapper.xml

@@ -38,7 +38,6 @@
            <if test="param.sampleStatus != null and param.sampleStatus != 'NONE' ">AND SAMPLE_TIME_ IS NOT NULL</if>
        </where>
        AND RECORD_STATUS_ != 'DEL'
        AND RECORD_STATUS_ != 'ERROR'
        ORDER BY REGISTER_TIME_
    </select>

@@ -99,7 +98,6 @@
            <if test="param.checkStatus != null and param.checkStatus == 'NONE' ">AND CHECK_STATUS_ = 'NONE'</if>
        </where>
        AND RECORD_STATUS_ != 'DEL'
        AND RECORD_STATUS_ != 'ERROR'
        ORDER BY REGISTER_TIME_
    </select>

@@ -119,6 +117,7 @@
            <if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
            <if test="data.price != null">PRICE_ = #{data.price},</if>
            <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if>
            <if test="data.updateTime != null">UPDATE_TIME_ = #{data.updateTime},</if>
        </trim>
        WHERE
        COMPANY_ID_ =#{data.companyId}
@@ -153,4 +152,40 @@
        ORDER BY UPDATE_TIME_
    </select>

    <!--分页获取化验数据-->
    <select id="inoutDataByCheckId" resultType="com.ld.igds.inout.dto.InoutCheckData"
            parameterType="com.ld.igds.inout.dto.InoutCheckParam">
        select
        ID_ as id,
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        TYPE_ as type,
        PROGRESS_ as progress,
        RECORD_STATUS_ as recordStatus,
        INTEL_CARD_ as intelCard,
        REGISTER_TIME_ as registerTime,
        REGISTER_USER_ as registerUser,
        DEPOT_ID_ as depotId,
        FOOD_VARIETY_ as foodVariety,
        FOOD_LEVEL_ as foodLevel,
        PRICE_ as price,
        PLATE_NUM_ as plateNum,
        SAMPLE_USER_ as sampleUser,
        SAMPLE_TIME_ as sampleTime,
        CHECK_USER_ as checkUser,
        CHECK_TIME_ as checkTime,
        CHECK_ID_ as checkId,
        CHECK_STATUS_ AS checkStatus,
        REMARKS_ AS remarks
        from
        D_INOUT_RECORD
        <where>
            <if test="param.companyId != null and param.companyId != '' ">AND COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.checkId != null and param.checkId != '' ">AND CHECK_ID_ = #{param.checkId}</if>
            <if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
        </where>
        AND RECORD_STATUS_ != 'DEL'
        ORDER BY REGISTER_TIME_
    </select>

</mapper>