|
@@ -16,18 +16,16 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
<select id="selectDcPsParamAndSpec" resultType="map" parameterType="java.util.Map">
|
|
<select id="selectDcPsParamAndSpec" resultType="map" parameterType="java.util.Map">
|
|
SELECT
|
|
SELECT
|
|
p.psp_name,
|
|
p.psp_name,
|
|
p.psp_value,
|
|
p.psp_value,
|
|
p.psp_type,
|
|
p.psp_type,
|
|
- s.ps_id,
|
|
|
|
- s.ps_p_id,
|
|
|
|
|
|
+ MIN(s.ps_id) as ps_id,
|
|
|
|
+ MIN(s.ps_p_id) as ps_p_id,
|
|
s.ps_no,
|
|
s.ps_no,
|
|
- s.ps_name,
|
|
|
|
- s.dcb_id,
|
|
|
|
|
|
+ MIN(s.ps_name) as ps_name,
|
|
|
|
+ MIN(s.dcb_id) as dcb_id,
|
|
p.psp_category
|
|
p.psp_category
|
|
FROM dc_ps_param p
|
|
FROM dc_ps_param p
|
|
LEFT JOIN dc_p_spec s ON p.psp_mode = s.ps_no
|
|
LEFT JOIN dc_p_spec s ON p.psp_mode = s.ps_no
|
|
@@ -44,17 +42,21 @@
|
|
<if test="psp_name != null and psp_name != ''">
|
|
<if test="psp_name != null and psp_name != ''">
|
|
AND p.psp_name like concat('%', #{psp_name}, '%')
|
|
AND p.psp_name like concat('%', #{psp_name}, '%')
|
|
</if>
|
|
</if>
|
|
-
|
|
|
|
<if test="ps_p_id != null and ps_p_id != ''">
|
|
<if test="ps_p_id != null and ps_p_id != ''">
|
|
- and s.ps_p_id = #{ps_p_id}
|
|
|
|
|
|
+ AND s.ps_p_id = #{ps_p_id}
|
|
</if>
|
|
</if>
|
|
</where>
|
|
</where>
|
|
|
|
+ GROUP BY
|
|
|
|
+ p.psp_name,
|
|
|
|
+ p.psp_value,
|
|
|
|
+ p.psp_type,
|
|
|
|
+ s.ps_no,
|
|
|
|
+ p.psp_category
|
|
|
|
+ ORDER BY MIN(s.ps_id) DESC
|
|
</select>
|
|
</select>
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
<sql id="selectDcPsParamVo">
|
|
<sql id="selectDcPsParamVo">
|
|
- select psp_id, psp_mode, psp_name, psp_value, dcb_id from dc_ps_param
|
|
|
|
|
|
+ select psp_id, psp_mode, psp_name, psp_value, dcb_id, psp_type from dc_ps_param
|
|
</sql>
|
|
</sql>
|
|
|
|
|
|
<select id="selectDcPsParamList" parameterType="DcPsParam" resultMap="DcPsParamResult">
|
|
<select id="selectDcPsParamList" parameterType="DcPsParam" resultMap="DcPsParamResult">
|