|
@@ -86,10 +86,11 @@
|
|
|
<result property="endCustomersName" column="account_name" />
|
|
|
<result property="countryName" column="country_name" />
|
|
|
<result property="areaName" column="area_name" />
|
|
|
+ <result property="quoterName" column="quoter_name" />
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTqContractLiftVo">
|
|
|
- select DISTINCT l.*,u.nick_name as salesman_name,ag.agent_name,account.account_name as endCustomersName ,
|
|
|
+ select DISTINCT l.*,u.nick_name as salesman_name,ag.agent_name,account.account_name as endCustomersName ,u2.nick_name as quoter_name,
|
|
|
CASE #{language}
|
|
|
WHEN 'chinese' THEN
|
|
|
country.country_name
|
|
@@ -112,9 +113,10 @@
|
|
|
END AS area_name,
|
|
|
t1.dict_label as elevatorTypeName
|
|
|
from tq_contract_lift l
|
|
|
- left join sys_user u on l.salesman = u.user_id
|
|
|
- left join tb_agent ag on l.agent_id = ag.agent_id
|
|
|
- left join tc_account account on l.end_customers = account.account_id
|
|
|
+ left join sys_user u on l.salesman = u.user_id AND l.del_flag = u.del_flag
|
|
|
+ left join sys_user u2 on CAST(l.quoter AS SIGNED) = u2.user_id AND l.del_flag = u2.del_flag
|
|
|
+ left join tb_agent ag on l.agent_id = ag.agent_id AND l.del_flag = ag.del_flag
|
|
|
+ left join tc_account account on l.end_customers = account.account_id AND l.del_flag = account.del_flag
|
|
|
left join tb_country country on country.country_id = l.country_id AND l.del_flag = country.del_flag
|
|
|
left join tb_area area on area.area_id = l.area_id AND l.del_flag = area.del_flag
|
|
|
left join sys_dict_data t1 on t1.dict_type = 'elevator_type' and l.elevator_type = t1.dict_value
|
|
@@ -297,11 +299,11 @@
|
|
|
|
|
|
<select id="selectTqContractLiftById" parameterType="Long" resultMap="TqContractLiftResult">
|
|
|
<include refid="selectTqContractLiftVo"/>
|
|
|
- where id = #{id}
|
|
|
+ where l.id = #{id}
|
|
|
</select>
|
|
|
<select id="listAllById" resultType="com.ruoyi.project.business.domain.vo.contract.TqContractLiftVo">
|
|
|
<include refid="selectTqContractLiftVo"/>
|
|
|
- where id in
|
|
|
+ where l.id in
|
|
|
<foreach item="id" collection="ids" open="(" separator="," close=")">
|
|
|
#{id}
|
|
|
</foreach>
|