From 0c479f17e5f9ff3ad638f3af783cf22b0a77fbd0 Mon Sep 17 00:00:00 2001 From: 刘小明 <liuxm_a@163.com> Date: 星期一, 26 八月 2024 16:04:43 +0800 Subject: [PATCH] 排班导出优化 --- pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml index a1dea71..dc74c6d 100644 --- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml +++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml @@ -21,9 +21,21 @@ select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.processIsQuote" /> <association property="planNames" column="id" javaType="java.lang.String" fetchType="eager" select="com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper.selectPlanNamesByProcessId" /> - <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode" select="selectByProcess" fetchType="eager" column="id" /> + </resultMap> + + <resultMap id="ProcessResultMap" type="com.dy.pmsGlobal.pojoPr.PrProductionProcess"> + <id property="id" column="id" jdbcType="BIGINT"/> + <result property="proId" column="pro_id" jdbcType="BIGINT"/> + <result property="name" column="name" jdbcType="VARCHAR"/> + <result property="creator" column="creator" jdbcType="VARCHAR"/> + <result property="dt" column="dt" jdbcType="TIMESTAMP"/> + <result property="disabled" column="disabled" jdbcType="TINYINT"/> + <result property="deleted" column="deleted" jdbcType="TINYINT"/> + <result property="remark" column="remark" jdbcType="VARCHAR"/> + <collection property="nodes" ofType="com.dy.pmsGlobal.pojoPr.PrProductionNode" + select="selectByProcess" fetchType="eager" column="id" /> </resultMap> <sql id="Base_Column_List"> @@ -31,7 +43,6 @@ creator,dt,disabled, deleted,remark </sql> - <select id="selectProcessNameById" resultType="java.lang.String"> select name @@ -43,12 +54,18 @@ from pr_production_node where process_id = #{processId,jdbcType=BIGINT} </select> + <select id="selectByProcessId" parameterType="java.lang.Long" resultMap="ProcessResultMap"> + select + <include refid="Base_Column_List" /> + from pr_production_process + where id = #{id,jdbcType=BIGINT} + </select> <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> select <include refid="Base_Column_List" /> from pr_production_process - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=BIGINT} </select> <delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> @@ -139,7 +156,7 @@ <!-- </if>--> </trim> </select> - <select id="queryAll" resultType="map"> + <select id="queryAll" resultType="java.util.HashMap"> select CAST(id AS CHAR) AS id,name from pr_production_process -- Gitblit v1.8.0