|
@@ -43,12 +43,12 @@
|
|
|
p.dcp_name,
|
|
|
p.dcp_model,
|
|
|
<foreach item="paramName" collection="paramNames" separator=",">
|
|
|
- MAX(CASE WHEN param.psp_name = #{paramName} THEN spec.psp_value END) as "${paramName}"
|
|
|
+ MAX(CASE WHEN param.psp_name = #{paramName} THEN param.psp_input_value END) as "${paramName}"
|
|
|
</foreach>
|
|
|
FROM
|
|
|
dc_product p
|
|
|
LEFT JOIN dc_p_spec spec ON p.dcp_id = spec.ps_p_id
|
|
|
- LEFT JOIN dc_ps_param param ON spec.ps_no = param.ps_no
|
|
|
+ LEFT JOIN dc_ps_param param ON spec.ps_no = param.psp_mode
|
|
|
<where>
|
|
|
<if test="dcp_oa_code != null and dcp_oa_code != ''">
|
|
|
AND p.dcp_oa_code like concat('%', #{dcp_oa_code}, '%')
|
|
@@ -63,10 +63,7 @@
|
|
|
AND p.dcp_model like concat('%', #{dcp_model}, '%')
|
|
|
</if>
|
|
|
</where>
|
|
|
- GROUP BY
|
|
|
- p.dcp_id, p.dcp_oa_code, p.dcp_p_no, p.dcp_name, p.dcp_model
|
|
|
- ORDER BY
|
|
|
- p.create_time DESC
|
|
|
+ GROUP BY p.dcp_id, p.dcp_oa_code, p.dcp_p_no, p.dcp_name, p.dcp_model ORDER BY p.dcp_id desc
|
|
|
</select>
|
|
|
|
|
|
|