修改1.0 9.24

zss

2023-09-24 7930d685829d7cc1e743e9a4cd9bd3924ad953fb

 inspect-server/src/main/resources/mapper/RawInspectMapper.xml

@@ -3,6 +3,14 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.RawInspectMapper">
    <!--清空原材料检验结论-->
    <update id="updById">
        update mom_ocean.raw_inspect
        set ins_state=0,
            ins_time=null,
            judge_state=null
        where id = #{rawInspectId}
    </update>
    <select id="selCountRaw" resultType="java.lang.Integer">
        select count(id)
        from mom_ocean.raw_inspect
@@ -56,13 +64,15 @@
        <if test="name!=null and name!=''">
            and name like concat('%',#{name},'%')
        </if>
        ORDER BY id DESC
    </select>

    <!--根据原材料检验单id查看详情-->
    <resultMap id="oneMap" type="map">
        <id property="rcode" column="rcode"/>
        <id property="code" column="rcode"/>
        <result property="formTime" column="formTime"/>
        <result property="rname" column="rname"/>
        <result property="creatTime" column="creatTime"/>
        <result property="name" column="rname"/>
        <result property="specifications" column="specifications"/>
        <result property="runit" column="runit"/>
        <result property="number" column="number"/>
@@ -71,7 +81,7 @@
        <result property="userName" column="user_name"/>
        <collection property="children" resultMap="twoMap" javaType="List"/>
    </resultMap>
    <resultMap id="twoMap" type="map">
    <resultMap id="twoMap" type="Map">
        <id property="rpId" column="rpId"/>
        <result property="rpName" column="rpName"/>
        <result property="rpUnit" column="rpUnit"/>
@@ -79,29 +89,32 @@
        <result property="internal" column="internal"/>
        <result property="testValue" column="test_value"/>
        <result property="testState" column="test_state"/>
        <result property="devName" column="devName"/>
        <result property="deviceName" column="devName"/>
        <result property="deviceId" column="deviceId"/>
        <result property="uName" column="uName"/>
    </resultMap>

    <select id="selectRawInspectsListById" resultMap="oneMap">
        select DATE_FORMAT(form_time, '%Y-%m-%d') formTime,
               r.code                             rcode,
               r.name                             rname,
        select DATE_FORMAT(form_time, '%Y-%m-%d')     formTime,
               r.code                                 rcode,
               r.name                                 rname,
               specifications,
               r.unit                             runit,
               r.unit                                 runit,
               number,
               DATE_FORMAT(r.create_time, '%Y-%m-%d') creatTime,
               supplier,
               judge_state,
               user_name,
               rp.id                              rpId,
               rp.name                            rpName,
               rp.unit                            rpUnit,
               rp.id                                  rpId,
               rp.name                                rpName,
               rp.unit                                rpUnit,
               required,
               internal,
               test_value,
               test_state,
               device.name                        devName,
               user.name                          uName
               device.name                            devName,
               device.`id`                            deviceId,
               user.name                              uName
        from mom_ocean.raw_ins_product rp
                 left join mom_ocean.raw_inspect r on rp.raw_inspect_id = r.id
                 left join mom_ocean.device
@@ -111,4 +124,14 @@
          and rp.state = 1
          and r.id = #{id}
    </select>

    <!--根据原材料编码查询最近一条数据-->
    <select id="selOneByCode" resultType="com.yuanchu.mom.pojo.RawInspect">
        select *
        from mom_ocean.raw_inspect
        where state = 1
          and code = #{code}
        order by id desc
        limit 1
    </select>
</mapper>