dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新9.28

Browse Source
This commit is contained in:
许允枞 2024-09-28 10:04:38 +08:00
parent 4b735e02ce
commit bba101f127
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/mapper/xml/FleetLinesChangeMapper.xml
View File

@ -3,9 +3,11 @@
<mapper namespace="com.fuint.business.fleet.mapper.FleetLinesChangeMapper"> <mapper namespace="com.fuint.business.fleet.mapper.FleetLinesChangeMapper">
<select id="queryAllByLimit" resultType="com.fuint.business.fleet.vo.FleetLinesChangeVo"> <select id="queryAllByLimit" resultType="com.fuint.business.fleet.vo.FleetLinesChangeVo">
select fc.*, mu.name userName select fc.*, mu.name userName,COALESCE(mu2.name, ta.account_name) createName
from fleet_lines_change fc from fleet_lines_change fc
left join mt_user mu on mu.id = fc.user_id left join mt_user mu on mu.id = fc.user_id
left join mt_user mu2 on mu2.id = fc.create_by
left join t_account ta on ta.acct_id = fc.create_by
<where> <where>
<if test="fleetLinesChange.fleetId != null and fleetLinesChange.fleetId != ''"> <if test="fleetLinesChange.fleetId != null and fleetLinesChange.fleetId != ''">
and fc.fleet_id = #{fleetLinesChange.fleetId} and fc.fleet_id = #{fleetLinesChange.fleetId}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/vo/FleetLinesChangeVo.java
View File

@ -13,7 +13,7 @@ public class FleetLinesChangeVo extends FleetLinesChange {
/** /**
* 操作人名称 * 操作人名称
*/ */
private String creatName; private String createName;
@JsonIgnore @JsonIgnore
private String startTime; private String startTime;