pms-Sv.git - Gitblit

			@@ -56,6 +56,9 @@
			<result property="processName" column="process_name" jdbcType="VARCHAR"/>
			<result property="nodeName" column="node_name" jdbcType="VARCHAR"/>
			<result property="lineName" column="line_name" jdbcType="VARCHAR"/>
			<result property="proId" column="pro_id" jdbcType="VARCHAR"/>
			<result property="proName" column="pro_name" jdbcType="VARCHAR"/>
			<result property="devicePrefix" column="device_prefix" jdbcType="VARCHAR"/>
			<collection property="assistantsList" ofType="com.dy.pmsGlobal.pojoBa.BaUser"
			select="com.dy.pmsGlobal.daoBa.BaUserMapper.selectByAssistants" fetchType="eager"
			column="assistants"/>
			@@ -68,7 +71,7 @@
			node_id,work_type,dt,status,
			start_time,end_time,assistants
			</sql>
			<sql id="part_Column_List">
			<sql id="part_Column_List"><![CDATA[
			${alias}.id,
			${alias}.user_id,
			${alias}.line_id,
			@@ -82,7 +85,7 @@
			${alias}.start_time,
			${alias}.end_time,
			${alias}.assistants
			</sql>
			]]></sql>
			<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
			select
			<include refid="Base_Column_List"/>
			@@ -90,29 +93,29 @@
			where id = #{id,jdbcType=BIGINT}
			</select>

			<select id="selectByUserAndStation" resultMap="BaseResultMap">
			select
			<include refid="Base_Column_List"/>
			from plt_station where status ==1
			<trim prefix="and" suffixOverrides="and">
			<if test="id != null and id !=''">
			id = #{id,jdbcType=BIGINT} and
			</if>
			<if test="code != null and code !=''">
			code = #{code,jdbcType=VARCHAR} and
			</if>
			<if test="name != null and name !=''">
			name like concat('%', #{name}, '%') and
			</if>
			<if test="disabled != null and disabled !=''">
			disabled = #{disabled,jdbcType=TINYINT} and
			</if>
			<if test="lineId != null and lineId !=''">
			line_id = #{lineId,jdbcType=BIGINT} and
			</if>
			</trim>
			order by id desc
			</select>
			<!-- <select id="selectByUserAndStation" resultMap="BaseResultMap">-->
			<!-- select-->
			<!-- <include refid="Base_Column_List"/>-->
			<!-- from plt_station where status =1-->
			<!-- <trim prefix="and" suffixOverrides="and">-->
			<!-- <if test="id != null and id !=''">-->
			<!-- id = #{id,jdbcType=BIGINT} and-->
			<!-- </if>-->
			<!-- <if test="code != null and code !=''">-->
			<!-- code = #{code,jdbcType=VARCHAR} and-->
			<!-- </if>-->
			<!-- <if test="name != null and name !=''">-->
			<!-- name like concat('%', #{name}, '%') and-->
			<!-- </if>-->
			<!-- <if test="disabled != null and disabled !=''">-->
			<!-- disabled = #{disabled,jdbcType=TINYINT} and-->
			<!-- </if>-->
			<!-- <if test="lineId != null and lineId !=''">-->
			<!-- line_id = #{lineId,jdbcType=BIGINT} and-->
			<!-- </if>-->
			<!-- </trim>-->
			<!-- order by id desc-->
			<!-- </select>-->

			<select id="selectList" resultMap="BaseResultMap">
			select
			@@ -141,10 +144,10 @@
			and status = #{status,jdbcType=TINYINT}
			</if>
			<if test="startTime != null and startTime !=''">
			and start_time = #{startTime,jdbcType=TIMESTAMP},
			and start_time = #{startTime,jdbcType=TIMESTAMP}
			</if>
			<if test="endTime != null and endTime !=''">
			and end_time = #{endTime,jdbcType=TIMESTAMP},
			and end_time = #{endTime,jdbcType=TIMESTAMP}
			</if>
			<if test="assistants != null and assistants !=''">
			and assistants = #{assistants,jdbcType=VARCHAR}
			@@ -156,19 +159,24 @@
			select
			<include refid="part_Column_List">
			<property name="alias" value="l"/>
			</include>
			,
			</include>,
			u.name as user_name,
			s.name as station_name,
			p.name as plan_name,
			pp.name as process_name,
			ppp.name as process_name,
			n.content as node_name,
			ll.name as line_name
			ll.name as line_name,
			p.pro_id as pro_id,
			p.pro_name as pro_name,
			concat('110', p.pro_code, p.batch_number) as device_prefix
			from sta_assembly_work_last l
			left join ba_user u on l.user_id = u.id
			left join plt_station s on l.station_id = s.id
			left join pr_assembly_plan p on l.plan_id = p.id
			left join pr_production_process pp on l.process_id = pp.id
			left join (select pap.name as name,pap.id as id,pbn.batch_number as batch_number,
			pp.id as pro_id,pp.name as pro_name,pp.`code` as pro_code
			from pr_assembly_plan as pap,plt_product as pp,pr_batch_number as pbn
			where pap.batch_id = pbn.id and pap.pro_id = pp.id) p on l.plan_id = p.id
			left join pr_production_process ppp on l.process_id = ppp.id
			left join pr_production_node n on l.node_id = n.id
			left join plt_production_line ll on l.line_id = ll.id
			<where>
			@@ -182,7 +190,7 @@
			and p.name like concat('%', #{planName}, '%')
			</if>
			<if test="processName != null and processName != '' ">
			and pp.name like concat('%', #{processName}, '%')
			and ppp.name like concat('%', #{processName}, '%')
			</if>
			<if test="nodeName != null and nodeName != '' ">
			and n.content like concat('%', #{nodeName}, '%')
			@@ -289,7 +297,41 @@
			</if>
			</where>
			</select>

			<select id="existsEntity" resultMap="BaseResultMap">
			select
			<include refid="Base_Column_List"/>
			from sta_assembly_work_last
			where user_id = #{userId,jdbcType=BIGINT}
			and station_id = #{stationId,jdbcType=BIGINT}
			<choose>
			<when test="planId != null">
			and plan_id = #{planId,jdbcType=BIGINT}
			</when>
			<otherwise>
			and plan_id is null
			</otherwise>
			</choose>
			<choose>
			<when test="processId != null">
			and process_id = #{processId,jdbcType=BIGINT}
			</when>
			<otherwise>
			and process_id is null
			</otherwise>
			</choose>
			<choose>
			<when test="nodeId != null">
			and node_id = #{nodeId,jdbcType=BIGINT}
			</when>
			<otherwise>
			and node_id is null
			</otherwise>
			</choose>
			and work_type = #{workType,jdbcType=TINYINT}
			<if test="id != null">
			and id != #{id,jdbcType=BIGINT}
			</if>
			</select>
			<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
			delete
			from sta_assembly_work_last