Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-24 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035

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

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.yuanchu.mom.mapper.ProcessInspectMapper">

    <!--新增过程检验单-根据订单号选择产品信息和工艺-->
    <resultMap id="oneMap" type="map">
        <id property="name" column="material"/>
@@ -14,7 +15,7 @@
        <collection property="children" resultMap="threeMap" javaType="List"/>
    </resultMap>
    <resultMap id="threeMap" type="map">
        <id property="id" column="technologyId"/>
        <id property="id" column="mtId"/>
        <result property="name" column="techname"/>
    </resultMap>
    <select id="chooseMater" resultMap="oneMap">
@@ -22,7 +23,7 @@
               code,
               specifications,
               unit,
               technology_id technologyId,
               mt.id  mtId,
               techfather,
               techname
        from mom_ocean.manual_technology mt
@@ -41,6 +42,7 @@
        <result property="specifications" column="specifications_model"/>
        <result property="techfather" column="techfather"/>
        <result property="techname" column="techname"/>
        <result property="techId" column="tech_id"/>
        <result property="punit" column="punit"/>
        <result property="quantity" column="quantity"/>
        <result property="presult" column="presult"/>
@@ -68,6 +70,7 @@
               specifications_model,
               techfather,
               techname,
               tech_id,
               pi.unit     punit,
               quantity,
               ii.id       iid,
@@ -92,29 +95,29 @@
    <!--分页查询过程检验单列表-->
    <select id="selectProcessInspectsList" resultType="java.util.Map">
        select process_inspect.id,
               order_number,
               material_code,
               material,
               specifications_model,
               techfather,
               techname,
               unit,
               quantity,
               DATE_FORMAT(process_inspect.create_time, '%Y-%m-%d') createTime,
               name,
               DATE_FORMAT(process_inspect.update_time, '%Y-%m-%d') updateTime,
               result
        order_number,
        material_code,
        material,
        specifications_model,
        techfather,
        techname,
        unit,
        quantity,
        DATE_FORMAT(process_inspect.create_time, '%Y-%m-%d') createTime,
        name,
        DATE_FORMAT(process_inspect.update_time, '%Y-%m-%d') updateTime,
        result
        from mom_ocean.process_inspect
                 left join mom_ocean.user on process_inspect.user_id = user.id
        left join mom_ocean.user on process_inspect.user_id = user.id
        where process_inspect.state = 1
        <if test="techfather!=null and techfather!=''">
            and techfather like  concat('%',#{techfather},'%')
            and techfather like concat('%',#{techfather},'%')
        </if>
        <if test="material!=null and material!=''">
            and material like  concat('%',#{name},'%')
        <if test="name!=null and name!=''">
            and material like concat('%',#{name},'%')
        </if>
        <if test="result!=null ">
            and result =#{result}
        </if>
    </select>
</mapper>
</mapper>