Commit 83213bc5 authored by hezhuozhi's avatar hezhuozhi

人大金仓适配

parent 6266e0cf
...@@ -13,17 +13,17 @@ ...@@ -13,17 +13,17 @@
std_user_biz.real_name realName, std_user_biz.real_name realName,
(case std_user_biz.lock_status (case std_user_biz.lock_status
when "LOCK" THEN "禁用" when 'LOCK' THEN '禁用'
else "启用" end else '启用' end
)lockStatus, )lockStatus,
std_user_biz.emergency_telephone emergencyTelephone, std_user_biz.emergency_telephone emergencyTelephone,
(case hygf_personnel_business.user_type (case hygf_personnel_business.user_type
when "1" THEN "普通用户" when '1' THEN '普通用户'
else "管理员" end else '管理员' end
)userType, )userType,
REGEXP_REPLACE(IFNULL(std_user_biz.position, ''), '\\[|\\]|\\"', '') position REGEXP_REPLACE(IFNULL(std_user_biz.position, ''), '\\[|\\]|\\"', '') as position
from std_user_biz LEFT join hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id from std_user_biz LEFT join hygf_personnel_business on std_user_biz.sequence_nbr =hygf_personnel_business.foundation_id
......
...@@ -31,7 +31,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan ...@@ -31,7 +31,7 @@ LEFT JOIN hygf_document_station on hygf_document_station.station_id=hygf_peasan
and hygf_preparation_money.amos_unit_id = #{dto.amosUnitId} and hygf_preparation_money.amos_unit_id = #{dto.amosUnitId}
</if> </if>
<if test="dto.flag != null and dto.flag != ''"> <if test="dto.flag != null and dto.flag != ''">
and hygf_preparation_money.delivery_state != "已作废" and hygf_preparation_money.delivery_state != "待发货" and hygf_preparation_money.delivery_state != '已作废' and hygf_preparation_money.delivery_state != '待发货'
</if> </if>
<if test="dto.deliveryTimeStart != null and dto.deliveryTimeEnd != ''"> <if test="dto.deliveryTimeStart != null and dto.deliveryTimeEnd != ''">
and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd} and hygf_preparation_money.delivery_time between #{dto.deliveryTimeStart} and #{dto.deliveryTimeEnd}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment